diff --git a/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml b/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml
index 3e2c68a..6cee668 100644
--- a/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml
+++ b/app/src/main/res/layout-land/dialog_time_picker_number_grid.xml
@@ -27,10 +27,10 @@
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:layout_marginTop="@dimen/bottom_sheet_vertical_space"
+            android:paddingTop="@dimen/bottom_sheet_vertical_space"
             android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
             android:paddingEnd="@dimen/anchored_fab_vertical_space"
-            android:layout_marginBottom="@dimen/bottom_sheet_vertical_space"/>
+            android:paddingBottom="@dimen/bottom_sheet_vertical_space"/>
 
         <View
             android:id="@+id/divider"
diff --git a/app/src/main/res/layout/dialog_time_picker_number_grid.xml b/app/src/main/res/layout/dialog_time_picker_number_grid.xml
index bb5062c..33e2a69 100644
--- a/app/src/main/res/layout/dialog_time_picker_number_grid.xml
+++ b/app/src/main/res/layout/dialog_time_picker_number_grid.xml
@@ -22,13 +22,18 @@
                 android:layout_gravity="center" />
         </FrameLayout>
 
+        <!--TOneverDO: Change marginTop to paddingTop without also adding the
+         padding amount to the height. -->
+        <!--TOneverDO: Change paddingBottom to marginBottom without also subtracting the
+         margin amount from the height. -->
+        <!--TODO: As a library, we probably also want to paddingLeft/Right-->
         <com.philliphsu.clock2.editalarm.GridSelectorLayout
             android:id="@+id/time_picker"
             android:layout_width="match_parent"
             android:layout_height="@dimen/number_grid_height"
             android:layout_marginTop="@dimen/bottom_sheet_vertical_space"
-            android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
-            android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"
+            android:paddingStart="@dimen/bottom_sheet_edge_margin"
+            android:paddingEnd="@dimen/bottom_sheet_edge_margin"
             android:paddingBottom="@dimen/anchored_fab_vertical_space"/>
 
         <View