diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 061d8e39b9..e9ee5f82da 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -44,7 +44,7 @@
         android:id="@+id/workspace"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="@dimen/qsb_bar_height"
+        android:paddingTop="@dimen/qsb_bar_height_inset"
         android:paddingBottom="@dimen/button_bar_height"
         launcher:defaultScreen="2"
         launcher:cellCountX="4"
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index 2b4635cc58..5aff6d9aca 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -20,8 +20,8 @@
     <dimen name="workspace_right_padding">0dp</dimen>
     <!-- Block spacing on each side of the screen.  And also padding
          for the portals to look right. -->
-    <dimen name="workspace_top_padding">2dp</dimen>
-    <dimen name="workspace_bottom_padding">2dp</dimen>
+    <dimen name="workspace_top_padding">6dp</dimen>
+    <dimen name="workspace_bottom_padding">0dp</dimen>
     <dimen name="workspace_page_spacing">-1dp</dimen>
 
     <integer name="apps_customize_cellCountX">4</integer>
diff --git a/res/values-sw340dp-land/dimens.xml b/res/values-sw340dp-land/dimens.xml
index a723dcc0ab..b469ac08eb 100644
--- a/res/values-sw340dp-land/dimens.xml
+++ b/res/values-sw340dp-land/dimens.xml
@@ -21,10 +21,10 @@
 <!-- Workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">0dp</dimen>
-    <dimen name="workspace_top_padding">-1dp</dimen>
-    <dimen name="workspace_bottom_padding">-1dp</dimen>
-    <dimen name="workspace_left_padding">-1dp</dimen>
-    <dimen name="workspace_right_padding">-1dp</dimen>
+    <dimen name="workspace_top_padding">8dp</dimen>
+    <dimen name="workspace_bottom_padding">8dp</dimen>
+    <dimen name="workspace_left_padding">8dp</dimen>
+    <dimen name="workspace_right_padding">8dp</dimen>
     <dimen name="workspace_divider_padding_top">6dp</dimen>
     <dimen name="workspace_divider_padding_bottom">6dp</dimen>
 
diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml
index a6ba6ed9e2..690facc7d9 100644
--- a/res/values-sw340dp-port/dimens.xml
+++ b/res/values-sw340dp-port/dimens.xml
@@ -21,10 +21,10 @@
 <!-- Workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">0dp</dimen>
-    <dimen name="workspace_top_padding">-1dp</dimen>
-    <dimen name="workspace_bottom_padding">-1dp</dimen>
-    <dimen name="workspace_left_padding">-1dp</dimen>
-    <dimen name="workspace_right_padding">-1dp</dimen>
+    <dimen name="workspace_top_padding">8dp</dimen>
+    <dimen name="workspace_bottom_padding">8dp</dimen>
+    <dimen name="workspace_left_padding">8dp</dimen>
+    <dimen name="workspace_right_padding">8dp</dimen>
     <dimen name="workspace_divider_padding_left">6dp</dimen>
     <dimen name="workspace_divider_padding_right">6dp</dimen>
 
@@ -35,6 +35,9 @@
     <dimen name="hotseat_left_padding">-1dp</dimen>
     <dimen name="hotseat_right_padding">-1dp</dimen>
 
+    <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
+         that we put on each page for allowing folders to draw out of bounds -->
+    <dimen name="qsb_bar_height_inset">48dp</dimen>
     <dimen name="qsb_bar_height">54dp</dimen>
     <dimen name="search_bar_height">48dp</dimen>
     <!-- height of the bottom row of controls -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cf2445719c..31536a367e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -20,6 +20,9 @@
     <dimen name="folderClingMarginTop">20dp</dimen>
 
 <!-- Workspace -->
+    <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding
+         that we put on each page for allowing folders to draw out of bounds -->
+    <dimen name="qsb_bar_height_inset">34dp</dimen>
     <dimen name="qsb_bar_height">40dp</dimen>
     <dimen name="search_bar_height">40dp</dimen>
     <dimen name="workspace_cell_width">80dp</dimen>