diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14fb044..c6263fb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,6 +61,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.BIND_APPWIDGET" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
     <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
     <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
diff --git a/res/drawable-hdpi/grid_focused.9.png b/res/drawable-hdpi/grid_focused.9.png
deleted file mode 100644
index f6ae267..0000000
--- a/res/drawable-hdpi/grid_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/grid_pressed.9.png b/res/drawable-hdpi/grid_pressed.9.png
deleted file mode 100644
index cb5aea8..0000000
--- a/res/drawable-hdpi/grid_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/grid_selected.9.png b/res/drawable-hdpi/grid_selected.9.png
deleted file mode 100644
index add46a7..0000000
--- a/res/drawable-hdpi/grid_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tile_picker_focused.9.png b/res/drawable-hdpi/tile_picker_focused.9.png
new file mode 100644
index 0000000..c72d6a2
--- /dev/null
+++ b/res/drawable-hdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tile_picker_pressed.9.png b/res/drawable-hdpi/tile_picker_pressed.9.png
new file mode 100644
index 0000000..44c65ac
--- /dev/null
+++ b/res/drawable-hdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tile_picker_selected.9.png b/res/drawable-hdpi/tile_picker_selected.9.png
new file mode 100644
index 0000000..461bacb
--- /dev/null
+++ b/res/drawable-hdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tile_shadow_bottom.9.png b/res/drawable-hdpi/tile_shadow_bottom.9.png
new file mode 100644
index 0000000..e80558b
--- /dev/null
+++ b/res/drawable-hdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/res/drawable-hdpi/tile_shadow_top.9.png b/res/drawable-hdpi/tile_shadow_top.9.png
new file mode 100644
index 0000000..7e93865
--- /dev/null
+++ b/res/drawable-hdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/res/drawable-mdpi/grid_focused.9.png b/res/drawable-mdpi/grid_focused.9.png
deleted file mode 100644
index 6660a8c..0000000
--- a/res/drawable-mdpi/grid_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/grid_pressed.9.png b/res/drawable-mdpi/grid_pressed.9.png
deleted file mode 100644
index c7e6b06..0000000
--- a/res/drawable-mdpi/grid_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/grid_selected.9.png b/res/drawable-mdpi/grid_selected.9.png
deleted file mode 100644
index e2732b7..0000000
--- a/res/drawable-mdpi/grid_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tile_picker_focused.9.png b/res/drawable-mdpi/tile_picker_focused.9.png
new file mode 100644
index 0000000..13b325b
--- /dev/null
+++ b/res/drawable-mdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tile_picker_pressed.9.png b/res/drawable-mdpi/tile_picker_pressed.9.png
new file mode 100644
index 0000000..4e8196d
--- /dev/null
+++ b/res/drawable-mdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tile_picker_selected.9.png b/res/drawable-mdpi/tile_picker_selected.9.png
new file mode 100644
index 0000000..eee69ec
--- /dev/null
+++ b/res/drawable-mdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tile_shadow_bottom.9.png b/res/drawable-mdpi/tile_shadow_bottom.9.png
new file mode 100644
index 0000000..d95787b
--- /dev/null
+++ b/res/drawable-mdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/res/drawable-mdpi/tile_shadow_top.9.png b/res/drawable-mdpi/tile_shadow_top.9.png
new file mode 100644
index 0000000..8da913c
--- /dev/null
+++ b/res/drawable-mdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/grid_focused.9.png b/res/drawable-xhdpi/grid_focused.9.png
deleted file mode 100644
index 37228b3..0000000
--- a/res/drawable-xhdpi/grid_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/grid_pressed.9.png b/res/drawable-xhdpi/grid_pressed.9.png
deleted file mode 100644
index 20d4647..0000000
--- a/res/drawable-xhdpi/grid_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/grid_selected.9.png b/res/drawable-xhdpi/grid_selected.9.png
deleted file mode 100644
index c8b9b6b..0000000
--- a/res/drawable-xhdpi/grid_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/tile_picker_focused.9.png b/res/drawable-xhdpi/tile_picker_focused.9.png
new file mode 100644
index 0000000..279e859
--- /dev/null
+++ b/res/drawable-xhdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/tile_picker_pressed.9.png b/res/drawable-xhdpi/tile_picker_pressed.9.png
new file mode 100644
index 0000000..abe0e00
--- /dev/null
+++ b/res/drawable-xhdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/tile_picker_selected.9.png b/res/drawable-xhdpi/tile_picker_selected.9.png
new file mode 100644
index 0000000..b047591
--- /dev/null
+++ b/res/drawable-xhdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/tile_shadow_bottom.9.png b/res/drawable-xhdpi/tile_shadow_bottom.9.png
new file mode 100644
index 0000000..81571f3
--- /dev/null
+++ b/res/drawable-xhdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/res/drawable-xhdpi/tile_shadow_top.9.png b/res/drawable-xhdpi/tile_shadow_top.9.png
new file mode 100644
index 0000000..8503a59
--- /dev/null
+++ b/res/drawable-xhdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/grid_focused.9.png b/res/drawable-xxhdpi/grid_focused.9.png
deleted file mode 100644
index a8dff7a..0000000
--- a/res/drawable-xxhdpi/grid_focused.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/grid_pressed.9.png b/res/drawable-xxhdpi/grid_pressed.9.png
deleted file mode 100644
index cbc83d1..0000000
--- a/res/drawable-xxhdpi/grid_pressed.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/grid_selected.9.png b/res/drawable-xxhdpi/grid_selected.9.png
deleted file mode 100644
index f8cd673..0000000
--- a/res/drawable-xxhdpi/grid_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/tile_picker_focused.9.png b/res/drawable-xxhdpi/tile_picker_focused.9.png
new file mode 100644
index 0000000..1004c14
--- /dev/null
+++ b/res/drawable-xxhdpi/tile_picker_focused.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/tile_picker_pressed.9.png b/res/drawable-xxhdpi/tile_picker_pressed.9.png
new file mode 100644
index 0000000..9658444
--- /dev/null
+++ b/res/drawable-xxhdpi/tile_picker_pressed.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/tile_picker_selected.9.png b/res/drawable-xxhdpi/tile_picker_selected.9.png
new file mode 100644
index 0000000..a3cd303
--- /dev/null
+++ b/res/drawable-xxhdpi/tile_picker_selected.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/tile_shadow_bottom.9.png b/res/drawable-xxhdpi/tile_shadow_bottom.9.png
new file mode 100644
index 0000000..55250f0
--- /dev/null
+++ b/res/drawable-xxhdpi/tile_shadow_bottom.9.png
Binary files differ
diff --git a/res/drawable-xxhdpi/tile_shadow_top.9.png b/res/drawable-xxhdpi/tile_shadow_top.9.png
new file mode 100644
index 0000000..3f22633
--- /dev/null
+++ b/res/drawable-xxhdpi/tile_shadow_top.9.png
Binary files differ
diff --git a/res/drawable/wallpaper_gallery_item.xml b/res/drawable/wallpaper_tile_fg.xml
similarity index 90%
rename from res/drawable/wallpaper_gallery_item.xml
rename to res/drawable/wallpaper_tile_fg.xml
index 9ac931b..c299f32 100644
--- a/res/drawable/wallpaper_gallery_item.xml
+++ b/res/drawable/wallpaper_tile_fg.xml
@@ -15,9 +15,9 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/grid_pressed" />
-    <item android:state_focused="true" android:drawable="@drawable/grid_focused" />
-    <item android:state_pressed="true" android:drawable="@drawable/grid_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/grid_selected" />
+    <item android:state_checked="true" android:drawable="@drawable/tile_picker_selected" />
+    <item android:state_focused="true" android:drawable="@drawable/tile_picker_focused" />
+    <item android:state_pressed="true" android:drawable="@drawable/tile_picker_pressed" />
+    <item android:state_selected="true" android:drawable="@drawable/tile_picker_selected" />
     <item android:drawable="@android:color/transparent" />
 </selector>
