diff --git a/res/drawable-hdpi/default_widget_preview_holo.9.png b/res/drawable-hdpi/default_widget_preview_holo.9.png
index ecf5deb..6745e49 100644
--- a/res/drawable-hdpi/default_widget_preview_holo.9.png
+++ b/res/drawable-hdpi/default_widget_preview_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/hotseat_scrubber_holo.9.png b/res/drawable-hdpi/hotseat_scrubber_holo.9.png
index 78b540d..3400050 100644
--- a/res/drawable-hdpi/hotseat_scrubber_holo.9.png
+++ b/res/drawable-hdpi/hotseat_scrubber_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/hotseat_track_holo.9.png b/res/drawable-hdpi/hotseat_track_holo.9.png
index ca495ff..a058a3a 100644
--- a/res/drawable-hdpi/hotseat_track_holo.9.png
+++ b/res/drawable-hdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_generic_search.png b/res/drawable-hdpi/ic_generic_search.png
deleted file mode 100644
index 67bac5c..0000000
--- a/res/drawable-hdpi/ic_generic_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_search_normal_holo.png b/res/drawable-hdpi/ic_search_normal_holo.png
new file mode 100644
index 0000000..9935f48
--- /dev/null
+++ b/res/drawable-hdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_voice_search.png b/res/drawable-hdpi/ic_voice_search.png
deleted file mode 100644
index 5d2f341..0000000
--- a/res/drawable-hdpi/ic_voice_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_voice_search_holo.png b/res/drawable-hdpi/ic_voice_search_holo.png
new file mode 100644
index 0000000..e0df1a2
--- /dev/null
+++ b/res/drawable-hdpi/ic_voice_search_holo.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_focused_holo.9.png b/res/drawable-hdpi/tab_selected_focused_holo.9.png
index 1ba35d5..5cf7583 100644
--- a/res/drawable-hdpi/tab_selected_focused_holo.9.png
+++ b/res/drawable-hdpi/tab_selected_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_holo.9.png b/res/drawable-hdpi/tab_selected_holo.9.png
index ef913cc..8da2dee 100644
--- a/res/drawable-hdpi/tab_selected_holo.9.png
+++ b/res/drawable-hdpi/tab_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png
index d7e9688..4b312d9 100644
--- a/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png
+++ b/res/drawable-hdpi/tab_selected_pressed_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected_pressed_holo.9.png b/res/drawable-hdpi/tab_selected_pressed_holo.9.png
index b8b1fcf..185a924 100644
--- a/res/drawable-hdpi/tab_selected_pressed_holo.9.png
+++ b/res/drawable-hdpi/tab_selected_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_focused_holo.9.png b/res/drawable-hdpi/tab_unselected_focused_holo.9.png
index 256e8e7..acfcaca 100644
--- a/res/drawable-hdpi/tab_unselected_focused_holo.9.png
+++ b/res/drawable-hdpi/tab_unselected_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_holo.9.png b/res/drawable-hdpi/tab_unselected_holo.9.png
index db6fc14..fcdf716 100644
--- a/res/drawable-hdpi/tab_unselected_holo.9.png
+++ b/res/drawable-hdpi/tab_unselected_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png
index d17b820..5140b35 100644
--- a/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png
+++ b/res/drawable-hdpi/tab_unselected_pressed_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected_pressed_holo.9.png b/res/drawable-hdpi/tab_unselected_pressed_holo.9.png
index a344994..af85bb7 100644
--- a/res/drawable-hdpi/tab_unselected_pressed_holo.9.png
+++ b/res/drawable-hdpi/tab_unselected_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/default_widget_preview_holo.9.png b/res/drawable-mdpi/default_widget_preview_holo.9.png
index d8e1196..f9a9726 100644
--- a/res/drawable-mdpi/default_widget_preview_holo.9.png
+++ b/res/drawable-mdpi/default_widget_preview_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_scrubber_holo.9.png b/res/drawable-mdpi/hotseat_scrubber_holo.9.png
index 8b7e109..69f74f7 100644
--- a/res/drawable-mdpi/hotseat_scrubber_holo.9.png
+++ b/res/drawable-mdpi/hotseat_scrubber_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/hotseat_track_holo.9.png b/res/drawable-mdpi/hotseat_track_holo.9.png
index a542cb7..a058a3a 100644
--- a/res/drawable-mdpi/hotseat_track_holo.9.png
+++ b/res/drawable-mdpi/hotseat_track_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_generic_search.png b/res/drawable-mdpi/ic_generic_search.png
deleted file mode 100644
index e3fd5a2..0000000
--- a/res/drawable-mdpi/ic_generic_search.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_search_normal_holo.png b/res/drawable-mdpi/ic_search_normal_holo.png
new file mode 100644
index 0000000..6acf24b
--- /dev/null
+++ b/res/drawable-mdpi/ic_search_normal_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_voice_search_holo.png b/res/drawable-mdpi/ic_voice_search_holo.png
new file mode 100644
index 0000000..29533ba
--- /dev/null
+++ b/res/drawable-mdpi/ic_voice_search_holo.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_focused_holo.9.png b/res/drawable-mdpi/tab_selected_focused_holo.9.png
index 9a33cd2..d393cde 100644
--- a/res/drawable-mdpi/tab_selected_focused_holo.9.png
+++ b/res/drawable-mdpi/tab_selected_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_holo.9.png b/res/drawable-mdpi/tab_selected_holo.9.png
index e029e57..4035a32 100644
--- a/res/drawable-mdpi/tab_selected_holo.9.png
+++ b/res/drawable-mdpi/tab_selected_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png b/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png
index 285116e..284f534 100644
--- a/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png
+++ b/res/drawable-mdpi/tab_selected_pressed_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected_pressed_holo.9.png b/res/drawable-mdpi/tab_selected_pressed_holo.9.png
index dadefa7..7efad5e 100644
--- a/res/drawable-mdpi/tab_selected_pressed_holo.9.png
+++ b/res/drawable-mdpi/tab_selected_pressed_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_focused_holo.9.png b/res/drawable-mdpi/tab_unselected_focused_holo.9.png
index 032a992..d3d19fc 100644
--- a/res/drawable-mdpi/tab_unselected_focused_holo.9.png
+++ b/res/drawable-mdpi/tab_unselected_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_holo.9.png b/res/drawable-mdpi/tab_unselected_holo.9.png
index e621983..41f998e 100644
--- a/res/drawable-mdpi/tab_unselected_holo.9.png
+++ b/res/drawable-mdpi/tab_unselected_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png b/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png
index 3845135..f1a2819 100644
--- a/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png
+++ b/res/drawable-mdpi/tab_unselected_pressed_focused_holo.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected_pressed_holo.9.png b/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
index 23fd8c9..37c9216 100644
--- a/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
+++ b/res/drawable-mdpi/tab_unselected_pressed_holo.9.png
Binary files differ
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index d2f52c8..c120de8 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -40,22 +40,18 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
+    <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:scaleType="fitXY"
-        android:src="@drawable/hotseat_track_holo" />
-    <ImageView
+        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"
-        android:visibility="gone"
-        android:alpha="0"
-        android:scaleType="fitXY"
-        android:src="@drawable/hotseat_scrubber_holo" />
+        android:layout_gravity="bottom" />
 
     <include layout="@layout/qsb_bar"
         android:id="@+id/qsb_bar"
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml
new file mode 100644
index 0000000..e3f67a1
--- /dev/null
+++ b/res/layout-land/search_bar.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    style="@style/SearchDropTargetBar"
+    android:layout_width="@dimen/qsb_bar_height"
+    android:layout_height="match_parent">
+   <!-- Global search icon -->
+   <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/search_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_search_normal_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_search_button" />
+
+    <ImageView
+        style="@style/SearchButtonDivider"
+        android:id="@+id/search_divider"
+        android:src="@drawable/divider_launcher_holo"
+        android:onClick="onClickSearchButton"
+        android:focusable="false"
+        android:clickable="true" />
+
+    <!-- Voice search icon -->
+    <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/voice_button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_voice_search_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickVoiceButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_voice_search_button" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-large/button_bar.xml b/res/layout-large/button_bar.xml
index 8d7f5df..efe9e13 100644
--- a/res/layout-large/button_bar.xml
+++ b/res/layout-large/button_bar.xml
@@ -29,7 +29,7 @@
         android:paddingRight="@dimen/toolbar_button_horizontal_padding"
         android:paddingTop="@dimen/toolbar_button_vertical_padding"
         android:paddingBottom="@dimen/toolbar_button_vertical_padding"
-        android:src="@drawable/ic_generic_search"
+        android:src="@drawable/ic_search_normal_holo"
         android:background="@drawable/button_bg"
         android:onClick="onClickSearchButton"
 
@@ -60,7 +60,7 @@
         android:paddingRight="@dimen/toolbar_button_horizontal_padding"
         android:paddingTop="@dimen/toolbar_button_vertical_padding"
         android:paddingBottom="@dimen/toolbar_button_vertical_padding"
-        android:src="@drawable/ic_voice_search"
+        android:src="@drawable/ic_voice_search_holo"
         android:background="@drawable/button_bg"
         android:onClick="onClickVoiceButton"
 
diff --git a/res/layout-large/qsb_bar.xml b/res/layout-large/qsb_bar.xml
deleted file mode 100644
index b600eda..0000000
--- a/res/layout-large/qsb_bar.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-<com.android.launcher2.SearchDropTargetBar
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
-    android:focusable="false">
-
-    <!-- Search buttons container -->
-    <RelativeLayout
-        style="@style/SearchDropTargetBar"
-        android:id="@+id/qsb_search_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-       <!-- Global search icon -->
-       <ImageView
-            style="@style/SearchButton"
-            android:id="@+id/search_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentTop="true"
-            android:src="@drawable/ic_generic_search"
-            android:background="@drawable/button_bg"
-            android:onClick="onClickSearchButton"
-            android:focusable="true"
-            android:clickable="true"
-            android:contentDescription="@string/accessibility_search_button" />
-
-        <ImageView
-            style="@style/SearchButtonDivider"
-            android:id="@+id/search_divider"
-            android:layout_toRightOf="@+id/search_button"
-            android:src="@drawable/divider_launcher_holo"
-            android:onClick="onClickSearchButton"
-            android:focusable="false"
-            android:clickable="true" />
-
-        <!-- Voice search icon -->
-        <ImageView
-            style="@style/SearchButton"
-            android:id="@+id/voice_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toRightOf="@+id/search_divider"
-            android:src="@drawable/ic_voice_search"
-            android:background="@drawable/button_bg"
-            android:onClick="onClickVoiceButton"
-            android:focusable="true"
-            android:clickable="true"
-            android:contentDescription="@string/accessibility_voice_search_button" />
-
-        <!-- AppsCustomize icon -->
-        <com.android.launcher2.StrokedTextView
-            android:id="@+id/all_apps_button"
-            android:onClick="onClickAllAppsButton"
-            android:drawableLeft="@drawable/ic_home_all_apps_holo_dark"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentTop="true"
-            android:layout_toLeftOf="@+id/all_apps_divider"
-            android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
-            android:paddingRight="@dimen/toolbar_button_horizontal_padding"
-            android:paddingTop="@dimen/all_apps_button_vertical_padding"
-            android:paddingBottom="@dimen/all_apps_button_vertical_padding"
-            android:background="@drawable/button_bg"
-
-            android:gravity="center"
-            android:textColor="#CCFFFFFF"
-            android:textSize="18sp"
-
-            launcher:strokeColor="#991e3157"
-            launcher:strokeTextColor="#DDFFFFFF"
-            launcher:strokeWidth="2.5"
-
-            android:shadowColor="#DA000000"
-            android:shadowDx="0.0"
-            android:shadowDy="0.0"
-            android:shadowRadius="2.5"
-
-            android:focusable="true"
-            android:clickable="true"
-            android:contentDescription="@string/accessibility_all_apps_button" />
-    </RelativeLayout>
-
-    <!-- Drag specific targets container -->
-    <LinearLayout
-        style="@style/SearchDropTargetBar"
-        android:id="@+id/drag_target_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:alpha="0">
-
-        <com.android.launcher2.DeleteDropTarget
-            style="@style/DropTargetButtonContainer"
-            android:id="@+id/delete_target"
-            android:layout_weight="1">
-            <!-- Delete target -->
-            <TextView
-                style="@style/DropTargetButton"
-                android:id="@+id/delete_target_text"
-                android:text="@string/delete_zone_label_workspace"
-                android:drawableLeft="@drawable/delete_target_selector" />
-        </com.android.launcher2.DeleteDropTarget>
-
-        <com.android.launcher2.InfoDropTarget
-            style="@style/DropTargetButtonContainer"
-            android:id="@+id/info_target"
-            android:layout_weight="1">
-            <!-- Info target -->
-            <TextView
-                style="@style/DropTargetButton"
-                android:id="@+id/info_target_text"
-                android:text="@string/info_target_label"
-                android:drawableLeft="@drawable/info_target_selector" />
-        </com.android.launcher2.InfoDropTarget>
-    </LinearLayout>
-</com.android.launcher2.SearchDropTargetBar>
diff --git a/res/layout-large/search_bar.xml b/res/layout-large/search_bar.xml
new file mode 100644
index 0000000..e26a96a
--- /dev/null
+++ b/res/layout-large/search_bar.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    style="@style/SearchDropTargetBar"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+   <!-- Global search icon -->
+   <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/search_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:src="@drawable/ic_search_normal_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_search_button" />
+
+    <ImageView
+        style="@style/SearchButtonDivider"
+        android:id="@+id/search_divider"
+        android:layout_toRightOf="@+id/search_button"
+        android:src="@drawable/divider_launcher_holo"
+        android:onClick="onClickSearchButton"
+        android:focusable="false"
+        android:clickable="true" />
+
+    <!-- Voice search icon -->
+    <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/voice_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@+id/search_divider"
+        android:src="@drawable/ic_voice_search_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickVoiceButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_voice_search_button" />
+
+    <!-- AppsCustomize icon -->
+    <com.android.launcher2.StrokedTextView
+        android:id="@+id/all_apps_button"
+        android:onClick="onClickAllAppsButton"
+        android:drawableLeft="@drawable/ic_home_all_apps_holo_dark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@+id/all_apps_divider"
+        android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
+        android:paddingRight="@dimen/toolbar_button_horizontal_padding"
+        android:paddingTop="@dimen/all_apps_button_vertical_padding"
+        android:paddingBottom="@dimen/all_apps_button_vertical_padding"
+        android:background="@drawable/button_bg"
+
+        android:gravity="center"
+        android:textColor="#CCFFFFFF"
+        android:textSize="18sp"
+
+        launcher:strokeColor="#991e3157"
+        launcher:strokeTextColor="#DDFFFFFF"
+        launcher:strokeWidth="2.5"
+
+        android:shadowColor="#DA000000"
+        android:shadowDx="0.0"
+        android:shadowDy="0.0"
+        android:shadowRadius="2.5"
+
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_all_apps_button" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index acb3b47..db074d7 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -38,24 +38,20 @@
         <include android:id="@+id/cell5" layout="@layout/workspace_screen" />
     </com.android.launcher2.Workspace>
 
