diff --git a/java/res/drawable-xlarge-land/key_hint_0_holo.9.png b/java/res/drawable-xlarge-land/key_hint_0_holo.9.png
deleted file mode 100644
index 608e76f25..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_1_holo.9.png b/java/res/drawable-xlarge-land/key_hint_1_holo.9.png
deleted file mode 100644
index a1bedc119..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_2_holo.9.png b/java/res/drawable-xlarge-land/key_hint_2_holo.9.png
deleted file mode 100644
index bd4375ed0..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_3_holo.9.png b/java/res/drawable-xlarge-land/key_hint_3_holo.9.png
deleted file mode 100644
index b263c1922..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_4_holo.9.png b/java/res/drawable-xlarge-land/key_hint_4_holo.9.png
deleted file mode 100644
index 6ce5bb443..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_5_holo.9.png b/java/res/drawable-xlarge-land/key_hint_5_holo.9.png
deleted file mode 100644
index ad14fb02e..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_6_holo.9.png b/java/res/drawable-xlarge-land/key_hint_6_holo.9.png
deleted file mode 100644
index 0378c3c70..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_7_holo.9.png b/java/res/drawable-xlarge-land/key_hint_7_holo.9.png
deleted file mode 100644
index 2528155e8..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_8_holo.9.png b/java/res/drawable-xlarge-land/key_hint_8_holo.9.png
deleted file mode 100644
index 4bbd59951..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge-land/key_hint_9_holo.9.png b/java/res/drawable-xlarge-land/key_hint_9_holo.9.png
deleted file mode 100644
index 40390b7fa..000000000
Binary files a/java/res/drawable-xlarge-land/key_hint_9_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_0_holo.9.png b/java/res/drawable-xlarge/key_hint_0_holo.9.png
deleted file mode 100644
index 63f4f80ac..000000000
Binary files a/java/res/drawable-xlarge/key_hint_0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_1_holo.9.png b/java/res/drawable-xlarge/key_hint_1_holo.9.png
deleted file mode 100644
index b06e993c3..000000000
Binary files a/java/res/drawable-xlarge/key_hint_1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_2_holo.9.png b/java/res/drawable-xlarge/key_hint_2_holo.9.png
deleted file mode 100644
index ea3fc407b..000000000
Binary files a/java/res/drawable-xlarge/key_hint_2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_3_holo.9.png b/java/res/drawable-xlarge/key_hint_3_holo.9.png
deleted file mode 100644
index 4ab2475be..000000000
Binary files a/java/res/drawable-xlarge/key_hint_3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_4_holo.9.png b/java/res/drawable-xlarge/key_hint_4_holo.9.png
deleted file mode 100644
index baafc3ce6..000000000
Binary files a/java/res/drawable-xlarge/key_hint_4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_5_holo.9.png b/java/res/drawable-xlarge/key_hint_5_holo.9.png
deleted file mode 100644
index 401278782..000000000
Binary files a/java/res/drawable-xlarge/key_hint_5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_6_holo.9.png b/java/res/drawable-xlarge/key_hint_6_holo.9.png
deleted file mode 100644
index 49229a7f6..000000000
Binary files a/java/res/drawable-xlarge/key_hint_6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_7_holo.9.png b/java/res/drawable-xlarge/key_hint_7_holo.9.png
deleted file mode 100644
index 9ef6a8b55..000000000
Binary files a/java/res/drawable-xlarge/key_hint_7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_8_holo.9.png b/java/res/drawable-xlarge/key_hint_8_holo.9.png
deleted file mode 100644
index 08c40e466..000000000
Binary files a/java/res/drawable-xlarge/key_hint_8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-xlarge/key_hint_9_holo.9.png b/java/res/drawable-xlarge/key_hint_9_holo.9.png
deleted file mode 100644
index 3dfe806b0..000000000
Binary files a/java/res/drawable-xlarge/key_hint_9_holo.9.png and /dev/null differ
diff --git a/java/res/xml-xlarge/kbd_qwerty_row1_common.xml b/java/res/xml-xlarge/kbd_qwerty_row1_common.xml
index 98b857152..677da2527 100644
--- a/java/res/xml-xlarge/kbd_qwerty_row1_common.xml
+++ b/java/res/xml-xlarge/kbd_qwerty_row1_common.xml
@@ -29,52 +29,42 @@
         latin:keyEdgeFlags="left" />
     <Key
         latin:keyLabel="q"
-        latin:keyHintIcon="@drawable/key_hint_1_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_q" />
     <Key
         latin:keyLabel="w"
-        latin:keyHintIcon="@drawable/key_hint_2_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_w" />
     <Key
         latin:keyLabel="e"
-        latin:keyHintIcon="@drawable/key_hint_3_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_e" />
     <Key
         latin:keyLabel="r"
-        latin:keyHintIcon="@drawable/key_hint_4_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_r" />
     <Key
         latin:keyLabel="t"
-        latin:keyHintIcon="@drawable/key_hint_5_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_t" />
     <Key
         latin:keyLabel="y"
-        latin:keyHintIcon="@drawable/key_hint_6_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_y" />
     <Key
         latin:keyLabel="u"
-        latin:keyHintIcon="@drawable/key_hint_7_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_u" />
     <Key
         latin:keyLabel="i"
-        latin:keyHintIcon="@drawable/key_hint_8_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_i" />
     <Key
         latin:keyLabel="o"
-        latin:keyHintIcon="@drawable/key_hint_9_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_o" />
     <Key
         latin:keyLabel="p"
-        latin:keyHintIcon="@drawable/key_hint_0_holo"
         latin:popupKeyboard="@xml/kbd_popup_template"
         latin:popupCharacters="@string/alternates_for_p" />
     <Key