diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 38579b69e14..1638c9088d6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
     <uses-permission android:name="android.permission.MOVE_PACKAGE" />
 
     <application android:label="@string/settings_label"
-            android:icon="@drawable/ic_launcher_settings"
+            android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
             android:hardwareAccelerated="true">
 
diff --git a/res/layout/settings_actionbar.xml b/res/layout/settings_actionbar.xml
index 63880255144..711a0a15ddb 100644
--- a/res/layout/settings_actionbar.xml
+++ b/res/layout/settings_actionbar.xml
@@ -23,7 +23,7 @@
         android:layout_height="match_parent">
 
     <!-- ImageView
-            android:src="@drawable/ic_launcher_settings"
+            android:src="@mipmap/ic_launcher_settings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_settings.png
rename to res/mipmap-hdpi/ic_launcher_settings.png
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_settings.png
rename to res/mipmap-mdpi/ic_launcher_settings.png
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 5ca63706b29..0312a4bccd2 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -38,7 +38,7 @@ public class CreateShortcut extends LauncherActivity {
         shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher_settings));
+                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_settings));
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);
         setResult(RESULT_OK, intent);