diff --git a/res/layout/wallpaper_cropper.xml b/res/layout/wallpaper_cropper.xml
index 768500c..3a3d98a 100644
--- a/res/layout/wallpaper_cropper.xml
+++ b/res/layout/wallpaper_cropper.xml
@@ -19,7 +19,7 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wallpaper_cropper"
+    android:id="@+id/wallpaper_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <com.android.launcher3.CropView
diff --git a/res/layout/wallpaper_picker.xml b/res/layout/wallpaper_picker.xml
index 347a63e..a0672f6 100644
--- a/res/layout/wallpaper_picker.xml
+++ b/res/layout/wallpaper_picker.xml
@@ -19,7 +19,7 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/wallpaper_picker"
+    android:id="@+id/wallpaper_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <com.android.launcher3.CropView
@@ -36,14 +36,28 @@
         android:indeterminate="true"
         android:indeterminateOnly="true"
         android:background="@android:color/transparent" />
-    <HorizontalScrollView
+    <LinearLayout
         android:id="@+id/wallpaper_strip"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true" >
-        <LinearLayout android:id="@+id/wallpaper_list"
+        android:layout_alignParentBottom="true"
+        android:orientation="vertical"
+        android:fitsSystemWindows="true" >
+        <View
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal" />
-    </HorizontalScrollView>
+            android:layout_height="2dp"
+            android:background="@drawable/tile_shadow_top" />
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" >
+            <LinearLayout android:id="@+id/wallpaper_list"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" />
+        </HorizontalScrollView>
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="2dp"
+            android:background="@drawable/tile_shadow_bottom" />
+    </LinearLayout>
 </RelativeLayout>
