diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 9ddb1355c2..418469b9b9 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -28,9 +28,9 @@
     <include
         android:id="@+id/dock_divider"
         layout="@layout/workspace_divider"
-        android:layout_width="@dimen/workspace_divider_width"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/button_bar_height"
+        android:layout_marginBottom="@dimen/button_bar_height_plus_padding"
         android:layout_gravity="bottom|center_horizontal" />
     <include
         android:id="@+id/paged_view_indicator"
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:layout_marginBottom="@dimen/button_bar_height" />
+        android:layout_marginBottom="@dimen/button_bar_height_plus_padding" />
 
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
diff --git a/res/values-sw600dp/config.xml b/res/values-sw600dp/config.xml
index bbb22c51aa..eab77f9b06 100644
--- a/res/values-sw600dp/config.xml
+++ b/res/values-sw600dp/config.xml
@@ -21,5 +21,5 @@
 
 <!-- Hotseat -->
     <!-- must be between 0 and 100 -->
-    <integer name="hotseat_item_scale_percentage">90</integer>
+    <integer name="hotseat_item_scale_percentage">80</integer>
 </resources>
diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml
index 5528ae6d60..84ef395d5f 100644
--- a/res/values-sw720dp-port/dimens.xml
+++ b/res/values-sw720dp-port/dimens.xml
@@ -43,8 +43,9 @@
     <integer name="apps_customize_cling_focused_x">2</integer>
     <integer name="apps_customize_cling_focused_y">2</integer>
 
-    <!-- Page width set to match a page of icons (96*k) -->
-    <dimen name="workspace_divider_width">768dp</dimen>
+    <!-- Divider width set to match the qsb width -->
+    <dimen name="workspace_divider_padding_left">112dp</dimen>
+    <dimen name="workspace_divider_padding_right">112dp</dimen>
 
 <!-- Hotseat -->
     <dimen name="hotseat_width_gap">16dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 54ac870f0a..fe7083d4e1 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -16,16 +16,17 @@
 
 <resources>
     <dimen name="app_icon_size">72dp</dimen>
+    <dimen name="app_icon_padding_top">0dp</dimen>
     <dimen name="reveal_radius">72dp</dimen>
 
 <!-- Hotseat -->
-    <dimen name="button_bar_height">96dp</dimen>
-    <dimen name="button_bar_height_top_padding">0dp</dimen>
-    <dimen name="button_bar_height_bottom_padding">0dp</dimen>
-    <dimen name="button_bar_width_left_padding">0dp</dimen>
-    <dimen name="button_bar_width_right_padding">0dp</dimen>
-    <dimen name="button_bar_height_plus_padding">96dp</dimen>
-    <dimen name="hotseat_width_gap">48dp</dimen>
+    <dimen name="button_bar_height">82dp</dimen>
+    <dimen name="button_bar_height_top_padding">12dp</dimen>
+    <dimen name="button_bar_height_bottom_padding">12dp</dimen>
+    <dimen name="button_bar_width_left_padding">12dp</dimen>
+    <dimen name="button_bar_width_right_padding">12dp</dimen>
+    <dimen name="button_bar_height_plus_padding">82dp</dimen>
+    <dimen name="hotseat_width_gap">50dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
@@ -58,14 +59,14 @@
     <dimen name="dragViewOffsetY">0dp</dimen>
 
 <!-- CellLayout padding land / port-->
-    <dimen name="cell_layout_left_padding_port">0dp</dimen>
-    <dimen name="cell_layout_left_padding_land">0dp</dimen>
-    <dimen name="cell_layout_right_padding_port">0dp</dimen>
-    <dimen name="cell_layout_right_padding_land">0dp</dimen>
-    <dimen name="cell_layout_top_padding_port">0dp</dimen>
-    <dimen name="cell_layout_top_padding_land">0dp</dimen>
-    <dimen name="cell_layout_bottom_padding_port">0dp</dimen>
-    <dimen name="cell_layout_bottom_padding_land">0dp</dimen>
+    <dimen name="cell_layout_left_padding_port">4dp</dimen>
+    <dimen name="cell_layout_left_padding_land">4dp</dimen>
+    <dimen name="cell_layout_right_padding_port">4dp</dimen>
+    <dimen name="cell_layout_right_padding_land">4dp</dimen>
+    <dimen name="cell_layout_top_padding_port">12dp</dimen>
+    <dimen name="cell_layout_top_padding_land">12dp</dimen>
+    <dimen name="cell_layout_bottom_padding_port">8dp</dimen>
+    <dimen name="cell_layout_bottom_padding_land">8dp</dimen>
 
 <!-- Folders -->
     <!-- The size of the image which sits behind the preview of the folder contents -->
@@ -84,15 +85,13 @@
 
     <dimen name="workspace_top_padding_port">@dimen/qsb_bar_height_inset</dimen>
     <dimen name="workspace_top_padding_land">@dimen/qsb_bar_height_inset</dimen>
-    <!-- XXX: This should be @dimen/button_bar_height + bottom padding, but because we are not using
-              the hotseat with the smaller icons, this is slightly larger than final dimensions. -->
-    <dimen name="workspace_bottom_padding_port">110dp</dimen>
-    <dimen name="workspace_bottom_padding_land">100dp</dimen>
+    <dimen name="workspace_bottom_padding_port">@dimen/button_bar_height_plus_padding</dimen>
+    <dimen name="workspace_bottom_padding_land">@dimen/button_bar_height_plus_padding</dimen>
 
-    <!-- Page width set to match a page of icons (96*k + 46*(k-1) - 2*12[icon padding]) -->
-    <dimen name="workspace_divider_width">1066dp</dimen>
-    <dimen name="workspace_divider_padding_left">0dp</dimen>
-    <dimen name="workspace_divider_padding_right">0dp</dimen>
+    <!-- Divider width set to match the qsb width -->
+    <dimen name="workspace_divider_width">0dp</dimen>
+    <dimen name="workspace_divider_padding_left">249dp</dimen>
+    <dimen name="workspace_divider_padding_right">249dp</dimen>
     <dimen name="workspace_divider_padding_top">0dp</dimen>
     <dimen name="workspace_divider_padding_bottom">0dp</dimen>