diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 3e80de22a..8ffa29d71 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -26,7 +26,7 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application android:label="@string/aosp_android_keyboard_ime_name"
-            android:icon="@drawable/ic_ime_settings"
+            android:icon="@mipmap/ic_ime_settings"
             android:backupAgent="BackupAgent"
             android:killAfterRestore="false"
             android:supportsRtl="true">
diff --git a/java/res/drawable-hdpi/ic_ime_settings.png b/java/res/drawable-hdpi/ic_ime_settings.png
deleted file mode 100644
index f8f80732d..000000000
Binary files a/java/res/drawable-hdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_ime_settings.png b/java/res/drawable-mdpi/ic_ime_settings.png
deleted file mode 100644
index 060e8620e..000000000
Binary files a/java/res/drawable-mdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_ime_settings.png b/java/res/drawable-xhdpi/ic_ime_settings.png
deleted file mode 100644
index d674be06e..000000000
Binary files a/java/res/drawable-xhdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/mipmap-hdpi/ic_ime_settings.png b/java/res/mipmap-hdpi/ic_ime_settings.png
new file mode 100644
index 000000000..2de998bb9
Binary files /dev/null and b/java/res/mipmap-hdpi/ic_ime_settings.png differ
diff --git a/java/res/mipmap-mdpi/ic_ime_settings.png b/java/res/mipmap-mdpi/ic_ime_settings.png
new file mode 100644
index 000000000..209bab42a
Binary files /dev/null and b/java/res/mipmap-mdpi/ic_ime_settings.png differ
diff --git a/java/res/mipmap-xhdpi/ic_ime_settings.png b/java/res/mipmap-xhdpi/ic_ime_settings.png
new file mode 100644
index 000000000..371ac1fc0
Binary files /dev/null and b/java/res/mipmap-xhdpi/ic_ime_settings.png differ
diff --git a/java/res/mipmap-xxhdpi/ic_ime_settings.png b/java/res/mipmap-xxhdpi/ic_ime_settings.png
new file mode 100644
index 000000000..17c52dd01
Binary files /dev/null and b/java/res/mipmap-xxhdpi/ic_ime_settings.png differ