diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8c61e22c8..e6b8e8b42 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,7 +85,7 @@
     <!-- Note:  Actually, android:hardwareAccelerated could be "true", but in order to switch it
          on/off in the debug screen, we have to set it "false" here and enable it at runtime.  -->
     <application
-        android:icon="@mipmap/icon"
+        android:icon="@mipmap/ic_launcher_email"
         android:label="@string/app_name"
         android:name="Email"
         android:theme="@android:style/Theme.Holo.Light"
diff --git a/res/mipmap-hdpi/ic_launcher_email.png b/res/mipmap-hdpi/ic_launcher_email.png
new file mode 100644
index 000000000..44d1a58c0
Binary files /dev/null and b/res/mipmap-hdpi/ic_launcher_email.png differ
diff --git a/res/mipmap-hdpi/icon.png b/res/mipmap-hdpi/icon.png
deleted file mode 100644
index b0b3f71df..000000000
Binary files a/res/mipmap-hdpi/icon.png and /dev/null differ
diff --git a/res/mipmap-mdpi/ic_launcher_email.png b/res/mipmap-mdpi/ic_launcher_email.png
new file mode 100644
index 000000000..9653a41a9
Binary files /dev/null and b/res/mipmap-mdpi/ic_launcher_email.png differ
diff --git a/res/mipmap-mdpi/icon.png b/res/mipmap-mdpi/icon.png
deleted file mode 100644
index e87458905..000000000
Binary files a/res/mipmap-mdpi/icon.png and /dev/null differ
diff --git a/res/xml/pop_imap_authenticator.xml b/res/xml/pop_imap_authenticator.xml
index 8fa79e861..e82b94b25 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="@mipmap/icon"
+    android:icon="@mipmap/ic_launcher_email"
     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 3044f0d5d..d69873995 100644
--- a/src/com/android/email/activity/AccountShortcutPicker.java
+++ b/src/com/android/email/activity/AccountShortcutPicker.java
@@ -182,7 +182,7 @@ public class AccountShortcutPicker extends ListActivity
         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.mipmap.icon);
+        Parcelable iconResource = Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_email);
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, iconResource);
 
         // Now, return the result to the launcher