-    <ImageView
+    <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"
-        android:scaleType="fitXY"
-        android:src="@drawable/hotseat_track_holo" />
-    <ImageView
+        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"
-        android:visibility="gone"
-        android:alpha="0"
-        android:scaleType="fitXY"
-        android:src="@drawable/hotseat_scrubber_holo" />
+        android:layout_marginBottom="@dimen/button_bar_height" />
 
     <include layout="@layout/qsb_bar"
         android:id="@+id/qsb_bar"
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml
new file mode 100644
index 0000000..7e76737
--- /dev/null
+++ b/res/layout-port/search_bar.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    style="@style/SearchDropTargetBar"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/qsb_bar_height">
+   <!-- Global search icon -->
+   <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/search_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:src="@drawable/ic_search_normal_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickSearchButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_search_button" />
+
+    <!-- Voice search icon -->
+    <ImageView
+        style="@style/SearchButton"
+        android:id="@+id/voice_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentTop="true"
+        android:src="@drawable/ic_voice_search_holo"
+        android:background="@drawable/button_bg"
+        android:onClick="onClickVoiceButton"
+        android:focusable="true"
+        android:clickable="true"
+        android:contentDescription="@string/accessibility_voice_search_button" />
+</RelativeLayout>
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml
index a94b6e6..00c87cb 100644
--- a/res/layout/apps_customize_pane.xml
+++ b/res/layout/apps_customize_pane.xml
@@ -42,6 +42,8 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="right"
                 android:gravity="center"
+                android:paddingLeft="@dimen/toolbar_button_horizontal_padding"
+                android:paddingRight="@dimen/toolbar_button_horizontal_padding"
                 android:text="@string/market"
                 android:contentDescription="@string/market"
                 android:textColor="@color/workspace_all_apps_and_delete_zone_text_color"
@@ -75,24 +77,20 @@
                 launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x"
                 launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y"
                 launcher:maxGap="@dimen/workspace_max_gap" />
-            <ImageView
+
+            <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"
-                android:visibility="gone"
-                android:alpha="0"
-                android:scaleType="fitXY"
-                android:src="@drawable/hotseat_track_holo" />
-            <ImageView
+                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"
-                android:visibility="gone"
-                android:alpha="0"
-                android:scaleType="fitXY"
-                android:src="@drawable/hotseat_scrubber_holo" />
+                android:layout_gravity="bottom" />
          </FrameLayout>
       </LinearLayout>
 </com.android.launcher2.AppsCustomizeTabHost>
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml
index 21043b4..b5b563b 100644
--- a/res/layout/qsb_bar.xml
+++ b/res/layout/qsb_bar.xml
@@ -19,45 +19,8 @@
     android:focusable="false">
 
     <!-- Search buttons container -->
-    <LinearLayout
-        style="@style/SearchDropTargetBar"
-        android:id="@+id/qsb_search_bar"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-       <!-- Global search icon -->
-       <ImageView
-            style="@style/SearchButton"
-            android:id="@+id/search_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_generic_search"
-            android:background="@drawable/button_bg"
-            android:onClick="onClickSearchButton"
-            android:focusable="true"
-            android:clickable="true"
-            android:contentDescription="@string/accessibility_search_button" />
-
-        <ImageView
-            style="@style/SearchButtonDivider"
-            android:id="@+id/search_divider"
-            android:src="@drawable/divider_launcher_holo"
-            android:onClick="onClickSearchButton"
-            android:focusable="false"
-            android:clickable="true" />
-
-        <!-- Voice search icon -->
-        <ImageView
-            style="@style/SearchButton"
-            android:id="@+id/voice_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_voice_search"
-            android:background="@drawable/button_bg"
-            android:onClick="onClickVoiceButton"
-            android:focusable="true"
-            android:clickable="true"
-            android:contentDescription="@string/accessibility_voice_search_button" />
-    </LinearLayout>
+    <include android:id="@+id/qsb_search_bar"
+        layout="@layout/search_bar" />
 
     <!-- Drag specific targets container -->
     <LinearLayout
diff --git a/res/layout/scroll_indicator.xml b/res/layout/scroll_indicator.xml
new file mode 100644
index 0000000..33eed8b
--- /dev/null
+++ b/res/layout/scroll_indicator.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"
+    android:visibility="gone"
+    android:alpha="0"
+    android:scaleType="fitXY"
+    android:src="@drawable/hotseat_scrubber_holo" />
\ No newline at end of file
diff --git a/res/layout/scroll_indicator_track.xml b/res/layout/scroll_indicator_track.xml
new file mode 100644
index 0000000..c0d065a
--- /dev/null
+++ b/res/layout/scroll_indicator_track.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<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:scaleType="fitXY"
+    android:src="@drawable/hotseat_track_holo" />
\ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 39deef5..9a36cbd 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -37,16 +37,8 @@
     <!-- no translation found for applications_tab_label (2991364240020736760) -->
     <skip />
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dit sal die muurpapier-oortjie wees"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programme"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Speletjies"</string>
-    <!-- no translation found for all_apps_tab_downloaded (1488049110598641387) -->
-    <skip />
     <!-- no translation found for long_press_widget_to_add (4307462194057715796) -->
     <skip />
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Geen speletjies gevind nie."</string>
-    <!-- no translation found for all_apps_no_downloads (2284720393234453761) -->
-    <skip />
     <!-- no translation found for market (2652226429823445833) -->
     <skip />
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kon nie item op hierdie tuisskerm plaas nie"</string>
@@ -87,7 +79,7 @@
     <skip />
     <!-- no translation found for delete_target_uninstall_label (748894921183769150) -->
     <skip />
-    <!-- no translation found for info_target_label (6175926565900432067) -->
+    <!-- no translation found for info_target_label (4019495079517426980) -->
     <skip />
     <!-- no translation found for accessibility_search_button (816822994629942611) -->
     <skip />
@@ -133,4 +125,6 @@
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is \'n stelselprogram en kan nie gedeïnstalleer word nie."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->
     <skip />
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 82c4066..f57dc41 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -37,16 +37,8 @@
     <!-- no translation found for applications_tab_label (2991364240020736760) -->
     <skip />
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ይህ የልጥፎች ትር ይሆናል"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"ሁሉም"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"ትግበራ"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"ጨዋታዎች"</string>
-    <!-- no translation found for all_apps_tab_downloaded (1488049110598641387) -->
-    <skip />
     <!-- no translation found for long_press_widget_to_add (4307462194057715796) -->
     <skip />
-    <string name="all_apps_no_games" msgid="5293893733372793696">"ምንም ጨዋታዎች አልተገኙም።"</string>
-    <!-- no translation found for all_apps_no_downloads (2284720393234453761) -->
-    <skip />
     <!-- no translation found for market (2652226429823445833) -->
     <skip />
     <string name="external_drop_widget_error" msgid="4976816434597126575">"እዚህ የመነሻማያ ላይ አይነት ማኖር አልተቻለም።"</string>
@@ -87,7 +79,7 @@
     <skip />
     <!-- no translation found for delete_target_uninstall_label (748894921183769150) -->
     <skip />
-    <!-- no translation found for info_target_label (6175926565900432067) -->
+    <!-- no translation found for info_target_label (4019495079517426980) -->
     <skip />
     <!-- no translation found for accessibility_search_button (816822994629942611) -->
     <skip />
@@ -133,4 +125,6 @@
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"ይህ የስርዓት ትግበራ ነው እና አለማራገፍ አይቻልም።"</string>
     <!-- no translation found for dream_name (2847171357608437154) -->
     <skip />
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ar-large/strings.xml b/res/values-ar-large/strings.xml
index 63f059e..eb51f77 100644
--- a/res/values-ar-large/strings.xml
+++ b/res/values-ar-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"تحديد خلفية"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"لا تتوفر أية خلفيات"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"إلغاء"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index b8b0349..c7b504d 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"الخلفيات"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"اختصارات التطبيقات"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ستكون هذه علامة تبويب الخلفيات"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"الكل"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"التطبيقات"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"الألعاب"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"تطبيقاتي"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"اضغط مع الاستمرار لاختيار إحدى الأدوات"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"لم يتم العثور على ألعاب"</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"ليس لديك أي تطبيقات تم تنزيلها."</string>
     <string name="market" msgid="2652226429823445833">"تسوق"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"تعذر إسقاط العنصر على هذه الشاشة الرئيسية"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"تحديد أداة للإنشاء"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"إزالة"</string>
     <string name="delete_target_label" msgid="665300185123139530">"إزالة"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"إزالة"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"إدارة"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"معلومات التطبيق"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"بحث"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"البحث الصوتي"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"التطبيقات"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"حدثت مشكلة أثناء تحميل الأداة"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"هذا تطبيق نظام وتتعذر إزالته."</string>
     <string name="dream_name" msgid="2847171357608437154">"راجمة"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-bg-large/strings.xml b/res/values-bg-large/strings.xml
index 39c2471..5627dce 100644
--- a/res/values-bg-large/strings.xml
+++ b/res/values-bg-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Избор на тапет"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Няма налични тапети"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Отказ"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 747651c..83a7fda 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Тапети"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Преки пътища на приложения"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Това ще бъде разделът с тапети"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Всички"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Приложения"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Игри"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Моите приложения"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Натиснете дълго за избор на приспособление"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Няма намерени игри."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Нямате изтеглени приложения."</string>
     <string name="market" msgid="2652226429823445833">"Магазин"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Елементът не можа да се премести на началния екран"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Избор на създаващо приспособление"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Деинсталиране"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Премахване"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Деинсталиране"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Управление"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Информация за приложението"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Търсене"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Гласово търсене"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Приложения"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Проблем при зареждане на приспособление"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Това е системно приложение и не може да се деинсталира."</string>
     <string name="dream_name" msgid="2847171357608437154">"Ракетна площадка"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ca-large/strings.xml b/res/values-ca-large/strings.xml
index 5958da7..7252c3e 100644
--- a/res/values-ca-large/strings.xml
+++ b/res/values-ca-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Selecció d\'un empaperat"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"No hi ha empaperats disponibles"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Cancel·la"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b380014..fb3ee12 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Empaperats"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Dreceres d\'aplicacions"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Aquesta serà la pestanya dels empaperats"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Totes"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicacions"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jocs"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Les meves aplicacions"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Mantén premut un widget per triar-lo"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"No s\'ha trobat cap joc."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"No has baixat cap aplicació."</string>
     <string name="market" msgid="2652226429823445833">"Botiga"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"No s\'ha pogut trasll. l\'element a la pant. d\'inici"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Selecciona un widget per crear-lo"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstal·la"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Elimina"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstal·la"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Gestiona"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informació de l\'aplicació"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Cerca"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Cerca per veu"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplicacions"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"S\'ha produït un problema en carregar el widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Això és una aplicació del sistema i no es pot desinstal·lar."</string>
     <string name="dream_name" msgid="2847171357608437154">"Llançamíssils"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-cs-large/strings.xml b/res/values-cs-large/strings.xml
index 8a4017b..2387c68 100644
--- a/res/values-cs-large/strings.xml
+++ b/res/values-cs-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Výběr tapety"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"K dispozici nejsou žádné tapety"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Zrušit"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 6f9cfa4..176bf4b 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Zástupci aplikací"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Toto bude karta Tapety"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Vše"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikace"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Hry"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Moje aplikace"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Widget přidáte dlouhým stisknutím tlačítka"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nenalezeny žádné hry."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nemáte žádné stažené aplikace."</string>
     <string name="market" msgid="2652226429823445833">"Obchod"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Na tuto plochu nelze položku přetáhnout"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Vyberte widget"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Odinstalovat"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Odstranit"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Odinstalovat"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Spravovat"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informace o aplikaci"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Hledat"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Hlasové vyhledávání"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplikace"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problém s načtením widgetu"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikace a nelze ji odinstalovat."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketomet"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-da-large/strings.xml b/res/values-da-large/strings.xml
index 66b6ece..9bc5155 100644
--- a/res/values-da-large/strings.xml
+++ b/res/values-da-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Vælg tapet"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Ingen tilgængelige tapeter"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Annuller"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a57306b..f30ef2a 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapeter"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Programgenveje"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er fanen for tapeter"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programmer"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spil"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mine apps"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Tryk længe for at tilføje en widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Ingen spil."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Du har ingen downloadede applikationer."</string>
     <string name="market" msgid="2652226429823445833">"Butik"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kunne ikke slippe elementet på denne startskærm"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Vælg widget for at oprette"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Afinstaller"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Fjern"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Afinstaller"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Administrer"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Oplysninger om appen"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Søg"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Stemmesøgning"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Programmer"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Der er problemer med indlæsning af widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram, som ikke kan afinstalleres."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-de-large/strings.xml b/res/values-de-large/strings.xml
index de2e6f6..e101422 100644
--- a/res/values-de-large/strings.xml
+++ b/res/values-de-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Hintergrund auswählen"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Keine Hintergründe verfügbar"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Abbrechen"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1c85381..f29e516 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hintergründe"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"App-Verknüpfungen"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dies ist der Tab \"Hintergründe\""</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spiele"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Meine Apps"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Zum Hinzufügen eines Widgets lange drücken"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Keine Spiele gefunden."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Keine heruntergeladenen Anwendungen vorhanden"</string>
     <string name="market" msgid="2652226429823445833">"Shop"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Element wurde nicht auf Startbildschirm abgelegt."</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Widget für Erstellung auswählen"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Deinstallieren"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Entfernen"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Deinstallieren"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Verwalten"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"App-Info"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Suchen"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Sprachsuche"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Apps"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem beim Laden des Widgets"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dies ist eine Systemanwendung, die nicht deinstalliert werden kann."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketenstartgerät"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-el-large/strings.xml b/res/values-el-large/strings.xml
