diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 4aa4870..428a0a7 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,6 +22,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <include
+        android:id="@+id/paged_view_indicator_track"
+        layout="@layout/scroll_indicator_track"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom" />
+    <include
+        android:id="@+id/paged_view_indicator"
+        layout="@layout/scroll_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom" />
+
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
@@ -41,19 +54,6 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <include
-        android:id="@+id/paged_view_indicator_track"
-        layout="@layout/scroll_indicator_track"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
-    <include
-        android:id="@+id/paged_view_indicator"
-        layout="@layout/scroll_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom" />
-
     <include layout="@layout/qsb_bar"
         android:id="@+id/qsb_bar"
         android:layout_width="@dimen/qsb_bar_height"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 73051ba..d9750db 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,6 +22,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <!-- Keep these behind the workspace so that they are not visible when
+         we go into AllApps -->
+    <include
+        android:id="@+id/paged_view_indicator_track"
+        layout="@layout/scroll_indicator_track"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="@dimen/button_bar_height" />
+    <include
+        android:id="@+id/paged_view_indicator"
+        layout="@layout/scroll_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="@dimen/button_bar_height" />
+
     <!-- The workspace contains 5 screens of cells -->
     <com.android.launcher2.Workspace
         android:id="@+id/workspace"
@@ -39,21 +56,6 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <include
-        android:id="@+id/paged_view_indicator_track"
-        layout="@layout/scroll_indicator_track"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="@dimen/button_bar_height" />
-    <include
-        android:id="@+id/paged_view_indicator"
-        layout="@layout/scroll_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="@dimen/button_bar_height" />
-
     <include layout="@layout/qsb_bar"
         android:id="@+id/qsb_bar"
         android:layout_width="match_parent"
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index adb0a6d..c277153 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -79,13 +79,6 @@
                 launcher:maxGap="@dimen/workspace_max_gap" />
 
             <include
-                style="@style/AppsCustomizeScrollTrack"
-                android:id="@+id/paged_view_indicator_track"
-                layout="@layout/scroll_indicator_track"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom" />
-            <include
                 android:id="@+id/paged_view_indicator"
                 layout="@layout/scroll_indicator"
                 android:layout_width="wrap_content"
diff --git a/res/layout/scroll_indicator_track.xml b/res/layout/scroll_indicator_track.xml
index c0d065a..e3aa625 100644
--- a/res/layout/scroll_indicator_track.xml
+++ b/res/layout/scroll_indicator_track.xml
@@ -16,7 +16,7 @@
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:paddingLeft="@dimen/scroll_track_padding"
-    android:paddingRight="@dimen/scroll_track_padding"
+    android:paddingLeft="@dimen/scroll_track_padding_left"
+    android:paddingRight="@dimen/scroll_track_padding_right"
     android:scaleType="fitXY"
     android:src="@drawable/hotseat_track_holo" />
\ No newline at end of file
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 463cd17..305e730 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -25,6 +25,8 @@
     <dimen name="workspace_top_padding">0dp</dimen>
     <dimen name="workspace_bottom_padding">0dp</dimen>
     <dimen name="workspace_page_spacing">8dp</dimen>
+    <dimen name="scroll_track_padding_left">@dimen/qsb_bar_height</dimen>
+    <dimen name="scroll_track_padding_right">@dimen/button_bar_height</dimen>
 
     <dimen name="folder_cell_width">100dip</dimen>
     <dimen name="folder_cell_height">74dip</dimen>
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index bd4efe7..17c806b 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -18,11 +18,6 @@
 -->
 
 <resources>
-<!-- AppsCustomize -->
-    <style name="AppsCustomizeScrollTrack">
-        <item name="android:visibility">gone</item>
-    </style>
-
 <!-- Workspace -->
     <style name="ScrollIndicatorTrack">
         <item name="android:visibility">gone</item>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 08a2c76..083a887 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,7 +22,8 @@
     <dimen name="workspace_width_gap">-1dp</dimen>
     <dimen name="workspace_height_gap">-1dp</dimen>
     <dimen name="workspace_max_gap">8dp</dimen>
-    <dimen name="scroll_track_padding">10dp</dimen>
+    <dimen name="scroll_track_padding_left">12dp</dimen>
+    <dimen name="scroll_track_padding_right">12dp</dimen>
 
 <!-- QSB -->
     <dimen name="toolbar_button_vertical_padding">0dip</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 46e5f95..9d3a02b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,15 +29,11 @@
         <item name="android:windowNoTitle">true</item>
     </style>
 
-    <style name="AppsCustomizeScrollTrack">
-        <item name="android:visibility">visible</item>
-    </style>
-
     <style name="AnimationPreview">
         <item name="android:windowEnterAnimation">@anim/fade_in_fast</item>
         <item name="android:windowExitAnimation">@anim/fade_out_fast</item>
     </style>
-    
+
     <style name="WorkspaceIcon">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">match_parent</item>