diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index c64b7ce..b01add9 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -30,7 +30,8 @@
             android:layout_width="wrap_content"
             android:layout_height="@dimen/apps_customize_tab_bar_height"
             android:layout_marginTop="@dimen/apps_customize_tab_bar_margin_top"
-            android:layout_gravity="center_horizontal">
+            android:layout_gravity="center_horizontal"
+            android:visibility="gone">
             <com.android.launcher3.FocusOnlyTabWidget
                 android:id="@android:id/tabs"
                 android:layout_width="match_parent"
@@ -55,18 +56,7 @@
                 android:id="@+id/apps_customize_pane_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_marginBottom="@dimen/apps_customize_page_indicator_height"
-                android:layout_gravity="center"
-                launcher:maxAppCellCountX="@integer/apps_customize_maxCellCountX"
-                launcher:maxAppCellCountY="@integer/apps_customize_maxCellCountY"
-                launcher:pageLayoutWidthGap="@dimen/apps_customize_pageLayoutWidthGap"
-                launcher:pageLayoutHeightGap="@dimen/apps_customize_pageLayoutHeightGap"
-                launcher:pageLayoutPaddingTop="@dimen/apps_customize_pageLayoutPaddingTop"
-                launcher:pageLayoutPaddingBottom="@dimen/apps_customize_pageLayoutPaddingBottom"
-                launcher:pageLayoutPaddingLeft="@dimen/apps_customize_pageLayoutPaddingLeft"
-                launcher:pageLayoutPaddingRight="@dimen/apps_customize_pageLayoutPaddingRight"
-                launcher:widgetCellWidthGap="@dimen/apps_customize_widget_cell_width_gap"
-                launcher:widgetCellHeightGap="@dimen/apps_customize_widget_cell_height_gap"
+                android:layout_marginBottom="@dimen/apps_customize_page_indicator_offset"
                 launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x"
                 launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y"
                 launcher:clingFocusedX="@integer/apps_customize_cling_focused_x"
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 4d94d7e..5961b19 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -25,18 +25,7 @@
     <dimen name="workspace_page_spacing">-1dp</dimen>
 
 <!-- AppsCustomize -->
-    <dimen name="apps_customize_cell_width">80dp</dimen>
-    <!-- The width can be 76dp because we don't have B padding -->
-    <dimen name="apps_customize_cell_height">76dp</dimen>
-    <dimen name="apps_customize_pageLayoutWidthGap">-1dp</dimen>
-    <dimen name="apps_customize_pageLayoutHeightGap">-1dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingTop">5dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingBottom">5dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingLeft">5dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingRight">5dp</dimen>
     <dimen name="apps_customize_tab_bar_height">42dp</dimen>
-    <dimen name="apps_customize_widget_cell_width_gap">30dp</dimen>
-    <dimen name="apps_customize_widget_cell_height_gap">5dp</dimen>
     <integer name="apps_customize_widget_cell_count_x">3</integer>
     <integer name="apps_customize_widget_cell_count_y">2</integer>
     <integer name="apps_customize_cling_focused_x">2</integer>
diff --git a/res/values-port/dimens.xml b/res/values-port/dimens.xml
index bee2dd5..7194a2a 100644
--- a/res/values-port/dimens.xml
+++ b/res/values-port/dimens.xml
@@ -19,17 +19,9 @@
     <dimen name="workspace_page_spacing">-1dp</dimen>
 
 <!-- AppsCustomize -->
-    <dimen name="apps_customize_pageLayoutWidthGap">-1dp</dimen>
-    <dimen name="apps_customize_pageLayoutHeightGap">-1dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingTop">10dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingLeft">5dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingRight">5dp</dimen>
     <integer name="apps_customize_cling_focused_x">1</integer>
     <integer name="apps_customize_cling_focused_y">1</integer>
 
-    <dimen name="apps_customize_widget_cell_width_gap">20dp</dimen>
-    <dimen name="apps_customize_widget_cell_height_gap">10dp</dimen>
     <integer name="apps_customize_widget_cell_count_x">2</integer>
     <integer name="apps_customize_widget_cell_count_y">3</integer>
 </resources>
diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml
index 2dbcb45..e360565 100644
--- a/res/values-sw340dp-port/dimens.xml
+++ b/res/values-sw340dp-port/dimens.xml
@@ -17,12 +17,4 @@
 <resources>
 <!-- Clings -->
     <dimen name="folderClingMarginTop">70dp</dimen>