index 751509b..56d85ca 100644
--- a/res/values-el-large/strings.xml
+++ b/res/values-el-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Επιλογή ταπετσαρίας"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Δεν υπάρχουν διαθέσιμες ταπετσαρίες"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Ακύρωση"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 29d5649..155fcde 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Ταπετσαρίες"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Συντομεύσεις εφαρμογών"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Αυτή θα είναι η καρτέλα ταπετσαριών"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Όλες"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Εφαρμογές"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Παιχνίδια"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Οι εφαρμογές μου"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Πατήστε παρατεταμένα για επιλογή γραφικού στοιχείου"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Δεν βρέθηκαν παιχνίδια."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Δεν υπάρχουν εφαρμογές από λήψη."</string>
     <string name="market" msgid="2652226429823445833">"Αγορές"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Δεν έγινε η απόθ. του στοιχείου στην αρχική οθόνη"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Επιλογή γραφ. στοιχείου δημιουργίας"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Κατάργηση εγκατάστασης"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Κατάργηση"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Κατάργηση εγκατάστασης"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Διαχείριση"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Πληροφορίες εφαρμογής"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Αναζήτηση"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Φωνητική αναζήτηση"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Εφαρμογές"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Παρουσιάστηκε πρόβλημα στη φόρτωση του γραφικού στοιχείου"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Αυτή είναι εφαρμογή του συστήματος και δεν είναι δυνατή η κατάργηση της εγκατάστασής της."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB-large/strings.xml b/res/values-en-rGB-large/strings.xml
index 5eb3644..276ab94 100644
--- a/res/values-en-rGB-large/strings.xml
+++ b/res/values-en-rGB-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Select wallpaper"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"No wallpaper available"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Cancel"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a07f5a8..2541aec 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Wallpaper"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"App shortcuts"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"This will be the wallpaper tab"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"All"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Games"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"My apps"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Long-press to pick up a widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"No games found."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"You have no downloaded applications."</string>
     <string name="market" msgid="2652226429823445833">"Shop"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Could not drop item onto this home screen"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Select widget to create"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Uninstall"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Remove"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Uninstall"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Manage"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"App info"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Search"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Voice Search"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applications"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem loading widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"This is a system application and cannot be uninstalled."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-es-large/strings.xml b/res/values-es-large/strings.xml
index 7247599..e018aee 100644
--- a/res/values-es-large/strings.xml
+++ b/res/values-es-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Seleccionar fondo de pantalla"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"No hay fondos de pantalla disponibles."</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Cancelar"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-es-rUS-large/strings.xml b/res/values-es-rUS-large/strings.xml
index a8d42cb..7cc6740 100644
--- a/res/values-es-rUS-large/strings.xml
+++ b/res/values-es-rUS-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Seleccionar fondo de pantalla"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Ningún fondo de pantalla disponible"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Cancelar"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 40b927e..a8f298a 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papeles tapiz"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Accesos directos a aplicaciones"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ésta será la pestaña para los papeles tapiz"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todos"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicaciones"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mis aplicaciones"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Realiza una pulsación larga para tomar un widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"No se encontraron juegos."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"No has descargado ninguna aplicación."</string>
     <string name="market" msgid="2652226429823445833">"Comprar"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"No se pudo colocar el elemento en esta pantalla principal"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Seleccionar widget para crear"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Eliminar"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Administrar"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Información de la aplicación"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Buscar"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Búsqueda por voz"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplicaciones"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Esta es una aplicación de sistema y no puede desinstalarse."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lanzacohetes"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 1d5f661..6db86eb 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fondos de pantalla"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Accesos directos de aplicaciones"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Será la carpeta de fondos de pantalla."</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todas las aplicaciones"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicaciones"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Juegos"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mis aplicaciones"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Mantener pulsado para seleccionar un widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"No hay juegos."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"No tienes aplicaciones descargadas."</string>
     <string name="market" msgid="2652226429823445833">"Tienda"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"No se puede soltar el elemento en este escritorio."</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Seleccionar widget"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Eliminar"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Administrar"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Información de la aplicación"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Buscar"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Búsqueda por voz"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplicaciones"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema al cargar el widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Se trata de una aplicación del sistema y no se puede desinstalar."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-fa-large/strings.xml b/res/values-fa-large/strings.xml
index f7701e0..7ec422f 100644
--- a/res/values-fa-large/strings.xml
+++ b/res/values-fa-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"انتخاب تصویر زمینه"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"هیچ تصویر زمینه ای موجود نیست"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"لغو"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 5790dc2..c9ebc9d 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"تصاویر زمینه"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"میانبرهای برنامه"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"این برگه تصاویر زمینه خواهد بود"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"همه"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"برنامه های کاربردی"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"بازی ها"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"برنامه های من"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"برای انتخاب ابزارک، برای مدت طولانی فشار دهید"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"هیچ بازی پیدا نشد."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"شما هیچ برنامه کاربردی دانلود شده ای ندارید."</string>
     <string name="market" msgid="2652226429823445833">"فروشگاه"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"نمی توان موردی در این صفحه اصلی انداخت"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"انتخاب ابزارک جهت ایجاد"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"حذف نصب"</string>
     <string name="delete_target_label" msgid="665300185123139530">"حذف"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"حذف نصب"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"مدیریت"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"اطلاعات برنامه"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"جستجو"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"جستجوی صوتی"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"برنامه های کاربردی"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"مشکل در بارگیری ابزارک"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"این یک برنامه سیستمی است و لغو نصب نمی شود."</string>
     <string name="dream_name" msgid="2847171357608437154">"پرتاب کننده موشک"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-fi-large/strings.xml b/res/values-fi-large/strings.xml
index b7b06c5..f3baf00 100644
--- a/res/values-fi-large/strings.xml
+++ b/res/values-fi-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Valitse taustakuva"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Ei taustakuvia saatavilla"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Peruuta"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 02b0b17..57dfac1 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Taustakuvat"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Sovelluspikakuvakkeet"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Tämä on taustakuvavälilehti"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Kaikki"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Sovellukset"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Pelit"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Omat sovellukset"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Valitse widget painamalla sitä pitkään"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Ei pelejä."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Ei ladattuja sovelluksia."</string>
     <string name="market" msgid="2652226429823445833">"Myymälä"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kohdetta ei voi lisätä etusivulle"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Valitse luotava widget"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Poista"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Poista"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Poista"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Hallinnoi"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Sovelluksen tiedot"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Haku"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Äänihaku"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Sovellukset"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Ongelma ladattaessa widgetiä"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Tämä on järjestelmäsovellus, eikä sitä voi poistaa."</string>
     <string name="dream_name" msgid="2847171357608437154">"Sinko"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-large/strings.xml b/res/values-fr-large/strings.xml
index 953a9fa..4fd5350 100644
--- a/res/values-fr-large/strings.xml
+++ b/res/values-fr-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Sélectionner un fond d\'écran"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Aucun fond d\'écran disponible."</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Annuler"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 9e42734..c2b90a8 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fonds d\'écran"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Raccourcis applications"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Onglet des fonds d\'écran"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Toutes"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Applications"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jeux"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mes applications"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Appuyer de manière prolongée pour ajouter un widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Aucun jeu n\'a été trouvé."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Vous n\'avez téléchargé aucune application."</string>
     <string name="market" msgid="2652226429823445833">"Acheter"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Impossible de déposer l\'élément sur l\'écran d\'accueil."</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Sélectionner le widget à créer"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Désinstaller"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Supprimer"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Désinstaller"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Gérer"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informations sur l\'application"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Rechercher"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Recherche vocale"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applications"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problème lors du chargement du widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Il s\'agit d\'une application système que vous ne pouvez pas désinstaller."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lance-missile"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-hr-large/strings.xml b/res/values-hr-large/strings.xml
index c4a21ea..95c55b9 100644
--- a/res/values-hr-large/strings.xml
+++ b/res/values-hr-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Odaberite pozadinsku sliku"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Nema dostupnih pozadinskih slika"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Odustani"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5ab7989..d71a977 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Pozadinske slike"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Prečaci aplikacija"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ovo će biti kartica pozadinske slike"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Sve"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikacije"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Igre"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Moje aplikacije"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Pritisnite dugo da biste  podignuli widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Igre nisu pronađene."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nemate preuzetih aplikacija"</string>
     <string name="market" msgid="2652226429823445833">"Trgovina"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nije bilo moguće spustiti stavku na početni zaslon"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Odabir widgeta za stvaranje"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Deinstaliraj"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Uklanjanje"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Deinstaliranje"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Upravljanje"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informacije o aplikaciji"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Pretraži"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Glasovno pretraživanje"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplikacije"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem pri učitavanju widgeta"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ovo je aplikacija sustava i ne može se ukloniti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-hu-large/strings.xml b/res/values-hu-large/strings.xml
index 8e64355..fe42077 100644
--- a/res/values-hu-large/strings.xml
+++ b/res/values-hu-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Háttérkép kiválasztása"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Nincs elérhető háttérkép"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Mégse"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 314302a..8fbf81b 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Háttérképek"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Alkalmazás-parancsikonok"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ez lesz a háttérképek lapja"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Összes"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Alkalmazások"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Játékok"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Saját alkalmazások"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Nyomja meg hosszan a modul felvételéhez"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nincsenek játékok."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nincsenek letöltött alkalmazásai."</string>
     <string name="market" msgid="2652226429823445833">"Bolt"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nem lehet elhelyezni az elemet ezen a főoldalon"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"A létrehozandó modul kiválasztása"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Eltávolítás"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Eltávolítás"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Eltávolítás"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Kezelés"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Alkalmazásinformáció"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Keresés"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Hangalapú keresés"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Alkalmazások"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Probléma történt a modul betöltésekor"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ez egy rendszeralkalmazás, ezért nem lehet eltávolítani."</string>
     <string name="dream_name" msgid="2847171357608437154">"Aknavető"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-in-large/strings.xml b/res/values-in-large/strings.xml
index d1da62d..4064a49 100644
--- a/res/values-in-large/strings.xml
+++ b/res/values-in-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Pilih wallpaper"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Tidak tersedia wallpaper"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Batal"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 90b359d..e6ec944 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Wallpaper"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Pintasan apl"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ini akan menjadi tab wallpaper"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Semua"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Permainan"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Apl saya"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Tekan lama untuk memilih gawit"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Tidak ditemukan permainan."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Anda tidak memiliki aplikasi yang diunduh."</string>
     <string name="market" msgid="2652226429823445833">"Belanja"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Tidak dapat menaruh item pada layar utama ini"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Pilih widget untuk membuat"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Copot pemasangan"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Hapus"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Copot pemasangan"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Kelola"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Info apl"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Telusuri"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Penelusuran Suara"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplikasi"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Masalah memuat widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ini adalah aplikasi sistem dan tidak dapat diunduh."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-it-large/strings.xml b/res/values-it-large/strings.xml
index 266a4f6..249f880 100644
--- a/res/values-it-large/strings.xml
+++ b/res/values-it-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Seleziona sfondo"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Nessuno sfondo disponibile"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Annulla"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ecda503..1c750a4 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Sfondi"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Scorciatoie applicazioni"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Questa sarà la scheda degli sfondi"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Tutte"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Applicazioni"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Giochi"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Le mie applicazioni"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Premi a lungo per selezionare un widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nessun gioco trovato."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Non hai applicazioni scaricate."</string>
     <string name="market" msgid="2652226429823445833">"Acquista"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Impossibile rilasciare elemento in schermata Home"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Seleziona il widget da creare"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Disinstalla"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Rimuovi"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Disinstalla"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Gestisci"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informazioni applicazione"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Cerca"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Ricerca vocale"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applicazioni"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Errore durante il caricamento del widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Questa è un\'applicazione di sistema e non può essere disinstallata."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lanciamissili"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-iw-large/strings.xml b/res/values-iw-large/strings.xml
index 82a95bd..ab82b96 100644
--- a/res/values-iw-large/strings.xml
+++ b/res/values-iw-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"בחר טפט"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"אין טפטים זמינים"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"ביטול"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 6603e19..09c76dc 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"טפטים"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"קיצורי דרך של יישומים"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"זו תהיה כרטיסיית הטפטים"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"הכל"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"יישומים"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"משחקים"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"היישומים שלי"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"לחץ לחיצה ארוכה כדי לאסוף widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"לא נמצאו משחקים."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"לא הורדת יישומים."</string>
     <string name="market" msgid="2652226429823445833">"קנה"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"אין אפשרות להניח פריט במסך בית זה"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"בחר widget כדי ליצור"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"הסר התקנה"</string>
     <string name="delete_target_label" msgid="665300185123139530">"הסר"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"הסר התקנה"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"ניהול"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"פרטי יישום"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"חפש"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"חיפוש קולי"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"יישומים"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"בעיה בטעינת widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"זהו יישום מערכת ואין אפשרות להסיר את התקנתו."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ja-large/strings.xml b/res/values-ja-large/strings.xml
index efb9251..24aea5e 100644
--- a/res/values-ja-large/strings.xml
+++ b/res/values-ja-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"壁紙の選択"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"利用できる壁紙がありません"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"キャンセル"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 1d0b962..be77af7 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁紙"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"アプリのショートカット"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"ここが壁紙タブになります"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"すべて"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"アプリ"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"ゲーム"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"マイアプリ"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"ウィジェットを追加するには押し続けます"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"ゲームなし"</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"ダウンロードしたアプリケーションはありません。"</string>
     <string name="market" msgid="2652226429823445833">"ショップ"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"このホーム画面にアイテムをドロップできませんでした"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"作成するウィジェットを選択"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"アンインストール"</string>
     <string name="delete_target_label" msgid="665300185123139530">"削除"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"アンインストール"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"管理"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"アプリケーション情報"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"検索"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"音声検索"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"アプリケーション"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"ウィジェットを表示できません"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"このシステムアプリケーションはアンインストールできません。"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ko-large/strings.xml b/res/values-ko-large/strings.xml
index 6288b72..93203de 100644
--- a/res/values-ko-large/strings.xml
+++ b/res/values-ko-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"배경화면 선택"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"배경화면이 없습니다."</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"취소"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index d49b4eb..4e99805 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"배경화면"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"앱 바로가기"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"배경화면 탭이 됩니다."</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"전체"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"애플리케이션"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"게임"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"내 애플리케이션"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"위젯을 선택하려면 길게 누르세요."</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"게임이 없습니다."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"다운로드한 애플리케이션이 없습니다."</string>
     <string name="market" msgid="2652226429823445833">"쇼핑"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"홈 화면에 항목을 드롭할 수 없습니다."</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"만들 위젯 선택"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"제거"</string>
     <string name="delete_target_label" msgid="665300185123139530">"삭제"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"제거"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"관리"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"앱 정보"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"검색"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"음성 검색"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"애플리케이션"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"위젯을 로드하는 중 문제가 발생했습니다."</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"시스템 애플리케이션은 제거할 수 없습니다."</string>
     <string name="dream_name" msgid="2847171357608437154">"로켓 실행기"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-large/dimens.xml b/res/values-large/dimens.xml