diff --git a/res/layout/wallpaper_picker_gallery_item.xml b/res/layout/wallpaper_picker_gallery_item.xml
index ecfba60..976d3fa 100644
--- a/res/layout/wallpaper_picker_gallery_item.xml
+++ b/res/layout/wallpaper_picker_gallery_item.xml
@@ -20,8 +20,8 @@
     android:layout_height="@dimen/wallpaperThumbnailHeight"
     android:focusable="true"
     android:clickable="true"
-    android:background="@drawable/wallpaper_gallery_item"
-    android:foreground="@drawable/wallpaper_gallery_item">
+    android:background="@drawable/wallpaper_tile_fg"
+    android:foreground="@drawable/wallpaper_tile_fg">
     <ImageView
         android:id="@+id/wallpaper_image"
         android:layout_width="match_parent"
diff --git a/res/layout/wallpaper_picker_item.xml b/res/layout/wallpaper_picker_item.xml
index 79d45c0..0ac8f97 100644
--- a/res/layout/wallpaper_picker_item.xml
+++ b/res/layout/wallpaper_picker_item.xml
@@ -20,8 +20,8 @@
     android:layout_height="@dimen/wallpaperThumbnailHeight"
     android:focusable="true"
     android:clickable="true"
-    android:background="@drawable/wallpaper_gallery_item"
-    android:foreground="@drawable/wallpaper_gallery_item">
+    android:background="@drawable/wallpaper_tile_fg"
+    android:foreground="@drawable/wallpaper_tile_fg">
     <ImageView
         android:id="@+id/wallpaper_image"
         android:layout_width="match_parent"
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index d70a3a9..6e6cdf6 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3358,8 +3358,8 @@
             // We disable both search and voice search when there is no global search provider
             if (searchButtonContainer != null) searchButtonContainer.setVisibility(View.GONE);
             if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
-            searchButton.setVisibility(View.GONE);
-            voiceButton.setVisibility(View.GONE);
+            if (searchButton != null) searchButton.setVisibility(View.GONE);
+            if (voiceButton != null) voiceButton.setVisibility(View.GONE);
             setVoiceButtonProxyVisible(false);
             return false;
         }
@@ -3412,7 +3412,7 @@
             return true;
         } else {
             if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE);
-            voiceButton.setVisibility(View.GONE);
+            if (voiceButton != null) voiceButton.setVisibility(View.GONE);
             setVoiceButtonProxyVisible(false);
             return false;
         }
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 179c8aa..aaa901a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -39,6 +39,7 @@
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.provider.BaseColumns;
 import android.util.Log;
 import android.util.Pair;
 import com.android.launcher3.InstallWidgetReceiver.WidgetMimeTypeHandlerData;
