diff --git a/java/res/drawable/ic_subtype_keyboard.png b/java/res/drawable/ic_subtype_keyboard_cs.png
similarity index 100%
rename from java/res/drawable/ic_subtype_keyboard.png
rename to java/res/drawable/ic_subtype_keyboard_cs.png
diff --git a/java/res/drawable/ic_subtype_keyboard_da.png b/java/res/drawable/ic_subtype_keyboard_da.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_da.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_de.png b/java/res/drawable/ic_subtype_keyboard_de.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_de.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_en_gb.png b/java/res/drawable/ic_subtype_keyboard_en_gb.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_en_gb.png differ
diff --git a/java/res/drawable/ic_subtype_us_keyboard.png b/java/res/drawable/ic_subtype_keyboard_en_us.png
similarity index 100%
rename from java/res/drawable/ic_subtype_us_keyboard.png
rename to java/res/drawable/ic_subtype_keyboard_en_us.png
diff --git a/java/res/drawable/ic_subtype_keyboard_es.png b/java/res/drawable/ic_subtype_keyboard_es.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_es.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_es_us.png b/java/res/drawable/ic_subtype_keyboard_es_us.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_es_us.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_fr.png b/java/res/drawable/ic_subtype_keyboard_fr.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_fr.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_fr_ca.png b/java/res/drawable/ic_subtype_keyboard_fr_ca.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_fr_ca.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_it.png b/java/res/drawable/ic_subtype_keyboard_it.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_it.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_nb.png b/java/res/drawable/ic_subtype_keyboard_nb.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_nb.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_nl.png b/java/res/drawable/ic_subtype_keyboard_nl.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_nl.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_ru.png b/java/res/drawable/ic_subtype_keyboard_ru.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_ru.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_sr.png b/java/res/drawable/ic_subtype_keyboard_sr.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_sr.png differ
diff --git a/java/res/drawable/ic_subtype_keyboard_sv.png b/java/res/drawable/ic_subtype_keyboard_sv.png
new file mode 100644
index 000000000..ef5fe4b3c
Binary files /dev/null and b/java/res/drawable/ic_subtype_keyboard_sv.png differ
diff --git a/java/res/drawable/ic_subtype_mic.png b/java/res/drawable/ic_subtype_mic_cs.png
similarity index 100%
rename from java/res/drawable/ic_subtype_mic.png
rename to java/res/drawable/ic_subtype_mic_cs.png
diff --git a/java/res/drawable/ic_subtype_mic_de.png b/java/res/drawable/ic_subtype_mic_de.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_de.png differ
diff --git a/java/res/drawable/ic_subtype_mic_en_au.png b/java/res/drawable/ic_subtype_mic_en_au.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_en_au.png differ
diff --git a/java/res/drawable/ic_subtype_mic_en_gb.png b/java/res/drawable/ic_subtype_mic_en_gb.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_en_gb.png differ
diff --git a/java/res/drawable/ic_subtype_mic_en_in.png b/java/res/drawable/ic_subtype_mic_en_in.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_en_in.png differ
diff --git a/java/res/drawable/ic_subtype_mic_en_nz.png b/java/res/drawable/ic_subtype_mic_en_nz.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_en_nz.png differ
diff --git a/java/res/drawable/ic_subtype_mic_en_us.png b/java/res/drawable/ic_subtype_mic_en_us.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_en_us.png differ
diff --git a/java/res/drawable/ic_subtype_mic_es.png b/java/res/drawable/ic_subtype_mic_es.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_es.png differ
diff --git a/java/res/drawable/ic_subtype_mic_fr.png b/java/res/drawable/ic_subtype_mic_fr.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_fr.png differ
diff --git a/java/res/drawable/ic_subtype_mic_ja.png b/java/res/drawable/ic_subtype_mic_ja.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_ja.png differ
diff --git a/java/res/drawable/ic_subtype_mic_ko.png b/java/res/drawable/ic_subtype_mic_ko.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_ko.png differ
diff --git a/java/res/drawable/ic_subtype_mic_pl.png b/java/res/drawable/ic_subtype_mic_pl.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_pl.png differ
diff --git a/java/res/drawable/ic_subtype_mic_pt.png b/java/res/drawable/ic_subtype_mic_pt.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_pt.png differ
diff --git a/java/res/drawable/ic_subtype_mic_ru.png b/java/res/drawable/ic_subtype_mic_ru.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_ru.png differ
diff --git a/java/res/drawable/ic_subtype_mic_tr.png b/java/res/drawable/ic_subtype_mic_tr.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_tr.png differ
diff --git a/java/res/drawable/ic_subtype_mic_zh_cn.png b/java/res/drawable/ic_subtype_mic_zh_cn.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_zh_cn.png differ
diff --git a/java/res/drawable/ic_subtype_mic_zh_tw.png b/java/res/drawable/ic_subtype_mic_zh_tw.png
new file mode 100644
index 000000000..03c0b6982
Binary files /dev/null and b/java/res/drawable/ic_subtype_mic_zh_tw.png differ
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 74cb45fea..65816aa4e 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -29,162 +29,162 @@
         android:isDefault="@bool/im_is_default">
     <!-- If IME doesn't have an applicable subtype, the first subtype will be used as a default
          subtype.-->