index 90f262b..7da10db 100644
--- a/res/values-large/dimens.xml
+++ b/res/values-large/dimens.xml
@@ -15,6 +15,10 @@
 -->
 
 <resources>
+<!-- QSB -->
+    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">12dip</dimen>
+
 <!-- Workspace -->
     <dimen name="qsb_bar_height">56dp</dimen>
 
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index 531e2e6..25b8195 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -18,7 +18,17 @@
 -->
 
 <resources>
+<!-- AppsCustomize -->
+    <style name="AppsCustomizeScrollTrack">
+        <item name="android:visibility">gone</item>
+    </style>
+
 <!-- Workspace -->
+    <style name="ScrollIndicatorTrack">
+        <item name="android:visibility">gone</item>
+        <item name="android:alpha">0</item>
+    </style>
+
     <style name="WorkspaceIcon.Portrait">
         <item name="android:drawablePadding">4dp</item>
         <item name="android:paddingLeft">4dp</item>
@@ -78,6 +88,8 @@
     <!-- QSB Search / Drop Target bar -->
     <style name="SearchDropTargetBar">
         <item name="android:orientation">horizontal</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
     </style>
     <style name="SearchButton">
         <item name="android:layout_gravity">center_vertical</item>
diff --git a/res/values-lt-large/strings.xml b/res/values-lt-large/strings.xml
index c95fcd2..cc8bb90 100644
--- a/res/values-lt-large/strings.xml
+++ b/res/values-lt-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Pasirinkti darbalaukio foną"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Negalimi jokie darbalaukio fonai"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Atšaukti"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 78c7f6e..790c9fc 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Darbalaukio fonai"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Spartieji programos klavišai"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Tai bus darbalaukio fonų skirtukas"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Visos"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Žaidimai"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mano programos"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Kad pasirinkt. valdiklį, ilgai laikykite nuspaudę"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nerasta žaidimų."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Neturite atsisiųstų programų."</string>
     <string name="market" msgid="2652226429823445833">"Parduotuvė"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nepavyko pašalinti elemento šiame pagr. ekrane"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Pasirinkti norimą sukurti valdiklį"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Pašalinti"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Pašalinti"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Pašalinti"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Valdyti"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Programos informacija"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Ieškoti"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Balso paieška"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Programos"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema įkeliant valdiklį"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Tai sistemos programa ir jos negalima pašalinti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketinis prieštankinis šautuvas"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-lv-large/strings.xml b/res/values-lv-large/strings.xml
index 63c6111..a1cfaf0 100644
--- a/res/values-lv-large/strings.xml
+++ b/res/values-lv-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Fona tapetes atlase"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Fona tapetes nav pieejamas."</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Atcelt"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index b26f5eb..9a92162 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Fona tapetes"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Lietotņu saīsnes"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Šī būs fona tapetes cilne"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Visas"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Lietotnes"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spēles"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Manas lietotnes"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Lai izvēlētos logrīku, turiet to nospiestu."</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nav nevienas spēles."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nav ielādēta neviena lietojumprogramma."</string>
     <string name="market" msgid="2652226429823445833">"Iepirkties"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nevarēja nomest vienumu šajā sākumekrānā."</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Atlasīt izveidojamo logrīku"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Atinstalēt"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Noņemt"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Atinstalēt"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Pārvaldīt"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Lietotnes informācija"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Meklēt"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Balss meklēšana"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Lietojumprogrammas"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Radās problēma, ielādējot logrīku"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Šī ir sistēmas lietojumprogramma un to nevar atinstalēt."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 2d00368..3960bc7 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -33,16 +33,10 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Kertas dinding"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Pintasan apl"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ini akan menjadi tab kertas dinding"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Semua"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apl"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Permainan"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Apl saya"</string>
     <!-- no translation found for long_press_widget_to_add (4307462194057715796) -->
     <skip />
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Tiada permainan ditemui."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Anda tiada aplikasi yang dimuat turun."</string>
     <string name="market" msgid="2652226429823445833">"Kedai"</string>
-    <string name="external_drop_widget_error" msgid="4976816434597126575">"Tidak dapat melepaskan item atas skrin utama ini"</string>
+    <string name="external_drop_widget_error" msgid="4976816434597126575">"Tidak dapat melepaskan item pada skrin utama ini"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Pilih widget untuk dibuat"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Nama folder"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Namakan semula folder"</string>
@@ -73,7 +67,7 @@
     <skip />
     <!-- no translation found for delete_target_uninstall_label (748894921183769150) -->
     <skip />
-    <!-- no translation found for info_target_label (6175926565900432067) -->
+    <!-- no translation found for info_target_label (4019495079517426980) -->
     <skip />
     <string name="accessibility_search_button" msgid="816822994629942611">"Carian"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Carian Suara"</string>
@@ -106,4 +100,6 @@
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ini adalah aplikasi sistem dan tidak boleh dinyahpasang."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->
     <skip />
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-nb-large/strings.xml b/res/values-nb-large/strings.xml
index d4376d2..52f392c 100644
--- a/res/values-nb-large/strings.xml
+++ b/res/values-nb-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Velg bakgrunn"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Ingen bakgrunner er tilgjengelige"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Avbryt"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index fc4e4d6..4725d29 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrunner"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"App-snarveier"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dette er nå bakgrunnsfanen"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programmer"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spill"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mine programmer"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Trykk og hold inne for å plukke opp en modul"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Finner ingen spill."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Du har ingen nedlastede programmer."</string>
     <string name="market" msgid="2652226429823445833">"Butikk"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kunne ikke slippe elementet på denne startskjermen"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Velg modul for oppretting"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Avinstaller"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Fjern"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Avinstaller"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Administrer"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"App-info"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Søk"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Talesøk"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Applikasjoner"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem under lasting av gadget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dette er et systemprogram og kan ikke avinstalleres."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-nl-large/strings.xml b/res/values-nl-large/strings.xml
index f410a43..c044921 100644
--- a/res/values-nl-large/strings.xml
+++ b/res/values-nl-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Achtergrond selecteren"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Geen achtergronden beschikbaar"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Annuleren"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 58e4182..b5b184c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Achtergronden"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Toepassingssnelkoppelingen"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Dit wordt het tabblad \'Achtergronden\'"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alle"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Games"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mijn apps"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Druk lang om een widget op te halen"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Geen games gevonden."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"U heeft geen gedownloade apps."</string>
     <string name="market" msgid="2652226429823445833">"Winkel"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Kan item niet neerzetten op dit startscherm"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Widget selecteren om te maken"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Verwijderen"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Verwijderen"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Installatie ongedaan maken"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Beheren"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"App-info"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Zoeken"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Spraakgestuurd zoeken"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Apps"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Probleem bij het laden van widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Dit is een systeemtoepassing die niet kan worden verwijderd."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-pl-large/strings.xml b/res/values-pl-large/strings.xml
index 415260e..44fbf4f 100644
--- a/res/values-pl-large/strings.xml
+++ b/res/values-pl-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Wybierz tapetę"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Brak tapet"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Anuluj"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 7df2679..3b12b0d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Skróty do aplikacji"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"To będzie karta tapet"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Wszystkie"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikacje"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Gry"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Moje aplikacje"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Naciśnij i przytrzymaj widżet, aby go dodać"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nie znaleziono gier."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nie masz żadnych pobranych aplikacji."</string>
     <string name="market" msgid="2652226429823445833">"Sklep"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Nie można upuścić elementu na ekranie głównym"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Wybierz widżet do utworzenia"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Odinstaluj"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Usuń"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Odinstaluj"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Zarządzaj"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informacje o aplikacji"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Szukaj"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Wyszukiwanie głosowe"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplikacje"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problem podczas ładowania widżetu"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"To jest aplikacja systemowa i nie można jej odinstalować."</string>
     <string name="dream_name" msgid="2847171357608437154">"Wyrzutnia rakiet"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-large/strings.xml b/res/values-pt-large/strings.xml
index 7417d01..ee43758 100644
--- a/res/values-pt-large/strings.xml
+++ b/res/values-pt-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Selecionar papel de parede"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Nenhum papel de parede disponível"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Cancelar"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-pt-rPT-large/strings.xml b/res/values-pt-rPT-large/strings.xml
index bea7c2c..b6c2d16 100644
--- a/res/values-pt-rPT-large/strings.xml
+++ b/res/values-pt-rPT-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Selecionar imagem de fundo"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Nenhuma imagem de fundo disponível"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Cancelar"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index a7b1367..c08f35c 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Imagens de fundo"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Atalhos de aplicações"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Isto será o separador de imagens de fundo"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todas"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicações"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jogos"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"As minhas aplicações"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Prima por mais tempo para escolher um widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Sem jogos."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Não existem aplicações transferidas."</string>
     <string name="market" msgid="2652226429823445833">"Loja"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Não foi possível largar o item neste ecrã inicial"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Seleccionar widget a criar"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Remover"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Gerir"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informações da aplicação"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Pesquisar"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Pesquisa por Voz"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplicações"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Erro ao carregar o widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"É uma aplicação de sistema e não pode ser desinstalada."</string>
     <string name="dream_name" msgid="2847171357608437154">"Lança-mísseis"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 19b084a..9c59134 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Papéis de parede"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Atalhos de aplicativo"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Esta será a guia de papéis de parede"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Todos"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicativos"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jogos"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Meus aplicativos"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Mantenha pressionado para adicionar um widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nenhum jogo encontrado."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Você não tem nenhum aplicativo transferido."</string>
     <string name="market" msgid="2652226429823445833">"Comprar"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Não foi possível soltar o item nesta tela inicial"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Selecione um widget para criar"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Desinstalar"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Remover"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Desinstalar"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Gerenciar"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informações do aplicativo"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Pesquisar"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Pesquisa por voz"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplicativos"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema ao carregar o widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Este é um aplicativo do sistema e não pode ser desinstalado."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 86c5ad3..1a89f72 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -39,20 +39,8 @@
     <skip />
     <!-- no translation found for wallpapers_temp_tab_text (1660218201190495279) -->
     <skip />
-    <!-- no translation found for all_apps_tab_all (2942727589595027258) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_apps (5468972551904071712) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_games (1855736784923494918) -->
-    <skip />
-    <!-- no translation found for all_apps_tab_downloaded (1488049110598641387) -->
-    <skip />
     <!-- no translation found for long_press_widget_to_add (4307462194057715796) -->
     <skip />
-    <!-- no translation found for all_apps_no_games (5293893733372793696) -->
-    <skip />
-    <!-- no translation found for all_apps_no_downloads (2284720393234453761) -->
-    <skip />
     <!-- no translation found for market (2652226429823445833) -->
     <skip />
     <!-- no translation found for external_drop_widget_error (4976816434597126575) -->
@@ -91,7 +79,7 @@
     <skip />
     <!-- no translation found for delete_target_uninstall_label (748894921183769150) -->
     <skip />
-    <!-- no translation found for info_target_label (6175926565900432067) -->
+    <!-- no translation found for info_target_label (4019495079517426980) -->
     <skip />
     <!-- no translation found for accessibility_search_button (816822994629942611) -->
     <skip />
@@ -138,4 +126,6 @@
     <skip />
     <!-- no translation found for dream_name (2847171357608437154) -->
     <skip />
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ro-large/strings.xml b/res/values-ro-large/strings.xml
index 9085960..0e7eaa3 100644
--- a/res/values-ro-large/strings.xml
+++ b/res/values-ro-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Selectaţi o imagine de fundal"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Nu există imagini de fundal disponibile"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Anulaţi"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 5816a3e..20ddb2f 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Imagini de fundal"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Comenzi rapide aplicaţii"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Aceasta va fi fila pentru imagini de fundal"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Toate"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplicaţii"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Jocuri"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Aplicaţiile mele"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Apăsaţi lung pentru a alege un widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nu s-au găsit jocuri."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nu aveţi aplicaţii descărcate."</string>
     <string name="market" msgid="2652226429823445833">"Cumpăraţi"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Impos. de plasat elem. pe acest ecran de pornire"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Selectaţi obiectul widget"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Dezinstalaţi"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Eliminaţi"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Dezinstalaţi"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Gestionaţi"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informaţii aplicaţie"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Căutaţi"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Căutare vocală"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplicaţii"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Probleme la încărcarea obiectului widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Aceasta este o aplicaţie a sistemului şi nu se poate dezinstala."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-ru-large/strings.xml b/res/values-ru-large/strings.xml
index 8affd24..592dc6b 100644
--- a/res/values-ru-large/strings.xml
+++ b/res/values-ru-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Выберите обои"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Нет доступных обоев"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Отмена"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1531198..b51eb8e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Обои"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Ярлыки приложений"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Это будет вкладка обоев"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Все"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Приложения"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Игры"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Мои приложения"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Нажмите и удерживайте, чтобы выбрать виджет"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Игр не найдено."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"У вас нет загруженных приложений."</string>
     <string name="market" msgid="2652226429823445833">"Маркет"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Не удается скопировать элемент на главный экран"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Выберите виджет"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Удалить"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Удалить"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Удалить"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Управление"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Сведения о приложении"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Поиск"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Голосовой поиск"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Приложения"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Не удалось загрузить виджет"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Это системное приложение. Удалить его невозможно."</string>
     <string name="dream_name" msgid="2847171357608437154">"Фейерверк"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-sk-large/strings.xml b/res/values-sk-large/strings.xml
index 90e1138..77cceb3 100644
--- a/res/values-sk-large/strings.xml
+++ b/res/values-sk-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Výber tapety"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"K dispozícii nie sú žiadne tapety"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Zrušiť"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ed6840f..2379744 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Tapety"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Odkazy aplikácií"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Toto bude karta Tapety"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Všetky"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Aplikácie"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Hry"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Moje aplikácie"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Miniaplikáciu pridáte dlhým stlačením"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Nenašli sa žiadne hry."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Nemáte žiadne prevzaté aplikácie."</string>
     <string name="market" msgid="2652226429823445833">"Obchod"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Položku sa nepodarilo pretiahnuť na túto plochu"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Vyberte miniaplikáciu"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Odinštalovať"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Odstrániť"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Odinštalovať"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Spravovať"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Informácie o aplikácii"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Hľadať"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Hlasové vyhľadávanie"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Aplikácie"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problém s načítaním miniaplikácií"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Toto je systémová aplikácia a nie je možné ju odinštalovať."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketomet"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-sl-large/strings.xml b/res/values-sl-large/strings.xml
