diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index e5e62d1d0..e39ca18ee 100644
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -32,7 +32,7 @@
     <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
 
     <application android:label="@string/english_ime_name"
-            android:icon="@mipmap/ic_ime_settings"
+            android:icon="@mipmap/ic_launcher_keyboard"
             android:killAfterRestore="false"
             android:supportsRtl="true">
 
@@ -56,7 +56,7 @@
 
         <activity android:name=".setup.SetupActivity"
                 android:label="@string/english_ime_name"
-                android:icon="@drawable/ic_setup_wizard"
+                android:icon="@mipmap/ic_launcher_keyboard"
                 android:launchMode="singleTop"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
@@ -127,7 +127,6 @@
 
         <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
                   android:label="@string/dictionary_settings_title"
-                  android:icon="@mipmap/ic_ime_settings"
                   android:theme="@android:style/Theme.Holo"
                   android:uiOptions="splitActionBarWhenNarrow">
             <intent-filter>
@@ -137,7 +136,6 @@
 
         <activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog"
                   android:label="@string/dictionary_install_over_metered_network_prompt"
-                  android:icon="@mipmap/ic_ime_settings"
                   android:theme="@android:style/Theme.Holo">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/java/res/drawable-hdpi/ic_setup_wizard.png b/java/res/drawable-hdpi/ic_setup_wizard.png
deleted file mode 100644
index 38fca6d9d..000000000
Binary files a/java/res/drawable-hdpi/ic_setup_wizard.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_setup_wizard.png b/java/res/drawable-mdpi/ic_setup_wizard.png
deleted file mode 100644
index 66e62b820..000000000
Binary files a/java/res/drawable-mdpi/ic_setup_wizard.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_setup_wizard.png b/java/res/drawable-xhdpi/ic_setup_wizard.png
deleted file mode 100644
index 53f70a617..000000000
Binary files a/java/res/drawable-xhdpi/ic_setup_wizard.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/ic_setup_wizard.png b/java/res/drawable-xxhdpi/ic_setup_wizard.png
deleted file mode 100644
index 6414b4f36..000000000
Binary files a/java/res/drawable-xxhdpi/ic_setup_wizard.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
deleted file mode 100644
index 486c70d34..000000000
Binary files a/java/res/mipmap-hdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/mipmap-hdpi/ic_launcher_keyboard.png b/java/res/mipmap-hdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..36b1ccae2
Binary files /dev/null and b/java/res/mipmap-hdpi/ic_launcher_keyboard.png differ
diff --git a/java/res/mipmap-mdpi/ic_ime_settings.png b/java/res/mipmap-mdpi/ic_ime_settings.png
deleted file mode 100644
index 75f4afb60..000000000
Binary files a/java/res/mipmap-mdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/mipmap-mdpi/ic_launcher_keyboard.png b/java/res/mipmap-mdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..67ef189ff
Binary files /dev/null and b/java/res/mipmap-mdpi/ic_launcher_keyboard.png differ
diff --git a/java/res/mipmap-xhdpi/ic_ime_settings.png b/java/res/mipmap-xhdpi/ic_ime_settings.png
deleted file mode 100644
index bbf191975..000000000
Binary files a/java/res/mipmap-xhdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/mipmap-xhdpi/ic_launcher_keyboard.png b/java/res/mipmap-xhdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..b33208332
Binary files /dev/null and b/java/res/mipmap-xhdpi/ic_launcher_keyboard.png differ
diff --git a/java/res/mipmap-xxhdpi/ic_ime_settings.png b/java/res/mipmap-xxhdpi/ic_ime_settings.png
deleted file mode 100644
index 16fc693ef..000000000
Binary files a/java/res/mipmap-xxhdpi/ic_ime_settings.png and /dev/null differ
diff --git a/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png b/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png
new file mode 100644
index 000000000..acc424fe2
Binary files /dev/null and b/java/res/mipmap-xxhdpi/ic_launcher_keyboard.png differ