diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dc388d0e9..97ac3d716 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,7 +56,9 @@
                 android:description="@string/permission_access_provider_desc"/>
     <uses-permission android:name="com.android.email.permission.ACCESS_PROVIDER"/>
 
-    <application android:icon="@drawable/icon" android:label="@string/app_name"
+    <application
+        android:icon="@mipmap/icon"
+        android:label="@string/app_name"
         android:name="Email"
         android:theme="@android:style/Theme.Holo.Light"
         android:hardwareAccelerated="false"
diff --git a/res/drawable-hdpi/icon.png b/res/mipmap-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to res/mipmap-hdpi/icon.png
diff --git a/res/drawable-mdpi/icon.png b/res/mipmap-mdpi/icon.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to res/mipmap-mdpi/icon.png
diff --git a/res/xml/pop_imap_authenticator.xml b/res/xml/pop_imap_authenticator.xml
index 2a6749b78..8fa79e861 100644
--- a/res/xml/pop_imap_authenticator.xml
+++ b/res/xml/pop_imap_authenticator.xml
@@ -22,7 +22,7 @@
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
     android:accountType="com.android.email"
-    android:icon="@drawable/icon"
+    android:icon="@mipmap/icon"
     android:smallIcon="@drawable/stat_notify_email_generic"
     android:label="@string/app_name"
     android:accountPreferences="@xml/account_preferences"
diff --git a/src/com/android/email/activity/AccountShortcutPicker.java b/src/com/android/email/activity/AccountShortcutPicker.java
index 82706da34..1c2d6b8e9 100644
--- a/src/com/android/email/activity/AccountShortcutPicker.java
+++ b/src/com/android/email/activity/AccountShortcutPicker.java
@@ -164,7 +164,7 @@ public class AccountShortcutPicker extends ListActivity implements OnItemClickLi
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, account.getDisplayName());
-        Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.drawable.icon);
+        Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.icon);
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
 
         // Now, return the result to the launcher