index af7631b..abb4526 100644
--- a/res/values-sl-large/strings.xml
+++ b/res/values-sl-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Izberite sliko za ozadje"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Ni slik za ozadje"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Prekliči"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 753d0d8..3e6360c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Ozadja"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Bližnjice do programov"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"To bo zavihek ozadij"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Vse"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programi"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Igre"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Moji programi"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Pritisnite za daljši čas, da poberete pripomoček"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Ni najdenih iger."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Ni prenesenih programov."</string>
     <string name="market" msgid="2652226429823445833">"Nakup"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Elementa ni bilo mogoče postaviti na ta začetni zaslon"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Izberite želeni pripomoček"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Odstrani"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Izbriši"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Odstrani"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Upravljanje"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Podatki o programu"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Išči"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Glasovno iskanje"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Programi"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Težave pri nalaganju pripomočka"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"To je sistemski program in ga ni mogoče odstraniti."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketno izstrelišče"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-sr-large/strings.xml b/res/values-sr-large/strings.xml
index bac6570..c559806 100644
--- a/res/values-sr-large/strings.xml
+++ b/res/values-sr-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Избор позадине"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Позадине нису доступне"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Откажи"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index a2f7b1a..c409baf 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Позадине"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Пречице за апликације"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ово ће бити картица позадине"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Све"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Игре"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Моје апликације"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Притисните и задржите да бисте додали виџет"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Нису пронађене игре."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Немате ниједну преузету апликацију."</string>
     <string name="market" msgid="2652226429823445833">"Куповина"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Ставка није пребачена на овај почетни екран"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Изаберите виџет за креирање"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Деинсталирај"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Уклони"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Деинсталирај"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Управљање"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Информације о апликацији"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Претражи"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Гласовна претрага"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Апликације"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Проблем приликом учитавања виџета"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Ово је системска апликација и не може да се деинсталира."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-sv-large/strings.xml b/res/values-sv-large/strings.xml
index 9da7989..bc60cbe 100644
--- a/res/values-sv-large/strings.xml
+++ b/res/values-sv-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Välj bakgrund"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Inga tillgängliga bakgrunder"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Avbryt"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 01b1922..a8998a9 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Bakgrundsbilder"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Genvägar för appar"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Det här kommer att vara fliken för bakgrundsbilder"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Alla"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Appar"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Spel"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Mina appar"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Tryck länge om du vill plocka upp en widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Inga spel hittades."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Du har inte hämtat några appar."</string>
     <string name="market" msgid="2652226429823445833">"Butik"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Objektet kunde inte släppas på den här startsidan"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Välj en widget att skapa"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Avinstallera"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Ta bort"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Avinstallera"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Hantera"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Info om appen"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Sök"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Röstsökning"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Appar"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Det gick inte att läsa in widgeten"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Det här är ett systemprogram och kan inte avinstalleras."</string>
     <string name="dream_name" msgid="2847171357608437154">"Raketavfyringsramp"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 62b4274..2d5a940 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -37,16 +37,8 @@
     <!-- no translation found for applications_tab_label (2991364240020736760) -->
     <skip />
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Hiki kitakuwa kichupo cha taswira"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Zote"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Programu"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Michezo"</string>
-    <!-- no translation found for all_apps_tab_downloaded (1488049110598641387) -->
-    <skip />
     <!-- no translation found for long_press_widget_to_add (4307462194057715796) -->
     <skip />
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Hakuna michezo iliyopatikana."</string>
-    <!-- no translation found for all_apps_no_downloads (2284720393234453761) -->
-    <skip />
     <!-- no translation found for market (2652226429823445833) -->
     <skip />
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Haikuweza kudondosha kipengee kwenye skrini hii ya maskani"</string>
@@ -87,7 +79,7 @@
     <skip />
     <!-- no translation found for delete_target_uninstall_label (748894921183769150) -->
     <skip />
-    <!-- no translation found for info_target_label (6175926565900432067) -->
+    <!-- no translation found for info_target_label (4019495079517426980) -->
     <skip />
     <!-- no translation found for accessibility_search_button (816822994629942611) -->
     <skip />
@@ -133,4 +125,6 @@
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Hii ni programu ya mfumo na haiwezi kuondolewa."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->
     <skip />
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-th-large/strings.xml b/res/values-th-large/strings.xml
index e43679c..1cfb978 100644
--- a/res/values-th-large/strings.xml
+++ b/res/values-th-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"เลือกวอลเปเปอร์"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"ไม่มีวอลเปเปอร์ให้ใช้งาน"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"ยกเลิก"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 57fe5fb..ac65f3d 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"วอลเปเปอร์"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"ทางลัดของแอปพลิเคชัน"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"นี่จะเป็นแท็บวอลเปเปอร์"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"ทั้งหมด"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"แอปพลิเคชัน"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"เกม"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"แอปพลิเคชันของฉัน"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"กดค้างเพื่อรับวิดเจ็ต"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"ไม่พบเกม"</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"คุณไม่ได้ดาวน์โหลดแอปพลิเคชันไว้"</string>
     <string name="market" msgid="2652226429823445833">"ร้าน"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"ไม่สามารถวางรายการลงในหน้าจอหลักนี้ได้"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"เลือกวิดเจ็ตที่จะสร้าง"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"ถอนการติดตั้ง"</string>
     <string name="delete_target_label" msgid="665300185123139530">"นำออก"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"ถอนการติดตั้ง"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"จัดการ"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"ข้อมูลแอปพลิเคชัน"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"ค้นหา"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Voice Search"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"แอปพลิเคชัน"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"มีปัญหาขณะโหลดวิดเจ็ต"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"นี่เป็นแอปพลิเคชันระบบและไม่สามารถถอนการติดตั้งได้"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-tl-large/strings.xml b/res/values-tl-large/strings.xml
index ebd72ab..9b1cfa7 100644
--- a/res/values-tl-large/strings.xml
+++ b/res/values-tl-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Pumili ng wallpaper"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Walang available na mga wallpaper"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Kanselahin"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 1858b61..9e976f4 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Mga Wallpaper"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Mga shortcut ng app"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Ito ang magiging tab ng mga wallpaper"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Lahat"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Apps"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Mga Laro"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Aking mga app"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Pindutin nang matagal upang kumuha ng widget"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Walang nakitang mga laro."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Wala kang mga na-download na application."</string>
     <string name="market" msgid="2652226429823445833">"Mamili"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Hindi ma-drop ang item sa homescreen na ito"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Pumili ng widget na lilikhain"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"I-uninstall"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Alisin"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"I-uninstall"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Pamahalaan"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Impormasyon ng app"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Maghanap"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Paghahanap gamit ang Boses"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Mga Application"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Problema sa pag-load ng widget"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Isa itong system application at hindi maaaring i-install."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-tr-large/strings.xml b/res/values-tr-large/strings.xml
index f8f1395..3c5d759 100644
--- a/res/values-tr-large/strings.xml
+++ b/res/values-tr-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Duvar kağıdı seçin"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Hiç duvar kağıdı yok"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"İptal"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 8101a82..60ced60 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Duvar Kağıtları"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Uygulama kısayolları"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Bu duvar kağıdı sekmesi olacaktır"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Tümü"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Uygulamalar"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Oyunlar"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Uygulamalarım"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Widget seçmek için uzun basın"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Oyun bulunamadı."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"İndirilmiş uygulamanız yok."</string>
     <string name="market" msgid="2652226429823445833">"Alışveriş"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Öğe bu ana ekrana bırakılamadı"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Oluşturulacak widget\'i seç"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Yüklemeyi Kaldır"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Kaldır"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Yüklemeyi kaldır"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Yönet"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Uygulama bilgileri"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Ara"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Sesli Arama"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Uygulamalar"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Widget yüklenirken sorun oluştu"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Bu bir sistem uygulamasıdır ve kaldırılamaz."</string>
     <string name="dream_name" msgid="2847171357608437154">"Roket Fırlatıcı"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-uk-large/strings.xml b/res/values-uk-large/strings.xml
index 4409a03..aab00c5 100644
--- a/res/values-uk-large/strings.xml
+++ b/res/values-uk-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Вибрати фоновий малюнок"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Фонові малюнки недоступні"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Скасувати"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c79e04f..36f3d8a 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Фонові мал."</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Ярлики програм"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"This will be the wallpapers tab"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Усі"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Програми"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Ігри"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Мої програми"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Натисніть і тримайте, щоб вибрати віджет"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Ігор не знайдено."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"У вас немає завантажених програм."</string>
     <string name="market" msgid="2652226429823445833">"Магазин"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Неможливо помістити елемент на цей головний екран"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Вибрати віджет для створення"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Видалити"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Вилучити"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Видалити"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Керувати"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Інформація про програму"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Пошук"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Голосовий пошук"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Програми"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Пробл із завантаж. віджета"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Це системна програма, її неможливо видалити."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-vi-large/strings.xml b/res/values-vi-large/strings.xml
index 2ffad4b..a994fc5 100644
--- a/res/values-vi-large/strings.xml
+++ b/res/values-vi-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"Chọn hình nền"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"Không có hình nền nào"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"Hủy"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 7e94840..11f5138 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -33,20 +33,14 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"Hình nền"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"Lối tắt ứng dụng"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Đây sẽ là tab hình nền"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Tất cả"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Ứng dụng"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Trò chơi"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"Ứng dụng của tôi"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"Nhấn và giữ để chọn tiện ích con"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Không tìm thấy trò chơi."</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"Bạn không có ứng dụng nào được tải xuống."</string>
     <string name="market" msgid="2652226429823445833">"Mua hàng"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Không thể thả mục vào màn hình chính này"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"Chọn tiện ích để tạo"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Tên thư mục"</string>
     <string name="rename_folder_title" msgid="4544573104191526550">"Đổi tên thư mục"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
-    <string name="cancel_action" msgid="3811860427489435048">"Huỷ"</string>
+    <string name="cancel_action" msgid="3811860427489435048">"Hủy"</string>
     <string name="menu_item_add_item" msgid="6233177331075781114">"Thêm vào Màn hình chính"</string>
     <string name="group_applications" msgid="4118484163419674240">"Ứng dụng"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"Lối tắt"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"Gỡ cài đặt"</string>
     <string name="delete_target_label" msgid="665300185123139530">"Xóa"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"Gỡ cài đặt"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"Quản lý"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"Thông tin ứng dụng"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"Tìm kiếm"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"Tìm kiếm bằng giọng nói"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"Ứng dụng"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"Sự cố khi tải tiện ích"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Đây là ứng dụng hệ thống và không thể gỡ cài đặt."</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN-large/strings.xml b/res/values-zh-rCN-large/strings.xml
index b12e8dd..c950b46 100644
--- a/res/values-zh-rCN-large/strings.xml
+++ b/res/values-zh-rCN-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"选择壁纸"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"无可用壁纸"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"取消"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 410823a..07088e1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"壁纸"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"应用程序快捷方式"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"这将会成为壁纸标签"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"全部"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"应用程序"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"游戏"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"我的应用程序"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"长按可选取一个窗口小部件"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"未找到游戏。"</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"您没有下载任何应用程序。"</string>
     <string name="market" msgid="2652226429823445833">"购买"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"无法将该项放到主屏幕上"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"选择窗口小部件进行创建"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"卸载"</string>
     <string name="delete_target_label" msgid="665300185123139530">"删除"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"卸载"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"管理"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"应用程序信息"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"搜索"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"语音搜索"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"应用程序"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"载入窗口小部件时出现问题"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"这是系统应用程序，无法卸载。"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW-large/strings.xml b/res/values-zh-rTW-large/strings.xml
index 9ca13a3..f821f5c 100644
--- a/res/values-zh-rTW-large/strings.xml
+++ b/res/values-zh-rTW-large/strings.xml
@@ -22,10 +22,4 @@
     <string name="wallpaper_dialog_title" msgid="8362944198120933329">"選取桌布"</string>
     <string name="wallpaper_chooser_empty" msgid="6543937491391049913">"沒有可用的桌布"</string>
     <string name="wallpaper_cancel" msgid="5942480248232268588">"取消"</string>
-    <!-- no translation found for delete_target_label (8606333546746264268) -->
-    <skip />
-    <!-- no translation found for delete_target_uninstall_label (8093737231143968191) -->
-    <skip />
-    <!-- no translation found for info_target_label (1446068913893791331) -->
-    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 8d40fb4..2f34d4b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -33,13 +33,7 @@
     <string name="wallpapers_tab_label" msgid="1617804870364119879">"桌布"</string>
     <string name="applications_tab_label" msgid="2991364240020736760">"應用程式捷徑"</string>
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"桌布標籤保留位"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"全部"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"應用程式"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"遊戲"</string>
-    <string name="all_apps_tab_downloaded" msgid="1488049110598641387">"我的應用程式"</string>
     <string name="long_press_widget_to_add" msgid="4307462194057715796">"持續按住小工具即可選取"</string>
-    <string name="all_apps_no_games" msgid="5293893733372793696">"找不到遊戲。"</string>
-    <string name="all_apps_no_downloads" msgid="2284720393234453761">"您沒有下載任何應用程式。"</string>
     <string name="market" msgid="2652226429823445833">"商店"</string>
     <string name="external_drop_widget_error" msgid="4976816434597126575">"無法將項目拖放至主螢幕上"</string>
     <string name="external_drop_widget_pick_title" msgid="4481311720134376218">"選取要建立的小工具"</string>
@@ -70,7 +64,7 @@
     <string name="delete_zone_label_all_apps" msgid="6664588234817475108">"解除安裝"</string>
     <string name="delete_target_label" msgid="665300185123139530">"移除"</string>
     <string name="delete_target_uninstall_label" msgid="748894921183769150">"解除安裝"</string>
-    <string name="info_target_label" msgid="6175926565900432067">"管理"</string>
+    <string name="info_target_label" msgid="4019495079517426980">"應用程式資訊"</string>
     <string name="accessibility_search_button" msgid="816822994629942611">"搜尋"</string>
     <string name="accessibility_voice_search_button" msgid="3938249215065842475">"語音搜尋"</string>
     <string name="accessibility_all_apps_button" msgid="1595097919145716305">"應用程式"</string>
@@ -101,4 +95,6 @@
     <string name="gadget_error_text" msgid="8359351016167075858">"載入小工具時發生問題"</string>
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"這是系統應用程式，無法將其解除安裝。"</string>
     <string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index d606922..3df9330 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -37,16 +37,8 @@
     <!-- no translation found for applications_tab_label (2991364240020736760) -->
     <skip />
     <string name="wallpapers_temp_tab_text" msgid="1660218201190495279">"Lokhu kuzoba isithikithana samaphephadonga"</string>
-    <string name="all_apps_tab_all" msgid="2942727589595027258">"Konke"</string>
-    <string name="all_apps_tab_apps" msgid="5468972551904071712">"Izinhlelo Zokusebenza"</string>
-    <string name="all_apps_tab_games" msgid="1855736784923494918">"Imidlalo"</string>
-    <!-- no translation found for all_apps_tab_downloaded (1488049110598641387) -->
-    <skip />
     <!-- no translation found for long_press_widget_to_add (4307462194057715796) -->
     <skip />
