diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml
index 84f9835348..6753cbfe99 100644
--- a/res/values-sw600dp-port/dimens.xml
+++ b/res/values-sw600dp-port/dimens.xml
@@ -18,7 +18,6 @@
 <!-- AppsCustomize -->
     <dimen name="apps_customize_cell_width">96dp</dimen>
     <dimen name="apps_customize_cell_height">96dp</dimen>
-    <dimen name="workspace_page_spacing">64dp</dimen>
 
 <!-- Workspace -->
     <!-- the area at the edge of the screen that makes the workspace go left
@@ -31,6 +30,7 @@
     <dimen name="workspace_bottom_padding">25dip</dimen>
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">32dp</dimen>
+    <dimen name="workspace_page_spacing">16dp</dimen>
 
     <dimen name="apps_customize_pageLayoutWidthGap">24dp</dimen>
     <dimen name="apps_customize_pageLayoutHeightGap">36dp</dimen>
diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml
index 2e3f8ef6f6..52c105d1b1 100644
--- a/res/values-sw720dp-port/dimens.xml
+++ b/res/values-sw720dp-port/dimens.xml
@@ -15,10 +15,8 @@
 -->
 
 <resources>
-    <!-- We can also afford to have a slightly wider portrait layout in
-         xlarge -->
-    <integer name="apps_customize_widget_cell_count_x">3</integer>
-    <integer name="apps_customize_widget_cell_count_y">3</integer>
+<!-- Workspace -->
+    <dimen name="workspace_page_spacing">24dp</dimen>
 
 <!-- AppsCustomize -->
     <integer name="apps_customize_maxCellCountX">-1</integer>
@@ -27,4 +25,8 @@
     <dimen name="apps_customize_pageLayoutHeightGap">36dp</dimen>
     <dimen name="apps_customize_pageLayoutPaddingLeft">24dp</dimen>
     <dimen name="apps_customize_pageLayoutPaddingRight">24dp</dimen>
+    <!-- We can also afford to have a slightly wider portrait layout in
+         xlarge -->
+    <integer name="apps_customize_widget_cell_count_x">3</integer>
+    <integer name="apps_customize_widget_cell_count_y">3</integer>
 </resources>
\ No newline at end of file
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 5c39b01d48..48faf9ab73 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -15,10 +15,9 @@
 -->
 
 <resources>
-    <dimen name="app_widget_preview_padding_left">0dp</dimen>
-    <dimen name="app_widget_preview_padding_top">10dp</dimen>
-
 <!-- AppsCustomize -->
     <integer name="apps_customize_maxCellCountX">-1</integer>
     <integer name="apps_customize_maxCellCountY">-1</integer>
+    <dimen name="app_widget_preview_padding_left">0dp</dimen>
+    <dimen name="app_widget_preview_padding_top">10dp</dimen>
 </resources>
\ No newline at end of file