-
-<!-- AppsCustomize -->
-    <dimen name="apps_customize_pageLayoutPaddingTop">16dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingBottom">20dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingLeft">8dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingRight">8dp</dimen>
-    <dimen name="apps_customize_cell_height">92dp</dimen>
-    <dimen name="apps_customize_widget_cell_height_gap">16dp</dimen>
 </resources>
diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml
index c9f24b3..24f4ba2 100644
--- a/res/values-sw340dp-port/styles.xml
+++ b/res/values-sw340dp-port/styles.xml
@@ -29,15 +29,4 @@
     <style name="TabIndicator.AppsCustomize">
         <item name="android:maxWidth">150dp</item>
     </style>
-    <style name="WorkspaceIcon.Portrait.AppsCustomize">
-        <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
-        <item name="android:singleLine">false</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:background">@null</item>
-        <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:drawablePadding">6dp</item>
-    </style>
 </resources>
diff --git a/res/values-sw600dp-port/dimens.xml b/res/values-sw600dp-port/dimens.xml
deleted file mode 100644
index 7cc3c79..0000000
--- a/res/values-sw600dp-port/dimens.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     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.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-<!-- AppsCustomize -->
-    <dimen name="apps_customize_cell_width">96dp</dimen>
-    <dimen name="apps_customize_cell_height">108dp</dimen>
-    <dimen name="apps_customize_pageLayoutWidthGap">24dp</dimen>
-    <dimen name="apps_customize_pageLayoutHeightGap">24dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingTop">25dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingBottom">10dp</dimen>
-</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index c261c00..8d6c7f4 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -18,14 +18,8 @@
     <dimen name="app_icon_size">64dp</dimen>
 
 <!-- AppsCustomize -->
-    <dimen name="apps_customize_cell_width">96dp</dimen>
-    <dimen name="apps_customize_cell_height">96dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingLeft">12dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingRight">12dp</dimen>
     <dimen name="apps_customize_tab_bar_height">60dp</dimen>
     <dimen name="apps_customize_tab_bar_margin_top">8dp</dimen>
-    <dimen name="apps_customize_widget_cell_width_gap">20dp</dimen>
-    <dimen name="apps_customize_widget_cell_height_gap">24dp</dimen>
     <dimen name="app_widget_preview_label_margin_top">8dp</dimen>
     <dimen name="app_widget_preview_label_margin_left">@dimen/app_widget_preview_padding_left</dimen>
     <dimen name="app_widget_preview_label_margin_right">@dimen/app_widget_preview_padding_right</dimen>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 8252450..eb8f83c 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -16,10 +16,10 @@
 
 <resources>
 <!-- AppsCustomize -->
-    <dimen name="apps_customize_pageLayoutWidthGap">28dp</dimen>
-    <dimen name="apps_customize_pageLayoutHeightGap">16dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingLeft">16dp</dimen>
-    <dimen name="apps_customize_pageLayoutPaddingRight">16dp</dimen>
+    <integer name="apps_customize_widget_cell_count_x">4</integer>
+    <integer name="apps_customize_widget_cell_count_y">2</integer>
+    <integer name="apps_customize_cling_focused_x">4</integer>
+    <integer name="apps_customize_cling_focused_y">2</integer>
 
 <!-- Workspace -->
     <dimen name="workspace_page_spacing">50dp</dimen>
@@ -28,11 +28,6 @@
          or right while you're dragging. -->
     <dimen name="scroll_zone">100dip</dimen>
 
-    <integer name="apps_customize_widget_cell_count_x">4</integer>
-    <integer name="apps_customize_widget_cell_count_y">2</integer>
-    <integer name="apps_customize_cling_focused_x">4</integer>
-    <integer name="apps_customize_cling_focused_y">2</integer>
-
 <!-- Cling -->
     <!-- The offset for the text in the cling -->
     <dimen name="cling_text_block_offset_x">140dp</dimen>
diff --git a/res/values-sw720dp-port/dimens.xml b/res/values-sw720dp-port/dimens.xml
index 9cf37ff..62bdaaa 100644
--- a/res/values-sw720dp-port/dimens.xml
+++ b/res/values-sw720dp-port/dimens.xml
@@ -15,18 +15,6 @@
 -->
 
 <resources>