@@ -1696,6 +1697,8 @@
                             LauncherSettings.Favorites.ITEM_TYPE);
                     final int appWidgetIdIndex = c.getColumnIndexOrThrow(
                             LauncherSettings.Favorites.APPWIDGET_ID);
+                    final int appWidgetProviderIndex = c.getColumnIndexOrThrow(
+                            LauncherSettings.Favorites.APPWIDGET_PROVIDER);
                     final int screenIndex = c.getColumnIndexOrThrow(
                             LauncherSettings.Favorites.SCREEN);
                     final int cellXIndex = c.getColumnIndexOrThrow
@@ -1856,6 +1859,8 @@
                             case LauncherSettings.Favorites.ITEM_TYPE_APPWIDGET:
                                 // Read all Launcher-specific widget details
                                 int appWidgetId = c.getInt(appWidgetIdIndex);
+                                String savedProvider = c.getString(appWidgetProviderIndex);
+
                                 id = c.getLong(idIndex);
 
                                 final AppWidgetProviderInfo provider =
@@ -1901,6 +1906,15 @@
                                     if (!checkItemPlacement(occupied, appWidgetInfo)) {
                                         break;
                                     }
+                                    String providerName = provider.provider.flattenToString();
+                                    if (!providerName.equals(savedProvider)) {
+                                        ContentValues values = new ContentValues();
+                                        values.put(LauncherSettings.Favorites.APPWIDGET_PROVIDER,
+                                                providerName);
+                                        String where = BaseColumns._ID + "= ?";
+                                        String[] args = {Integer.toString(c.getInt(idIndex))};
+                                        contentResolver.update(contentUri, values, where, args);
+                                    }
                                     sBgItemsIdMap.put(appWidgetInfo.id, appWidgetInfo);
                                     sBgAppWidgets.add(appWidgetInfo);
                                 }
diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java
index d980967..824dea6 100644
--- a/src/com/android/launcher3/WallpaperPickerActivity.java
+++ b/src/com/android/launcher3/WallpaperPickerActivity.java
@@ -109,8 +109,8 @@
                     mIgnoreNextTap = true;
                 }
                 mAnim = new LauncherViewPropertyAnimator(wallpaperStrip);
-                mAnim.translationY(wallpaperStrip.getHeight())
-                    .setInterpolator(new DecelerateInterpolator(0.75f));
+                mAnim.translationY(wallpaperStrip.getHeight()).alpha(0f)
+                        .setInterpolator(new DecelerateInterpolator(0.75f));
                 mAnim.start();
             }
             public void onTap() {
@@ -121,7 +121,8 @@
                         mAnim.cancel();
                     }
                     mAnim = new LauncherViewPropertyAnimator(wallpaperStrip);
-                    mAnim.translationY(0).setInterpolator(new DecelerateInterpolator(0.75f));
+                    mAnim.translationY(0).alpha(1f)
+                            .setInterpolator(new DecelerateInterpolator(0.75f));
                     mAnim.start();
                 }
             }
@@ -363,7 +364,16 @@
         cursor.close();
         return thumb;
     }
-    
+
+    protected void onStop() {
+        super.onStop();
+        final View wallpaperStrip = findViewById(R.id.wallpaper_strip);
+        if (wallpaperStrip.getTranslationY() > 0) {
+            wallpaperStrip.setTranslationY(0);
+            wallpaperStrip.setAlpha(1f);
+        }
+    }
+
     protected void onSaveInstanceState(Bundle outState) {
         outState.putParcelableArrayList(TEMP_WALLPAPER_TILES, mTempWallpaperTiles);
     }
diff --git a/tests/Android.mk b/tests/Android.mk
index e33169c..762a52b 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -12,5 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-LOCAL_PATH := $(call my-dir)
-include $(call all-makefiles-under,$(LOCAL_PATH))
+#LOCAL_PATH := $(call my-dir)
+#include $(call all-makefiles-under,$(LOCAL_PATH))