-    <string name="all_apps_no_games" msgid="5293893733372793696">"Ayikho imidlalo etholakele."</string>
-    <!-- no translation found for all_apps_no_downloads (2284720393234453761) -->
-    <skip />
     <!-- no translation found for market (2652226429823445833) -->
     <skip />
     <string name="external_drop_widget_error" msgid="4976816434597126575">"Ayikwazanga ukuwisa intwana kwiskrini sasekhaya"</string>
@@ -87,7 +79,7 @@
     <skip />
     <!-- no translation found for delete_target_uninstall_label (748894921183769150) -->
     <skip />
-    <!-- no translation found for info_target_label (6175926565900432067) -->
+    <!-- no translation found for info_target_label (4019495079517426980) -->
     <skip />
     <!-- no translation found for accessibility_search_button (816822994629942611) -->
     <skip />
@@ -133,4 +125,6 @@
     <string name="uninstall_system_app_text" msgid="7488523163288397451">"Lolu uhlelo lokusebenza lwesistimu futhi alikwazi ukukhishwa."</string>
     <!-- no translation found for dream_name (2847171357608437154) -->
     <skip />
+    <!-- no translation found for folder_hint_text (8633351560105748141) -->
+    <skip />
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index a5d7b91..497011c 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -63,7 +63,7 @@
 
     <!-- Parameters controlling the animation for when an item is dropped on the home screen,
          and it animates from its old position to the new one. -->
-    <integer name="config_dropAnimMaxDuration">600</integer>
+    <integer name="config_dropAnimMaxDuration">500</integer>
 
     <!-- The duration of the UserFolder opening and closing animation -->
     <integer name="config_folderAnimDuration">120</integer>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2a54981..7353eda 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -22,10 +22,11 @@
     <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>
 
 <!-- QSB -->
-    <dimen name="toolbar_button_vertical_padding">12dip</dimen>
-    <dimen name="toolbar_button_horizontal_padding">16dip</dimen>
+    <dimen name="toolbar_button_vertical_padding">0dip</dimen>
+    <dimen name="toolbar_button_horizontal_padding">12dip</dimen>
 
 <!-- AllApps/Customize/AppsCustomize -->
     <!-- Size of icons in Workspace/AppsCustomize -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 45e85e1..06f6ed0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -29,6 +29,10 @@
         <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>
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index e55a55c..90f2815 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -1137,6 +1137,7 @@
         addAppsWithoutInvalidate(list);
         invalidatePageData();
     }
+
     @Override
     public void reset() {
         if (mContentType != ContentType.Applications) {
@@ -1144,7 +1145,7 @@
             AppsCustomizeTabHost tabs = (AppsCustomizeTabHost)
                     mLauncher.findViewById(R.id.apps_customize_pane);
             tabs.setCurrentTabByTag(tabs.getTabTagForContentType(ContentType.Applications));
-        } else {
+        } else if (getCurrentPage() != 0) {
             setCurrentPage(0);
             invalidatePageData();
         }
@@ -1179,11 +1180,6 @@
         // should stop this now.
     }
 
-    @Override
-    protected int getPageWidthForScrollingIndicator() {
-        return getPageContentWidth();
-    }
-
     /*
      * We load an extra page on each side to prevent flashes from scrolling and loading of the
      * widget previews in the background with the AsyncTasks.
diff --git a/src/com/android/launcher2/ButtonDropTarget.java b/src/com/android/launcher2/ButtonDropTarget.java
index e3da860..f87889c 100644
--- a/src/com/android/launcher2/ButtonDropTarget.java
+++ b/src/com/android/launcher2/ButtonDropTarget.java
@@ -90,4 +90,8 @@
     public DropTarget getDropTargetDelegate(DragObject d) {
         return null;
     }
+
+    public void getLocationInDragLayer(int[] loc) {
+        mLauncher.getDragLayer().getLocationInDragLayer(this, loc);
+    }
 }
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index f890808..b8515fc 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -706,8 +706,6 @@
                 // The child hit rect is relative to the CellLayoutChildren parent, so we need to
                 // offset that by this CellLayout's padding to test an (x,y) point that is relative
                 // to this view.
-                final int tmpXY[] = mTmpXY;
-                child.getLocationOnScreen(tmpXY);
                 frame.offset(mPaddingLeft, mPaddingTop);
 
                 if (frame.contains(x, y)) {
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 9a6335b..f6058a0 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -61,7 +61,7 @@
     static final int SCROLL_LEFT = 0;
     static final int SCROLL_RIGHT = 1;
 
-    private Context mContext;
+    private Launcher mLauncher;
     private Handler mHandler;
     private final Vibrator mVibrator = new Vibrator();
 
@@ -78,9 +78,6 @@
     /** Y coordinate of the down event. */
     private int mMotionDownY;
 
-    /** Info about the screen for clamping. */
-    private DisplayMetrics mDisplayMetrics = new DisplayMetrics();
-
     /** the area at the edge of the screen that makes the workspace go left
      *   or right while you're dragging.
      */
@@ -139,10 +136,10 @@
      *
      * @param context The application's context.
      */