-<!-- AppsCustomize -->
-    <integer name="apps_customize_maxCellCountX">-1</integer>
-    <integer name="apps_customize_maxCellCountY">7</integer>
-    <dimen name="apps_customize_pageLayoutWidthGap">36dp</dimen>
-    <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>
-
 <!-- Workspace -->
     <!-- the area at the edge of the screen that makes the workspace go left
          or right while you're dragging. -->
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index c9639dd..01227e1 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -21,12 +21,6 @@
     <dimen name="toolbar_button_vertical_padding">8dip</dimen>
     <dimen name="toolbar_button_horizontal_padding">8dip</dimen>
 
-<!-- AppsCustomize -->
-    <dimen name="apps_customize_cell_width">96dp</dimen>
-    <dimen name="apps_customize_cell_height">96dp</dimen>
-    <integer name="apps_customize_maxCellCountX">-1</integer>
-    <integer name="apps_customize_maxCellCountY">-1</integer>
-
     <!-- dimensions for the wallpaper picker wallpaper thumbnail width -->
     <dimen name="wallpaper_chooser_grid_width">196dp</dimen>
     <dimen name="wallpaper_chooser_grid_height">140dp</dimen>
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 52a6abc..7269e8d 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -55,24 +55,6 @@
         <item name="android:windowActionModeOverlay">true</item>
     </style>
 
-    <style name="WorkspaceIcon.Portrait.AppsCustomize">
-        <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
-        <item name="android:background">@null</item>
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:textSize">13sp</item>
-    </style>
-    <style name="WorkspaceIcon.Landscape.AppsCustomize">
-        <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
-        <item name="android:background">@null</item>
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:drawablePadding">4dp</item>
-        <item name="android:textSize">13sp</item>
-    </style>
     <style name="TabIndicator.AppsCustomize">
         <item name="android:paddingStart">32dp</item>
         <item name="android:paddingEnd">32dp</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c2e1e7b..bd561ed 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -30,4 +30,6 @@
     <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color>
     <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color>
     <color name="workspace_icon_text_color">#FFF</color>
+
+    <color name="apps_customize_icon_text_color">#FFF</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e557c3e..7a1a7aa 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,23 +51,16 @@
     <dimen name="toolbar_external_icon_height">36dp</dimen>
 
 <!-- AllApps/Customize/AppsCustomize -->
-    <integer name="apps_customize_maxCellCountX">-1</integer>
-    <integer name="apps_customize_maxCellCountY">-1</integer>
     <!-- The height of the tab bar - if this changes, we should update the
          external icon width/height above to compensate -->
     <dimen name="apps_customize_tab_bar_height">52dp</dimen>
     <dimen name="apps_customize_tab_bar_margin_top">0dp</dimen>
     <dimen name="app_icon_size">48dp</dimen>
-    <!-- The width can be 72dp because we don't have L/R padding -->
-    <dimen name="apps_customize_cell_width">74dp</dimen>
-    <dimen name="apps_customize_cell_height">82dp</dimen>
-    <dimen name="apps_customize_max_gap">18dp</dimen>
-    <dimen name="apps_customize_widget_cell_width_gap">10dp</dimen>
-    <dimen name="apps_customize_widget_cell_height_gap">8dp</dimen>
 
     <!-- The AppsCustomize page indicator -->
     <dimen name="apps_customize_page_indicator_height">12dp</dimen>
     <dimen name="apps_customize_page_indicator_margin">4dp</dimen>
+    <dimen name="apps_customize_page_indicator_offset">16dp</dimen>
 
     <!-- Drag padding to add to the bottom of drop targets -->
     <dimen name="drop_target_drag_padding">14dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index f41c8eb..6eb044c 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -83,21 +83,13 @@
 
     <style name="WorkspaceIcon.Portrait.AppsCustomize">
         <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
-        <item name="android:singleLine">false</item>
-        <item name="android:maxLines">2</item>
         <item name="android:background">@null</item>
-        <item name="android:paddingTop">0dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:paddingStart">0dp</item>
-        <item name="android:paddingEnd">0dp</item>
-        <item name="android:drawablePadding">2dp</item>
+        <item name="android:textColor">@color/apps_customize_icon_text_color</item>
     </style>
     <style name="WorkspaceIcon.Landscape.AppsCustomize">
         <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow -->
         <item name="android:background">@null</item>
-        <item name="android:paddingTop">4dp</item>
-        <item name="android:paddingBottom">0dp</item>
-        <item name="android:drawablePadding">6dp</item>
+        <item name="android:textColor">@color/apps_customize_icon_text_color</item>
     </style>
 
     <style name="QSBBar">