diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index adb6ef3527..c14b63ed83 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -64,7 +64,7 @@
     <application
         android:name="com.android.launcher2.LauncherApplication"
         android:label="@string/application_name"
-        android:icon="@drawable/ic_launcher_home"
+        android:icon="@mipmap/ic_launcher_home"
         android:hardwareAccelerated="true"
         android:largeHeap="@bool/config_largeHeap"
         android:supportsRtl="true">
@@ -88,7 +88,7 @@
             android:name="com.android.launcher2.WallpaperChooser"
             android:theme="@style/Theme.WallpaperPicker"
             android:label="@string/pick_wallpaper"
-            android:icon="@drawable/ic_launcher_wallpaper"
+            android:icon="@mipmap/ic_launcher_wallpaper"
             android:finishOnCloseSystemDialogs="true"
             android:process=":wallpaper_chooser">
             <intent-filter>
diff --git a/res/drawable-hdpi/ic_launcher_wallpaper.png b/res/drawable-hdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index 5c8ee24bb2..0000000000
Binary files a/res/drawable-hdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/drawable-mdpi/ic_launcher_wallpaper.png b/res/drawable-mdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index d2803b1ca1..0000000000
Binary files a/res/drawable-mdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/drawable-xhdpi/ic_launcher_wallpaper.png b/res/drawable-xhdpi/ic_launcher_wallpaper.png
deleted file mode 100644
index 9b0b7b2bce..0000000000
Binary files a/res/drawable-xhdpi/ic_launcher_wallpaper.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_home.png
rename to res/mipmap-hdpi/ic_launcher_home.png
diff --git a/res/mipmap-hdpi/ic_launcher_wallpaper.png b/res/mipmap-hdpi/ic_launcher_wallpaper.png
new file mode 100644
index 0000000000..affee851d7
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_wallpaper.png differ
diff --git a/res/drawable-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_home.png
rename to res/mipmap-mdpi/ic_launcher_home.png
diff --git a/res/mipmap-mdpi/ic_launcher_wallpaper.png b/res/mipmap-mdpi/ic_launcher_wallpaper.png
new file mode 100644
index 0000000000..cb4443bdb9
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_wallpaper.png differ
diff --git a/res/drawable-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
similarity index 100%
rename from res/drawable-xhdpi/ic_launcher_home.png
rename to res/mipmap-xhdpi/ic_launcher_home.png
diff --git a/res/mipmap-xhdpi/ic_launcher_wallpaper.png b/res/mipmap-xhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 0000000000..60f8dceec7
Binary files /dev/null and b/res/mipmap-xhdpi/ic_launcher_wallpaper.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_wallpaper.png b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png
new file mode 100644
index 0000000000..023fb58869
Binary files /dev/null and b/res/mipmap-xxhdpi/ic_launcher_wallpaper.png differ
diff --git a/src/com/android/launcher2/AddAdapter.java b/src/com/android/launcher2/AddAdapter.java
index c2a424b00b..c0bb17b727 100644
--- a/src/com/android/launcher2/AddAdapter.java
+++ b/src/com/android/launcher2/AddAdapter.java
@@ -71,7 +71,7 @@ public class AddAdapter extends BaseAdapter {
         Resources res = launcher.getResources();
 
         mItems.add(new ListItem(res, R.string.group_wallpapers,
-                R.drawable.ic_launcher_wallpaper, ITEM_WALLPAPER));
+                R.mipmap.ic_launcher_wallpaper, ITEM_WALLPAPER));
     }
 
     public View getView(int position, View convertView, ViewGroup parent) {