-    public DragController(Context context) {
-        mContext = context;
+    public DragController(Launcher launcher) {
+        mLauncher = launcher;
         mHandler = new Handler();
-        mScrollZone = context.getResources().getDimensionPixelSize(R.dimen.scroll_zone);
+        mScrollZone = launcher.getResources().getDimensionPixelSize(R.dimen.scroll_zone);
     }
 
     public boolean dragging() {
@@ -183,11 +180,11 @@
         }
 
         int[] loc = mCoordinatesTemp;
-        v.getLocationOnScreen(loc);
-        int screenX = loc[0];
-        int screenY = loc[1];
+        mLauncher.getDragLayer().getLocationInDragLayer(v, loc);
+        int dragLayerX = loc[0];
+        int dragLayerY = loc[1];
 
-        startDrag(b, screenX, screenY, source, dragInfo, dragAction, dragRegion);
+        startDrag(b, dragLayerX, dragLayerY, source, dragInfo, dragAction, dragRegion);
         b.recycle();
 
         if (dragAction == DRAG_ACTION_MOVE) {
@@ -210,11 +207,11 @@
     public void startDrag(View v, Bitmap bmp, DragSource source, Object dragInfo, int dragAction,
             Rect dragRegion) {
         int[] loc = mCoordinatesTemp;
-        v.getLocationOnScreen(loc);
-        int screenX = loc[0];
-        int screenY = loc[1];
+        mLauncher.getDragLayer().getLocationInDragLayer(v, loc);
+        int dragLayerX = loc[0];
+        int dragLayerY = loc[1];
 
-        startDrag(bmp, screenX, screenY, source, dragInfo, dragAction, dragRegion);
+        startDrag(bmp, dragLayerX, dragLayerY, source, dragInfo, dragAction, dragRegion);
 
         if (dragAction == DRAG_ACTION_MOVE) {
             v.setVisibility(View.GONE);
@@ -226,16 +223,16 @@
      *
      * @param b The bitmap to display as the drag image.  It will be re-scaled to the
      *          enlarged size.
-     * @param screenX The x position on screen of the left-top of the bitmap.
-     * @param screenY The y position on screen of the left-top of the bitmap.
+     * @param dragLayerX The x position in the DragLayer of the left-top of the bitmap.
+     * @param dragLayerY The y position in the DragLayer of the left-top of the bitmap.
      * @param source An object representing where the drag originated
      * @param dragInfo The data associated with the object that is being dragged
      * @param dragAction The drag action: either {@link #DRAG_ACTION_MOVE} or
      *        {@link #DRAG_ACTION_COPY}
      */
-    public void startDrag(Bitmap b, int screenX, int screenY,
+    public void startDrag(Bitmap b, int dragLayerX, int dragLayerY,
             DragSource source, Object dragInfo, int dragAction) {
-        startDrag(b, screenX, screenY, source, dragInfo, dragAction, null);
+        startDrag(b, dragLayerX, dragLayerY, source, dragInfo, dragAction, null);
     }
 
     /**
@@ -243,8 +240,8 @@
      *
      * @param b The bitmap to display as the drag image.  It will be re-scaled to the
      *          enlarged size.
-     * @param screenX The x position on screen of the left-top of the bitmap.
-     * @param screenY The y position on screen of the left-top of the bitmap.
+     * @param dragLayerX The x position in the DragLayer of the left-top of the bitmap.
+     * @param dragLayerY The y position in the DragLayer of the left-top of the bitmap.
      * @param source An object representing where the drag originated
      * @param dragInfo The data associated with the object that is being dragged
      * @param dragAction The drag action: either {@link #DRAG_ACTION_MOVE} or
@@ -252,7 +249,7 @@
      * @param dragRegion Coordinates within the bitmap b for the position of item being dragged.
      *          Makes dragging feel more precise, e.g. you can clip out a transparent border
      */
-    public void startDrag(Bitmap b, int screenX, int screenY,
+    public void startDrag(Bitmap b, int dragLayerX, int dragLayerY,
             DragSource source, Object dragInfo, int dragAction, Rect dragRegion) {
         if (PROFILE_DRAWING_DURING_DRAG) {
             android.os.Debug.startMethodTracing("Launcher");
@@ -261,7 +258,7 @@
         // Hide soft keyboard, if visible
         if (mInputMethodManager == null) {
             mInputMethodManager = (InputMethodManager)
-                    mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                    mLauncher.getSystemService(Context.INPUT_METHOD_SERVICE);
         }
         mInputMethodManager.hideSoftInputFromWindow(mWindowToken, 0);
 
@@ -269,8 +266,8 @@
             listener.onDragStart(source, dragInfo, dragAction);
         }
 
-        final int registrationX = ((int)mMotionDownX) - screenX;
-        final int registrationY = ((int)mMotionDownY) - screenY;
+        final int registrationX = mMotionDownX - dragLayerX;
+        final int registrationY = mMotionDownY - dragLayerY;
 
         final int dragRegionLeft = dragRegion == null ? 0 : dragRegion.left;
         final int dragRegionTop = dragRegion == null ? 0 : dragRegion.top;
@@ -278,14 +275,14 @@
         mDragging = true;
 
         mDragObject.dragComplete = false;
-        mDragObject.xOffset = mMotionDownX - (screenX + dragRegionLeft);
-        mDragObject.yOffset = mMotionDownY - (screenY + dragRegionTop);
+        mDragObject.xOffset = mMotionDownX - (dragLayerX + dragRegionLeft);
+        mDragObject.yOffset = mMotionDownY - (dragLayerY + dragRegionTop);
         mDragObject.dragSource = source;
         mDragObject.dragInfo = dragInfo;
 
         mVibrator.vibrate(VIBRATE_DURATION);
 
-        final DragView dragView = mDragObject.dragView = new DragView(mContext, b, registrationX,
+        final DragView dragView = mDragObject.dragView = new DragView(mLauncher, b, registrationX,
                 registrationY, 0, 0, b.getWidth(), b.getHeight());
 
         final DragSource dragSource = source;
@@ -299,9 +296,8 @@
             dragView.setDragRegion(new Rect(dragRegion));
         }
 
-        dragView.show(mWindowToken, (int)mMotionDownX, (int)mMotionDownY);
-
-        handleMoveEvent((int) mMotionDownX, (int) mMotionDownY);
+        dragView.show(mMotionDownX, mMotionDownY);
+        handleMoveEvent(mMotionDownX, mMotionDownY);
     }
 
     /**
@@ -398,25 +394,21 @@
         }
         final int action = ev.getAction();
 
-        if (action == MotionEvent.ACTION_DOWN) {
-            recordScreenSize();
-        }
-
-        final int screenX = clamp((int)ev.getRawX(), 0, mDisplayMetrics.widthPixels);
-        final int screenY = clamp((int)ev.getRawY(), 0, mDisplayMetrics.heightPixels);
+        final int dragLayerX = (int) ev.getX();
+        final int dragLayerY = (int) ev.getY();
 
         switch (action) {
             case MotionEvent.ACTION_MOVE:
                 break;
             case MotionEvent.ACTION_DOWN:
                 // Remember location of down touch
-                mMotionDownX = screenX;
-                mMotionDownY = screenY;
+                mMotionDownX = dragLayerX;
+                mMotionDownY = dragLayerY;
                 mLastDropTarget = null;
                 break;
             case MotionEvent.ACTION_UP:
                 if (mDragging) {
-                    drop(screenX, screenY);
+                    drop(dragLayerX, dragLayerY);
                 }
                 endDrag();
                 break;
@@ -475,7 +467,7 @@
 
         // After a scroll, the touch point will still be in the scroll region.
         // Rather than scrolling immediately, require a bit of twiddling to scroll again
-        final int slop = ViewConfiguration.get(mContext).getScaledWindowTouchSlop();
+        final int slop = ViewConfiguration.get(mLauncher).getScaledWindowTouchSlop();
         mDistanceSinceScroll +=
             Math.sqrt(Math.pow(mLastTouch[0] - x, 2) + Math.pow(mLastTouch[1] - y, 2));
         mLastTouch[0] = x;
@@ -514,16 +506,16 @@
         }
 
         final int action = ev.getAction();
-        final int screenX = clamp((int)ev.getRawX(), 0, mDisplayMetrics.widthPixels);
-        final int screenY = clamp((int)ev.getRawY(), 0, mDisplayMetrics.heightPixels);
+        final int dragLayerX = (int) ev.getX();
+        final int dragLayerY = (int) ev.getY();
 
         switch (action) {
         case MotionEvent.ACTION_DOWN:
             // Remember where the motion event started
-            mMotionDownX = screenX;
-            mMotionDownY = screenY;
+            mMotionDownX = dragLayerX;
+            mMotionDownY = dragLayerY;
 
-            if ((screenX < mScrollZone) || (screenX > mScrollView.getWidth() - mScrollZone)) {
+            if ((dragLayerX < mScrollZone) || (dragLayerX > mScrollView.getWidth() - mScrollZone)) {
                 mScrollState = SCROLL_WAITING_IN_ZONE;
                 mHandler.postDelayed(mScrollRunnable, SCROLL_DELAY);
             } else {
@@ -531,15 +523,15 @@
             }
             break;
         case MotionEvent.ACTION_MOVE:
-            handleMoveEvent(screenX, screenY);
+            handleMoveEvent(dragLayerX, dragLayerY);
             break;
         case MotionEvent.ACTION_UP:
             // Ensure that we've processed a move event at the current pointer location.
-            handleMoveEvent(screenX, screenY);
+            handleMoveEvent(dragLayerX, dragLayerY);
 
             mHandler.removeCallbacks(mScrollRunnable);
             if (mDragging) {
-                drop(screenX, screenY);
+                drop(dragLayerX, dragLayerY);
             }
             endDrag();
             break;
@@ -581,8 +573,8 @@
 
             target.getHitRect(r);
 
-            // Convert the hit rect to screen coordinates
-            target.getLocationOnScreen(dropCoordinates);
+            // Convert the hit rect to DragLayer coordinates
+            target.getLocationInDragLayer(dropCoordinates);
             r.offset(dropCoordinates[0] - target.getLeft(), dropCoordinates[1] - target.getTop());
 
             mDragObject.x = x;
@@ -591,7 +583,7 @@
                 DropTarget delegate = target.getDropTargetDelegate(mDragObject);
                 if (delegate != null) {
                     target = delegate;
-                    target.getLocationOnScreen(dropCoordinates);
+                    target.getLocationInDragLayer(dropCoordinates);
                 }
 
                 // Make dropCoordinates relative to the DropTarget
@@ -604,28 +596,6 @@
         return null;
     }
 
-    /**
-     * Get the screen size so we can clamp events to the screen size so even if
-     * you drag off the edge of the screen, we find something.
-     */
-    private void recordScreenSize() {
-        ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
-                .getDefaultDisplay().getMetrics(mDisplayMetrics);
-    }
-
-    /**
-     * Clamp val to be &gt;= min and &lt; max.
-     */
-    private static int clamp(int val, int min, int max) {
-        if (val < min) {
-            return min;
-        } else if (val >= max) {
-            return max - 1;
-        } else {
-            return val;
-        }
-    }
-
     public void setDragScoller(DragScroller scroller) {
         mDragScroller = scroller;
     }
@@ -672,7 +642,7 @@
     /**
      * Specifies the delete region.  We won't scroll on touch events over the delete region.
      *
-     * @param region The rectangle in screen coordinates of the delete region.
+     * @param region The rectangle in DragLayer coordinates of the delete region.
      */
     void setDeleteRegion(RectF region) {
         mDeleteRegion = region;
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index d76b902..dfd8160 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -18,12 +18,12 @@
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.animation.ObjectAnimator;
 import android.animation.TimeInterpolator;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.util.AttributeSet;
@@ -33,9 +33,7 @@
 import android.view.ViewParent;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
-import android.view.animation.LinearInterpolator;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
 
 import com.android.launcher.R;
 
@@ -58,8 +56,10 @@
 
     // Variables relating to animation of views after drop
     private ValueAnimator mDropAnim = null;
-    private TimeInterpolator mQuintEaseOutInterpolator = new DecelerateInterpolator(2.5f);
+    private ValueAnimator mFadeOutAnim = null;
+    private TimeInterpolator mCubicEaseOutInterpolator = new DecelerateInterpolator(1.5f);
     private View mDropView = null;
+
     private int[] mDropViewPos = new int[2];
     private float mDropViewScale;
     private float mDropViewAlpha;
@@ -168,14 +168,16 @@
     }
 
     public void getDescendantRectRelativeToSelf(View descendant, Rect r) {
-        descendant.getHitRect(r);
         mTmpXY[0] = 0;
         mTmpXY[1] = 0;
         getDescendantCoordRelativeToSelf(descendant, mTmpXY);
-        r.offset(mTmpXY[0], mTmpXY[1]);
+        r.set(mTmpXY[0], mTmpXY[1],
+                mTmpXY[0] + descendant.getWidth(), mTmpXY[1] + descendant.getHeight());
     }
 
-    public void getDescendantCoordRelativeToSelf(View descendant, int[] coord) {
+    private void getDescendantCoordRelativeToSelf(View descendant, int[] coord) {
+        coord[0] += descendant.getLeft();
+        coord[1] += descendant.getTop();
         ViewParent viewParent = descendant.getParent();
         while (viewParent instanceof View && viewParent != this) {
             final View view = (View)viewParent;
@@ -185,13 +187,19 @@
         }
     }
 
+    public void getLocationInDragLayer(View child, int[] loc) {
+        loc[0] = 0;
+        loc[1] = 0;
+        getDescendantCoordRelativeToSelf(child, loc);
+    }
+
     public void getViewRectRelativeToSelf(View v, Rect r) {
         int[] loc = new int[2];
-        getLocationOnScreen(loc);
+        getLocationInWindow(loc);
         int x = loc[0];
         int y = loc[1];
 
-        v.getLocationOnScreen(loc);
+        v.getLocationInWindow(loc);
         int vX = loc[0];
         int vY = loc[1];
 
@@ -205,21 +213,6 @@
         return mDragController.dispatchUnhandledMove(focused, direction);
     }
 
-    public View createDragView(Bitmap b, int xPos, int yPos) {
-        ImageView imageView = new ImageView(mContext);
-        imageView.setImageBitmap(b);
-        imageView.setX(xPos);
-        imageView.setY(yPos);
-        addView(imageView, b.getWidth(), b.getHeight());
-
-        return imageView;
-    }
-
-    public View createDragView(View v) {
-        v.getLocationOnScreen(mTmpXY);
-        return createDragView(mDragController.getViewBitmap(v), mTmpXY[0], mTmpXY[1]);
-    }
-
     public static class LayoutParams extends FrameLayout.LayoutParams {
         public int x, y;
         public boolean customPosition = false;
@@ -320,29 +313,40 @@
         int coord[] = new int[2];
         coord[0] = lp.x;
         coord[1] = lp.y;
-        getDescendantCoordRelativeToSelf(child, coord);
+        // Since the child hasn't necessarily been laid out, we force the lp to be updated with
+        // the correct coordinates and use these to determine the final location
+        getDescendantCoordRelativeToSelf((View) child.getParent(), coord);
+        int toX = coord[0] - (dragView.getWidth() - child.getMeasuredWidth()) / 2;
+        int toY = coord[1] - (dragView.getHeight() - child.getMeasuredHeight()) / 2;
 
         final int fromX = r.left + (dragView.getWidth() - child.getMeasuredWidth())  / 2;
         final int fromY = r.top + (dragView.getHeight() - child.getMeasuredHeight())  / 2;
         child.setVisibility(INVISIBLE);
-        animateViewIntoPosition(child, fromX, fromY, coord[0], coord[1]);
+        child.setAlpha(0);
+        Runnable onCompleteRunnable = new Runnable() {
+            public void run() {
+                child.setVisibility(VISIBLE);
+                ObjectAnimator oa = ObjectAnimator.ofFloat(child, "alpha", 0f, 1f);
+                oa.setDuration(60);
+                oa.start();
+            }
+        };
+        animateViewIntoPosition(dragView, fromX, fromY, toX, toY, onCompleteRunnable, true);
     }
 
     private void animateViewIntoPosition(final View view, final int fromX, final int fromY,
-            final int toX, final int toY) {
-        Rect from = new Rect(fromX, fromY, fromX + view.getMeasuredWidth(), fromY + view.getMeasuredHeight());
+            final int toX, final int toY, Runnable onCompleteRunnable, boolean fadeOut) {
+        Rect from = new Rect(fromX, fromY, fromX +
+                view.getMeasuredWidth(), fromY + view.getMeasuredHeight());
         Rect to = new Rect(toX, toY, toX + view.getMeasuredWidth(), toY + view.getMeasuredHeight());
-        animateView(view, from, to, 1f, -1);
-    }
+        animateView(view, from, to, 1f, 1.0f, -1, null, null, onCompleteRunnable, true);
 
-    public void animateView(final View view, final Rect from, final Rect to,
-            final float finalAlpha, int duration) {
-        animateView(view, from, to, finalAlpha, 1.0f, duration, null, null);
     }
 
     public void animateView(final View view, final Rect from, final Rect to, final float finalAlpha,
             final float finalScale, int duration, final Interpolator motionInterpolator,
-            final Interpolator alphaInterpolator) {
+            final Interpolator alphaInterpolator, final Runnable onCompleteRunnable,
+            final boolean fadeOut) {
         // Calculate the duration of the animation based on the object's distance
         final float dist = (float) Math.sqrt(Math.pow(to.left - from.left, 2) +
                 Math.pow(to.top - from.top, 2));
@@ -353,19 +357,19 @@
         if (duration < 0) {
             duration = res.getInteger(R.integer.config_dropAnimMaxDuration);
             if (dist < maxDist) {
-                duration *= mQuintEaseOutInterpolator.getInterpolation(dist / maxDist);
+                duration *= mCubicEaseOutInterpolator.getInterpolation(dist / maxDist);
             }
         }
 
         if (mDropAnim != null) {
-            mDropAnim.end();
+            mDropAnim.cancel();
         }
 
         mDropView = view;
         final float initialAlpha = view.getAlpha();
         mDropAnim = new ValueAnimator();
         if (alphaInterpolator == null || motionInterpolator == null) {
-            mDropAnim.setInterpolator(mQuintEaseOutInterpolator);
+            mDropAnim.setInterpolator(mCubicEaseOutInterpolator);
         }
 
         mDropAnim.setDuration(duration);
@@ -395,8 +399,12 @@
         });
         mDropAnim.addListener(new AnimatorListenerAdapter() {
             public void onAnimationEnd(Animator animation) {
-                if (mDropView != null) {
-                    mDropView.setVisibility(View.VISIBLE);
+                if (onCompleteRunnable != null) {
+                    onCompleteRunnable.run();
+                }
+                if (fadeOut) {
+                    fadeOutDragView();
+                } else {
                     mDropView = null;
                 }
             }
@@ -404,6 +412,29 @@
         mDropAnim.start();
     }
 
+    private void fadeOutDragView() {
+        mFadeOutAnim = new ValueAnimator();
+        mFadeOutAnim.setDuration(150);
+        mFadeOutAnim.setFloatValues(0f, 1f);
+        mFadeOutAnim.removeAllUpdateListeners();
+        mFadeOutAnim.addUpdateListener(new AnimatorUpdateListener() {
+            public void onAnimationUpdate(ValueAnimator animation) {
+                final float percent = (Float) animation.getAnimatedValue();
+                mDropViewAlpha = 1 - percent;
+                int width = mDropView.getMeasuredWidth();
+                int height = mDropView.getMeasuredHeight();
+                invalidate(mDropViewPos[0], mDropViewPos[1],
+                        mDropViewPos[0] + width, mDropViewPos[1] + height);
+            }
+        });
+        mFadeOutAnim.addListener(new AnimatorListenerAdapter() {
+            public void onAnimationEnd(Animator animation) {
+                mDropView = null;
+            }
+        });
+        mFadeOutAnim.start();
+    }
+
     @Override
     protected void dispatchDraw(Canvas canvas) {
         super.dispatchDraw(canvas);
diff --git a/src/com/android/launcher2/DragView.java b/src/com/android/launcher2/DragView.java
index d4dc785..aff3d42 100644
--- a/src/com/android/launcher2/DragView.java
+++ b/src/com/android/launcher2/DragView.java
@@ -19,18 +19,14 @@
 
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
-import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.os.IBinder;
-import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.view.WindowManagerImpl;
 import android.view.animation.DecelerateInterpolator;
@@ -44,13 +40,13 @@
     private int mRegistrationY;
 
     private Rect mDragRegion = null;
+    private DragLayer mDragLayer = null;
 
     ValueAnimator mAnim;
     private float mOffsetX = 0.0f;
     private float mOffsetY = 0.0f;
 
-    private WindowManager.LayoutParams mLayoutParams;
-    private WindowManager mWindowManager;
+    private DragLayer.LayoutParams mLayoutParams;
 
     /**
      * A callback to be called the first time this view is drawn.
@@ -65,20 +61,19 @@
      * The registration point is the point inside our view that the touch events should
      * be centered upon.
      *
-     * @param context A context
+     * @param launcher The Launcher instance
      * @param bitmap The view that we're dragging around.  We scale it up when we draw it.
      * @param registrationX The x coordinate of the registration point.
      * @param registrationY The y coordinate of the registration point.
      */
-    public DragView(Context context, Bitmap bitmap, int registrationX, int registrationY,
+    public DragView(Launcher launcher, Bitmap bitmap, int registrationX, int registrationY,
             int left, int top, int width, int height) {
-        super(context);
+        super(launcher);
+        mDragLayer = launcher.getDragLayer();
 
         final Resources res = getResources();
         final int dragScale = res.getInteger(R.integer.config_dragViewExtraPixels);
 
-        mWindowManager = WindowManagerImpl.getDefault();
-
         Matrix scale = new Matrix();
         final float scaleFactor = (width + dragScale) / width;
         if (scaleFactor != 1.0f) {
@@ -106,10 +101,10 @@
                 if (getParent() == null) {
                     animation.cancel();
                 } else {
-                    WindowManager.LayoutParams lp = mLayoutParams;
+                    DragLayer.LayoutParams lp = mLayoutParams;
                     lp.x += deltaX;
                     lp.y += deltaY;
-                    mWindowManager.updateViewLayout(DragView.this, lp);
+                    mDragLayer.requestLayout();
                 }
             }
         });
@@ -209,58 +204,45 @@
      * Create a window containing this view and show it.
      *
      * @param windowToken obtained from v.getWindowToken() from one of your views
-     * @param touchX the x coordinate the user touched in screen coordinates
-     * @param touchY the y coordinate the user touched in screen coordinates
+     * @param touchX the x coordinate the user touched in DragLayer coordinates
+     * @param touchY the y coordinate the user touched in DragLayer coordinates
      */
-    public void show(IBinder windowToken, int touchX, int touchY) {
-        WindowManager.LayoutParams lp;
-        int pixelFormat;
-
-        pixelFormat = PixelFormat.TRANSLUCENT;
-
-        lp = new WindowManager.LayoutParams(
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT,
-                touchX - mRegistrationX, touchY - mRegistrationY,
-                WindowManager.LayoutParams.TYPE_APPLICATION_SUB_PANEL,
-                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
-                    | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-                    /*| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM*/,
-                pixelFormat);
-//        lp.token = mStatusBarView.getWindowToken();
-        lp.gravity = Gravity.LEFT | Gravity.TOP;
-        lp.token = windowToken;
-        lp.setTitle("DragView");
+    public void show(int touchX, int touchY) {
+        mDragLayer.addView(this);
+        DragLayer.LayoutParams lp = new DragLayer.LayoutParams(0, 0);
+        lp.width = mBitmap.getWidth();
+        lp.height = mBitmap.getHeight();
+        lp.x = touchX - mRegistrationX;
+        lp.y = touchY - mRegistrationY;
+        lp.customPosition = true;
+        setLayoutParams(lp);
         mLayoutParams = lp;
-
-        mWindowManager.addView(this, lp);
-
         mAnim.start();
     }
 
     /**
      * Move the window containing this view.
      *
-     * @param touchX the x coordinate the user touched in screen coordinates
-     * @param touchY the y coordinate the user touched in screen coordinates
+     * @param touchX the x coordinate the user touched in DragLayer coordinates
+     * @param touchY the y coordinate the user touched in DragLayer coordinates
      */
     void move(int touchX, int touchY) {
-        WindowManager.LayoutParams lp = mLayoutParams;
+        DragLayer.LayoutParams lp = mLayoutParams;
         lp.x = touchX - mRegistrationX + (int) mOffsetX;
         lp.y = touchY - mRegistrationY + (int) mOffsetY;
-        mWindowManager.updateViewLayout(this, lp);
+        mDragLayer.requestLayout();
     }
 
     void remove() {
         post(new Runnable() {
             public void run() {
-                mWindowManager.removeView(DragView.this);
+                mDragLayer.removeView(DragView.this);
             }
         });
     }
 
     int[] getPosition(int[] result) {
-        WindowManager.LayoutParams lp = mLayoutParams;
+        DragLayer.LayoutParams lp = mLayoutParams;
         if (result == null) result = new int[2];
         result[0] = lp.x;
         result[1] = lp.y;
diff --git a/src/com/android/launcher2/DropTarget.java b/src/com/android/launcher2/DropTarget.java
index 6e18479..0712420 100644
--- a/src/com/android/launcher2/DropTarget.java
+++ b/src/com/android/launcher2/DropTarget.java
@@ -120,7 +120,7 @@
 
     // These methods are implemented in Views
     void getHitRect(Rect outRect);
-    void getLocationOnScreen(int[] loc);
+    void getLocationInDragLayer(int[] loc);
     int getLeft();
     int getTop();
 }
diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index 347eba0..8a1b957 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -35,7 +35,6 @@
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.inputmethod.EditorInfo;
@@ -43,8 +42,6 @@
 import android.widget.AdapterView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.AdapterView.OnItemLongClickListener;
 
 import com.android.launcher.R;
 import com.android.launcher2.FolderInfo.FolderListener;
@@ -54,9 +51,8 @@
 /**
  * Represents a set of icons chosen by the user or generated by the system.
  */
-public class Folder extends LinearLayout implements DragSource, OnItemLongClickListener,
-        OnItemClickListener, OnClickListener, View.OnLongClickListener, DropTarget, FolderListener,
-        TextView.OnEditorActionListener {
+public class Folder extends LinearLayout implements DragSource, View.OnClickListener,
+        View.OnLongClickListener, DropTarget, FolderListener, TextView.OnEditorActionListener {
 
     protected DragController mDragController;
 
@@ -102,6 +98,7 @@
     private int mFolderNameHeight;
     private Rect mHitRect = new Rect();
     private Rect mTempRect = new Rect();
+    private boolean mFirstOpen = true;
 
     private boolean mIsEditingName = false;
     private InputMethodManager mInputMethodManager;
@@ -135,7 +132,6 @@
         if (sHintText == null) {
             sHintText = res.getString(R.string.folder_hint_text);
         }
-        setLayerType(LAYER_TYPE_HARDWARE, null);
     }
 
     @Override
@@ -177,15 +173,6 @@
         }
     };
 
-    public void onItemClick(AdapterView parent, View v, int position, long id) {
-        ShortcutInfo app = (ShortcutInfo) parent.getItemAtPosition(position);
-        int[] pos = new int[2];
-        v.getLocationOnScreen(pos);
-        app.intent.setSourceBounds(new Rect(pos[0], pos[1],
-                pos[0] + v.getWidth(), pos[1] + v.getHeight()));
-        mLauncher.startActivitySafely(app.intent, app);
-    }
-
     public void onClick(View v) {
         Object tag = v.getTag();
         if (tag instanceof ShortcutInfo) {
@@ -393,6 +380,12 @@
     }
 
     public void animateOpen() {
+        if (mFirstOpen) {
+            setLayerType(LAYER_TYPE_HARDWARE, null);
+            buildLayer();
+            mFirstOpen = false;
+        }
+
         positionAndSizeAsIcon();
 
         if (!(getParent() instanceof DragLayer)) return;
@@ -433,14 +426,25 @@
             @Override
             public void onAnimationEnd(Animator animation) {
                 mState = STATE_OPEN;
+                setLayerType(LAYER_TYPE_NONE, null);
+                enableHardwareLayersForChildren();
             }
         });
         oa.setDuration(mExpandDuration);
         oa.start();
     }
 
+    void enableHardwareLayersForChildren() {
+        ArrayList<View> children = getItemsInReadingOrder();
+        for (View child: children) {
+            child.setLayerType(LAYER_TYPE_HARDWARE, null);
+        }
+    }
+
     public void animateClosed() {
         if (!(getParent() instanceof DragLayer)) return;
+        setLayerType(LAYER_TYPE_HARDWARE, null);
+        buildLayer();
 
         ObjectAnimator oa;
         if (mMode == PARTIAL_GROW) {
@@ -957,4 +961,8 @@
         }
         return mItemsInReadingOrder;
     }
+
+    public void getLocationInDragLayer(int[] loc) {
+        mLauncher.getDragLayer().getLocationInDragLayer(this, loc);
+    }
 }
diff --git a/src/com/android/launcher2/FolderIcon.java b/src/com/android/launcher2/FolderIcon.java
index 4071433..4978e98 100644
--- a/src/com/android/launcher2/FolderIcon.java
+++ b/src/com/android/launcher2/FolderIcon.java
@@ -55,7 +55,7 @@
     private static final int NUM_ITEMS_IN_PREVIEW = 3;
     private static final int CONSUMPTION_ANIMATION_DURATION = 100;
     private static final int DROP_IN_ANIMATION_DURATION = 400;
-    private static final int INITIAL_ITEM_ANIMATION_DURATION = 150;
+    private static final int INITIAL_ITEM_ANIMATION_DURATION = 350;
 
     // The degree to which the inner ring grows when accepting drop
     private static final float INNER_RING_GROWTH_FACTOR = 0.15f;
@@ -295,7 +295,7 @@
 
         // This will animate the first item from it's position as an icon into its
         // position as the first item in the preview
-        animateFirstItem(animateDrawable, DROP_IN_ANIMATION_DURATION);
+        animateFirstItem(animateDrawable, INITIAL_ITEM_ANIMATION_DURATION);
 
         postDelayed(new Runnable() {
             public void run() {
@@ -332,7 +332,7 @@
         float finalAlpha = index < NUM_ITEMS_IN_PREVIEW ? 0.5f : 0f;
 
         dragLayer.animateView(animateView, from, to, finalAlpha, scale, DROP_IN_ANIMATION_DURATION,
-                new DecelerateInterpolator(2), new AccelerateInterpolator(2));
+                new DecelerateInterpolator(2), new AccelerateInterpolator(2), null, false);
         postDelayed(new Runnable() {
             public void run() {
                 addItem(item);
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 0c052a7..6f64f9d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1284,7 +1284,7 @@
                 imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
             }
 
-            // Reset AllApps to it's initial state
+            // Reset AllApps to its initial state
             if (mAppsCustomizeContent != null) {
                 mAppsCustomizeContent.reset();
             }
@@ -2748,12 +2748,12 @@
         ComponentName activityName = searchManager.getGlobalSearchActivity();
         if (activityName != null) {
             sGlobalSearchIcon = updateButtonWithIconFromExternalActivity(
-                    R.id.search_button, activityName, R.drawable.ic_generic_search);
+                    R.id.search_button, activityName, R.drawable.ic_search_normal_holo);
             searchButton.setVisibility(View.VISIBLE);
-            searchDivider.setVisibility(View.VISIBLE);
+            if (searchDivider != null) searchDivider.setVisibility(View.VISIBLE);
         } else {
             searchButton.setVisibility(View.GONE);
-            searchDivider.setVisibility(View.GONE);
+            if (searchDivider != null) searchDivider.setVisibility(View.GONE);
         }
     }
 
@@ -2769,11 +2769,11 @@
         ComponentName activityName = intent.resolveActivity(getPackageManager());
         if (activityName != null) {
             sVoiceSearchIcon = updateButtonWithIconFromExternalActivity(
-                    R.id.voice_button, activityName, R.drawable.ic_voice_search);
-            searchDivider.setVisibility(View.VISIBLE);
+                    R.id.voice_button, activityName, R.drawable.ic_voice_search_holo);
+            if (searchDivider != null) searchDivider.setVisibility(View.VISIBLE);
             voiceButton.setVisibility(View.VISIBLE);
         } else {
-            searchDivider.setVisibility(View.GONE);
+            if (searchDivider != null) searchDivider.setVisibility(View.GONE);
             voiceButton.setVisibility(View.GONE);
         }
     }
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java
index a90d32f..81e876f 100644
--- a/src/com/android/launcher2/PagedView.java
+++ b/src/com/android/launcher2/PagedView.java
@@ -1641,7 +1641,7 @@
     }
 
     protected boolean isScrollingIndicatorEnabled() {
-        return true;
+        return !LauncherApplication.isScreenLarge();
     }
 
     protected void flashScrollingIndicator() {
@@ -1655,7 +1655,6 @@
     }
 
     protected void showScrollingIndicator() {
-        if (LauncherApplication.isScreenLarge()) return;
         if (getChildCount() <= 1) return;
         if (!isScrollingIndicatorEnabled()) return;
 
@@ -1668,7 +1667,6 @@
     }
 
     protected void hideScrollingIndicator(boolean immediately) {
-        if (LauncherApplication.isScreenLarge()) return;
         if (getChildCount() <= 1) return;
         if (!isScrollingIndicatorEnabled()) return;
 
@@ -1682,7 +1680,6 @@
     }
 
     private void updateScrollingIndicator() {
-        if (LauncherApplication.isScreenLarge()) return;
         if (getChildCount() <= 1) return;
         if (!isScrollingIndicatorEnabled()) return;
 
@@ -1692,19 +1689,19 @@
         }
     }
 
-    protected int getPageWidthForScrollingIndicator() {
-        return getMeasuredWidth();
-    }
-
     private void updateScrollingIndicatorPosition() {
+        if (!isScrollingIndicatorEnabled()) return;
+
         // We can make the page width smaller to make it look more centered
-        int pageWidth = getPageWidthForScrollingIndicator();
-        int pageOffset = (getMeasuredWidth() - pageWidth) / 2;
-        int maxPageWidth = getChildCount() * pageWidth;
+        getScrollingIndicatorTrack();
+        int pageWidth = mScrollTrack.getMeasuredWidth() - mScrollTrack.getPaddingLeft() -
+                mScrollTrack.getPaddingRight();
+        int maxPageWidth = getChildCount() * getMeasuredWidth();
         float offset = (float) getScrollX() / maxPageWidth;
         int indicatorWidth = pageWidth / getChildCount();
         int indicatorCenterOffset = indicatorWidth / 2 - mScrollIndicator.getMeasuredWidth() / 2;
-        int indicatorPos = (int) (offset * pageWidth) + pageOffset + indicatorCenterOffset;
+        int indicatorPos = (int) (offset * pageWidth) + mScrollTrack.getPaddingLeft() +
+                indicatorCenterOffset;
         mScrollIndicator.setTranslationX(indicatorPos);
         mScrollIndicator.invalidate();
     }
@@ -1718,20 +1715,20 @@
     }
 
     public void showScrollIndicatorTrack() {
-        if (!LauncherApplication.isScreenLarge()) {
-            getScrollingIndicatorTrack();
-            if (mScrollTrack != null) {
-                mScrollTrack.setVisibility(View.VISIBLE);
-            }
+        if (!isScrollingIndicatorEnabled()) return;
+
+        getScrollingIndicatorTrack();
+        if (mScrollTrack != null) {
+            mScrollTrack.setVisibility(View.VISIBLE);
         }
     }
 
     public void hideScrollIndicatorTrack() {
-        if (!LauncherApplication.isScreenLarge()) {
-            getScrollingIndicatorTrack();
-            if (mScrollTrack != null) {
-                mScrollTrack.setVisibility(View.GONE);
-            }
+        if (!isScrollingIndicatorEnabled()) return;
+
+        getScrollingIndicatorTrack();
+        if (mScrollTrack != null) {
+            mScrollTrack.setVisibility(View.GONE);
         }
     }
 
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index caf62b4..fd18338 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -205,8 +205,6 @@
     private FolderRingAnimator mDragFolderRingAnimator = null;
     private View mLastDragOverView = null;
     private boolean mCreateUserFolderOnDrop = false;
-    private int mCellWidth = -1;
-    private int mCellHeight = -1;
 
     // Variables relating to touch disambiguation (scrolling workspace vs. scrolling a widget)
     private float mXDown;
@@ -1284,7 +1282,6 @@
         shrink(shrinkState, true);
     }
 
-
     // we use this to shrink the workspace for the all apps view and the customize view
     public void shrink(ShrinkState shrinkState, boolean animated) {
         if (mFirstLayout) {
@@ -2003,9 +2000,9 @@
         final int bmpWidth = b.getWidth();
         final int bmpHeight = b.getHeight();
 
-        child.getLocationOnScreen(mTempXY);
-        final int screenX = (int) mTempXY[0] + (child.getWidth() - bmpWidth) / 2;
-        final int screenY = (int) mTempXY[1] + (child.getHeight() - bmpHeight) / 2;
+        mLauncher.getDragLayer().getLocationInDragLayer(child, mTempXY);
+        final int dragLayerX = (int) mTempXY[0] + (child.getWidth() - bmpWidth) / 2;
+        final int dragLayerY = (int) mTempXY[1] + (child.getHeight() - bmpHeight) / 2;
 
         Rect dragRect = null;
         if (child instanceof BubbleTextView) {
@@ -2021,7 +2018,7 @@
         }
 
         mLauncher.lockScreenOrientation();
-        mDragController.startDrag(b, screenX, screenY, this, child.getTag(),
+        mDragController.startDrag(b, dragLayerX, dragLayerY, this, child.getTag(),
                 DragController.DRAG_ACTION_MOVE, dragRect);
         b.recycle();
     }
@@ -2288,11 +2285,11 @@
     }
 
     public void getViewLocationRelativeToSelf(View v, int[] location) {
-        getLocationOnScreen(location);
+        getLocationInWindow(location);
         int x = location[0];
         int y = location[1];
 
-        v.getLocationOnScreen(location);
+        v.getLocationInWindow(location);
         int vX = location[0];
         int vY = location[1];
 
@@ -3288,4 +3285,8 @@
         return String.format(mContext.getString(R.string.workspace_scroll_format),
                 page + 1, getChildCount());
     }
+
+    public void getLocationInDragLayer(int[] loc) {
+        mLauncher.getDragLayer().getLocationInDragLayer(this, loc);
+    }
 }