diff --git a/app/src/main/res/layout/content_number_grid_minute_tuners.xml b/app/src/main/res/layout/content_number_grid_minute_tuners.xml
index 52080d0..8b5eb44 100644
--- a/app/src/main/res/layout/content_number_grid_minute_tuners.xml
+++ b/app/src/main/res/layout/content_number_grid_minute_tuners.xml
@@ -5,7 +5,7 @@
     <ImageButton
         style="@style/GridLayoutNumpadElement"
         android:src="@drawable/ic_minus_circle_24dp"
-        app:layout_column="1"/>
+        app:layout_column="0"/>
     <ImageButton
         style="@style/GridLayoutNumpadElement"
         android:src="@drawable/ic_add_circle_24dp"
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 3bd978a..7133547 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
@@ -29,7 +29,9 @@
             android:layout_height="@dimen/numpad_height"
             android:layout_below="@id/time_display_background"
             app:columnCount="3"
-            android:layout_marginBottom="28dp"/>
+            android:layout_marginStart="@dimen/bottom_sheet_edge_margin"
+            android:layout_marginEnd="@dimen/bottom_sheet_edge_margin"
+            android:paddingBottom="28dp"/>
 
         <View
             android:id="@+id/divider"