-    <subtype android:icon="@drawable/ic_subtype_us_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_en_us"
             android:label="@string/subtype_mode_en_US_keyboard"
             android:imeSubtypeLocale="en_US"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_cs"
             android:label="@string/subtype_mode_cs_keyboard"
             android:imeSubtypeLocale="cs"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_da"
             android:label="@string/subtype_mode_da_keyboard"
             android:imeSubtypeLocale="da"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_de"
             android:label="@string/subtype_mode_de_keyboard"
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_en_gb"
             android:label="@string/subtype_mode_en_GB_keyboard"
             android:imeSubtypeLocale="en_GB"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_es"
             android:label="@string/subtype_mode_es_keyboard"
             android:imeSubtypeLocale="es"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_es_us"
             android:label="@string/subtype_mode_es_rUS_keyboard"
             android:imeSubtypeLocale="es_rUS"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_fr"
             android:label="@string/subtype_mode_fr_keyboard"
             android:imeSubtypeLocale="fr"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_fr_ca"
             android:label="@string/subtype_mode_fr_rCA_keyboard"
             android:imeSubtypeLocale="fr_rCA"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_it"
             android:label="@string/subtype_mode_it_keyboard"
             android:imeSubtypeLocale="it"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_nb"
             android:label="@string/subtype_mode_nb_keyboard"
             android:imeSubtypeLocale="nb"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_nl"
             android:label="@string/subtype_mode_nl_keyboard"
             android:imeSubtypeLocale="nl"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_ru"
             android:label="@string/subtype_mode_ru_keyboard"
             android:imeSubtypeLocale="ru"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_sr"
             android:label="@string/subtype_mode_sr_keyboard"
             android:imeSubtypeLocale="sr"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_keyboard"
+    <subtype android:icon="@drawable/ic_subtype_keyboard_sv"
             android:label="@string/subtype_mode_sv_keyboard"
             android:imeSubtypeLocale="sv"
             android:imeSubtypeMode="keyboard"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_cs"
             android:label="@string/subtype_mode_cs_voice"
             android:imeSubtypeLocale="cs"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_de"
             android:label="@string/subtype_mode_de_voice"
             android:imeSubtypeLocale="de"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_en_au"
             android:label="@string/subtype_mode_en_AU_voice"
             android:imeSubtypeLocale="en_AU"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_en_gb"
             android:label="@string/subtype_mode_en_GB_voice"
             android:imeSubtypeLocale="en_GB"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_en_in"
             android:label="@string/subtype_mode_en_IN_voice"
             android:imeSubtypeLocale="en_IN"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_en_nz"
             android:label="@string/subtype_mode_en_NZ_voice"
             android:imeSubtypeLocale="en_NZ"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_en_us"
             android:label="@string/subtype_mode_en_US_voice"
             android:imeSubtypeLocale="en_US"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_es"
             android:label="@string/subtype_mode_es_voice"
             android:imeSubtypeLocale="es"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_fr"
             android:label="@string/subtype_mode_fr_voice"
             android:imeSubtypeLocale="fr"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_ko"
             android:label="@string/subtype_mode_ko_voice"
             android:imeSubtypeLocale="ko"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_ja"
             android:label="@string/subtype_mode_ja_voice"
             android:imeSubtypeLocale="ja"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_pl"
             android:label="@string/subtype_mode_pl_voice"
             android:imeSubtypeLocale="pl"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_pt"
             android:label="@string/subtype_mode_pt_voice"
             android:imeSubtypeLocale="pt"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_ru"
             android:label="@string/subtype_mode_ru_voice"
             android:imeSubtypeLocale="ru"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_tr"
             android:label="@string/subtype_mode_tr_voice"
             android:imeSubtypeLocale="tr"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_zh_cn"
             android:label="@string/subtype_mode_zh_CN_voice"
             android:imeSubtypeLocale="zh_CN"
             android:imeSubtypeMode="voice"
     />
-    <subtype android:icon="@drawable/ic_subtype_mic"
+    <subtype android:icon="@drawable/ic_subtype_mic_zh_tw"
             android:label="@string/subtype_mode_zh_TW_voice"
             android:imeSubtypeLocale="zh_TW"
             android:imeSubtypeMode="voice"