diff --git a/java/res/drawable-mdpi/key_hint_num0_holo.9.png b/java/res/drawable-mdpi/key_hint_num0_holo.9.png
new file mode 100644
index 000000000..271264e92
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num0_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num1_holo.9.png b/java/res/drawable-mdpi/key_hint_num1_holo.9.png
new file mode 100644
index 000000000..eaf374262
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num1_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num2_holo.9.png b/java/res/drawable-mdpi/key_hint_num2_holo.9.png
new file mode 100644
index 000000000..8a1657117
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num2_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num3_holo.9.png b/java/res/drawable-mdpi/key_hint_num3_holo.9.png
new file mode 100644
index 000000000..34b501109
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num3_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num4_holo.9.png b/java/res/drawable-mdpi/key_hint_num4_holo.9.png
new file mode 100644
index 000000000..d4cc250dd
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num4_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num5_holo.9.png b/java/res/drawable-mdpi/key_hint_num5_holo.9.png
new file mode 100644
index 000000000..6a054b42f
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num5_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num6_holo.9.png b/java/res/drawable-mdpi/key_hint_num6_holo.9.png
new file mode 100644
index 000000000..66e91400a
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num6_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num7_holo.9.png b/java/res/drawable-mdpi/key_hint_num7_holo.9.png
new file mode 100644
index 000000000..5eae24f4f
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num7_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num8_holo.9.png b/java/res/drawable-mdpi/key_hint_num8_holo.9.png
new file mode 100644
index 000000000..ea7f512fd
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num8_holo.9.png differ
diff --git a/java/res/drawable-mdpi/key_hint_num9_holo.9.png b/java/res/drawable-mdpi/key_hint_num9_holo.9.png
new file mode 100644
index 000000000..0bf85de93
Binary files /dev/null and b/java/res/drawable-mdpi/key_hint_num9_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png
new file mode 100644
index 000000000..c409cea00
Binary files /dev/null and b/java/res/drawable-sw600dp-land-mdpi/hint_popup_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png
new file mode 100644
index 000000000..1534d99d1
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
new file mode 100644
index 000000000..936513a31
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
new file mode 100644
index 000000000..b071251a7
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
new file mode 100644
index 000000000..9fed21edf
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
new file mode 100644
index 000000000..3fce55938
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
new file mode 100644
index 000000000..3f82b67dd
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_normal_holo.9.png
new file mode 100644
index 000000000..eded1736b
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png
new file mode 100644
index 000000000..e6a1dcecc
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png
new file mode 100644
index 000000000..d2f5f3bf2
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png
new file mode 100644
index 000000000..2ffc6ea2b
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/hint_popup_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png
new file mode 100644
index 000000000..271264e92
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png
new file mode 100644
index 000000000..eaf374262
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png
new file mode 100644
index 000000000..8a1657117
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png
new file mode 100644
index 000000000..34b501109
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png
new file mode 100644
index 000000000..d4cc250dd
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png
new file mode 100644
index 000000000..6a054b42f
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png
new file mode 100644
index 000000000..66e91400a
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png
new file mode 100644
index 000000000..5eae24f4f
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png
new file mode 100644
index 000000000..ea7f512fd
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png
new file mode 100644
index 000000000..0bf85de93
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_background_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_background_holo.9.png
new file mode 100644
index 000000000..a93966c92
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/keyboard_background_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_background_holo.9.png
new file mode 100644
index 000000000..286cf84fc
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_more_background_holo.9.png
new file mode 100644
index 000000000..e3f5be86d
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/keyboard_key_feedback_more_background_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_popup_panel_background_holo.9.png
new file mode 100644
index 000000000..7be7ab7e2
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/keyboard_popup_panel_background_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-sw600dp-mdpi/keyboard_suggest_strip_holo.9.png
new file mode 100644
index 000000000..1f87a68e9
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/keyboard_suggest_strip_holo.9.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png
new file mode 100644
index 000000000..155579169
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num0_holo.png
new file mode 100644
index 000000000..e1d395b45
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num0_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num1_holo.png
new file mode 100644
index 000000000..225436ac2
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num1_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num2_holo.png
new file mode 100644
index 000000000..e513fa4a0
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num2_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num3_holo.png
new file mode 100644
index 000000000..b91e005fc
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num3_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num4_holo.png
new file mode 100644
index 000000000..65f88245b
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num4_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num5_holo.png
new file mode 100644
index 000000000..b89ef07eb
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num5_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num6_holo.png
new file mode 100644
index 000000000..931275a9e
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num6_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num7_holo.png
new file mode 100644
index 000000000..9396c4c8f
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num7_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num8_holo.png
new file mode 100644
index 000000000..12e3eef45
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num8_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num9_holo.png
new file mode 100644
index 000000000..6911c2b4f
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_num9_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbpound_holo.png
new file mode 100644
index 000000000..e3a8b4900
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbpound_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbstar_holo.png
new file mode 100644
index 000000000..e80e9345f
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_numbstar_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png
new file mode 100644
index 000000000..d519ccecf
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png
new file mode 100644
index 000000000..784a45054
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png
new file mode 100644
index 000000000..91d6e32f9
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png
new file mode 100644
index 000000000..2bd053656
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png
new file mode 100644
index 000000000..25e655d96
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png
new file mode 100644
index 000000000..c1116dc17
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png
new file mode 100644
index 000000000..44919dfcc
Binary files /dev/null and b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png
new file mode 100644
index 000000000..c409cea00
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/hint_popup_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_at_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_at_holo.9.png
new file mode 100644
index 000000000..5b946ff9b
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_at_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_at_large_holo.9.png
new file mode 100644
index 000000000..852f899ed
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_at_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_holo.9.png
new file mode 100644
index 000000000..1d9346e6f
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_large_holo.9.png
new file mode 100644
index 000000000..17e9091b4
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_colon_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_holo.9.png
new file mode 100644
index 000000000..c2a913c04
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_large_holo.9.png
new file mode 100644
index 000000000..846f213f1
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_comma_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_holo.9.png
new file mode 100644
index 000000000..ce8e8de43
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_large_holo.9.png
new file mode 100644
index 000000000..035dcf85d
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_exclamation_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_holo.9.png
new file mode 100644
index 000000000..931390b45
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_large_holo.9.png
new file mode 100644
index 000000000..e6f9f8a9c
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_plus_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_question_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_question_holo.9.png
new file mode 100644
index 000000000..6cbeb5993
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_question_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_question_large_holo.9.png
new file mode 100644
index 000000000..bfd58de09
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_question_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_holo.9.png
new file mode 100644
index 000000000..3b361b71c
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_large_holo.9.png
new file mode 100644
index 000000000..2a08aa12e
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_quote_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_holo.9.png
new file mode 100644
index 000000000..06f3efb7e
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_large_holo.9.png
new file mode 100644
index 000000000..50f99a191
Binary files /dev/null and b/java/res/drawable-sw768dp-land-mdpi/key_hint_underline_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png
new file mode 100644
index 000000000..1534d99d1
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
new file mode 100644
index 000000000..936513a31
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
new file mode 100644
index 000000000..b071251a7
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
new file mode 100644
index 000000000..9fed21edf
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
new file mode 100644
index 000000000..3fce55938
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
new file mode 100644
index 000000000..3f82b67dd
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_normal_holo.9.png
new file mode 100644
index 000000000..eded1736b
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png
new file mode 100644
index 000000000..e6a1dcecc
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png
new file mode 100644
index 000000000..d2f5f3bf2
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png b/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png
new file mode 100644
index 000000000..01d1139d8
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/hint_popup_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_at_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_at_holo.9.png
new file mode 100644
index 000000000..5b946ff9b
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_at_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_at_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_at_large_holo.9.png
new file mode 100644
index 000000000..852f899ed
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_at_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_colon_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_colon_holo.9.png
new file mode 100644
index 000000000..1d9346e6f
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_colon_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_colon_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_colon_large_holo.9.png
new file mode 100644
index 000000000..17e9091b4
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_colon_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_comma_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_comma_holo.9.png
new file mode 100644
index 000000000..c2a913c04
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_comma_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_comma_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_comma_large_holo.9.png
new file mode 100644
index 000000000..846f213f1
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_comma_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_holo.9.png
new file mode 100644
index 000000000..ce8e8de43
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_large_holo.9.png
new file mode 100644
index 000000000..035dcf85d
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_exclamation_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_plus_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_plus_holo.9.png
new file mode 100644
index 000000000..931390b45
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_plus_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_plus_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_plus_large_holo.9.png
new file mode 100644
index 000000000..e6f9f8a9c
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_plus_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_question_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_question_holo.9.png
new file mode 100644
index 000000000..6cbeb5993
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_question_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_question_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_question_large_holo.9.png
new file mode 100644
index 000000000..bfd58de09
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_question_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_quote_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_quote_holo.9.png
new file mode 100644
index 000000000..3b361b71c
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_quote_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_quote_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_quote_large_holo.9.png
new file mode 100644
index 000000000..2a08aa12e
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_quote_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_underline_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_underline_holo.9.png
new file mode 100644
index 000000000..b137b0021
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_underline_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/key_hint_underline_large_holo.9.png b/java/res/drawable-sw768dp-mdpi/key_hint_underline_large_holo.9.png
new file mode 100644
index 000000000..9845e3bd6
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/key_hint_underline_large_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_background_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_background_holo.9.png
new file mode 100644
index 000000000..a93966c92
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/keyboard_background_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_background_holo.9.png
new file mode 100644
index 000000000..286cf84fc
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_more_background_holo.9.png
new file mode 100644
index 000000000..e3f5be86d
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/keyboard_key_feedback_more_background_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_popup_panel_background_holo.9.png
new file mode 100644
index 000000000..7be7ab7e2
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/keyboard_popup_panel_background_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-sw768dp-mdpi/keyboard_suggest_strip_holo.9.png
new file mode 100644
index 000000000..1f87a68e9
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/keyboard_suggest_strip_holo.9.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_delete_holo.png
new file mode 100644
index 000000000..155579169
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_delete_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num0_holo.png
new file mode 100644
index 000000000..e1d395b45
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num0_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num1_holo.png
new file mode 100644
index 000000000..225436ac2
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num1_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num2_holo.png
new file mode 100644
index 000000000..e513fa4a0
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num2_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num3_holo.png
new file mode 100644
index 000000000..b91e005fc
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num3_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num4_holo.png
new file mode 100644
index 000000000..65f88245b
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num4_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num5_holo.png
new file mode 100644
index 000000000..b89ef07eb
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num5_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num6_holo.png
new file mode 100644
index 000000000..931275a9e
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num6_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num7_holo.png
new file mode 100644
index 000000000..9396c4c8f
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num7_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num8_holo.png
new file mode 100644
index 000000000..12e3eef45
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num8_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num9_holo.png
new file mode 100644
index 000000000..6911c2b4f
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_num9_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbpound_holo.png
new file mode 100644
index 000000000..e3a8b4900
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbpound_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbstar_holo.png
new file mode 100644
index 000000000..e80e9345f
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_numbstar_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_return_holo.png
new file mode 100644
index 000000000..d519ccecf
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_return_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_settings_holo.png
new file mode 100644
index 000000000..784a45054
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_settings_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_holo.png
new file mode 100644
index 000000000..91d6e32f9
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_locked_holo.png
new file mode 100644
index 000000000..2bd053656
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_shift_locked_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_space_holo.png
new file mode 100644
index 000000000..25e655d96
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_space_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_holo.png
new file mode 100644
index 000000000..c1116dc17
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_holo.png differ
diff --git a/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_off_holo.png
new file mode 100644
index 000000000..44919dfcc
Binary files /dev/null and b/java/res/drawable-sw768dp-mdpi/sym_keyboard_voice_off_holo.png differ
diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml
index 2745fd703..5ad11470e 100644
--- a/java/res/xml-sw600dp/kbd_azerty_rows.xml
+++ b/java/res/xml-sw600dp/kbd_azerty_rows.xml
@@ -29,44 +29,44 @@
     >
         <Key
             latin:keyLabel="a"
-            latin:keyHintIcon="@drawable/key_hint_num1"
+            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_a"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="z"
-            latin:keyHintIcon="@drawable/key_hint_num2"
+            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_z" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3"
+            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4"
+            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5"
+            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_num6"
+            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7"
+            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8"
+            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9"
+            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0"
+            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p"
             latin:keyEdgeFlags="right" />
     </Row>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row1.xml b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
index e4fcd7a7b..3084ebaf2 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row1.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row1.xml
@@ -27,44 +27,44 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_num1"
+            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_num2"
+            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3"
+            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4"
+            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5"
+            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_num6"
+            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7"
+            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8"
+            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9"
+            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0"
+            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p"
             latin:keyEdgeFlags="right" />
     </Row>
diff --git a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
index dd996d4cf..7e4635b8c 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_rows_scandinavia.xml
@@ -29,45 +29,45 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_num1"
+            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
             latin:keyWidth="8.75%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_num2"
+            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3"
+            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4"
+            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5"
+            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="y"
-            latin:keyHintIcon="@drawable/key_hint_num6"
+            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_y" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7"
+            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8"
+            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9"
+            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0"
+            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p" />
         <Key
             latin:keyLabel="å"
diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
index 797a0e70f..534276ccb 100644
--- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml
+++ b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
@@ -29,44 +29,44 @@
     >
         <Key
             latin:keyLabel="q"
-            latin:keyHintIcon="@drawable/key_hint_num1"
+            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="@string/alternates_for_q"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="w"
-            latin:keyHintIcon="@drawable/key_hint_num2"
+            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="@string/alternates_for_w" />
         <Key
             latin:keyLabel="e"
-            latin:keyHintIcon="@drawable/key_hint_num3"
+            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="@string/alternates_for_e" />
         <Key
             latin:keyLabel="r"
-            latin:keyHintIcon="@drawable/key_hint_num4"
+            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="@string/alternates_for_r" />
         <Key
             latin:keyLabel="t"
-            latin:keyHintIcon="@drawable/key_hint_num5"
+            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_t" />
         <Key
             latin:keyLabel="z"
-            latin:keyHintIcon="@drawable/key_hint_num6"
+            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="@string/alternates_for_z" />
         <Key
             latin:keyLabel="u"
-            latin:keyHintIcon="@drawable/key_hint_num7"
+            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="@string/alternates_for_u" />
         <Key
             latin:keyLabel="i"
-            latin:keyHintIcon="@drawable/key_hint_num8"
+            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="@string/alternates_for_i" />
         <Key
             latin:keyLabel="o"
-            latin:keyHintIcon="@drawable/key_hint_num9"
+            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="@string/alternates_for_o" />
         <Key
             latin:keyLabel="p"
-            latin:keyHintIcon="@drawable/key_hint_num0"
+            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="@string/alternates_for_p"
             latin:keyEdgeFlags="right" />
     </Row>
diff --git a/java/res/xml-sw600dp/kbd_ru_rows.xml b/java/res/xml-sw600dp/kbd_ru_rows.xml
index b99259938..0c7a997a6 100644
--- a/java/res/xml-sw600dp/kbd_ru_rows.xml
+++ b/java/res/xml-sw600dp/kbd_ru_rows.xml
@@ -29,45 +29,45 @@
     >
         <Key
             latin:keyLabel="й"
-            latin:keyHintIcon="@drawable/key_hint_num1"
+            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="1"
             latin:keyWidth="8.75%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ц"
-            latin:keyHintIcon="@drawable/key_hint_num2"
+            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="2" />
         <Key
             latin:keyLabel="у"
-            latin:keyHintIcon="@drawable/key_hint_num3"
+            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="3" />
         <Key
             latin:keyLabel="к"
-            latin:keyHintIcon="@drawable/key_hint_num4"
+            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="4" />
         <Key
             latin:keyLabel="е"
-            latin:keyHintIcon="@drawable/key_hint_num5"
+            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="@string/alternates_for_cyrillic_e" />
         <Key
             latin:keyLabel="н"
-            latin:keyHintIcon="@drawable/key_hint_num6"
+            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="6" />
         <Key
             latin:keyLabel="г"
-            latin:keyHintIcon="@drawable/key_hint_num7"
+            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="7" />
         <Key
             latin:keyLabel="ш"
-            latin:keyHintIcon="@drawable/key_hint_num8"
+            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="8" />
         <Key
             latin:keyLabel="щ"
-            latin:keyHintIcon="@drawable/key_hint_num9"
+            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="9" />
         <Key
             latin:keyLabel="з"
-            latin:keyHintIcon="@drawable/key_hint_num0"
+            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="0" />
         <Key
             latin:keyLabel="х"
diff --git a/java/res/xml-sw600dp/kbd_sr_rows.xml b/java/res/xml-sw600dp/kbd_sr_rows.xml
index 0aa17d5e4..71d0e60f1 100644
--- a/java/res/xml-sw600dp/kbd_sr_rows.xml
+++ b/java/res/xml-sw600dp/kbd_sr_rows.xml
@@ -29,44 +29,44 @@
     >
         <Key
             latin:keyLabel="љ"
-            latin:keyHintIcon="@drawable/key_hint_num1"
+            latin:keyHintIcon="@drawable/key_hint_num1_holo"
             latin:popupCharacters="1"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="њ"
-            latin:keyHintIcon="@drawable/key_hint_num2"
+            latin:keyHintIcon="@drawable/key_hint_num2_holo"
             latin:popupCharacters="2" />
         <Key
             latin:keyLabel="е"
-            latin:keyHintIcon="@drawable/key_hint_num3"
+            latin:keyHintIcon="@drawable/key_hint_num3_holo"
             latin:popupCharacters="3" />
         <Key
             latin:keyLabel="р"
-            latin:keyHintIcon="@drawable/key_hint_num4"
+            latin:keyHintIcon="@drawable/key_hint_num4_holo"
             latin:popupCharacters="4" />
         <Key
             latin:keyLabel="т"
-            latin:keyHintIcon="@drawable/key_hint_num5"
+            latin:keyHintIcon="@drawable/key_hint_num5_holo"
             latin:popupCharacters="5" />
         <Key
             latin:keyLabel="з"
-            latin:keyHintIcon="@drawable/key_hint_num6"
+            latin:keyHintIcon="@drawable/key_hint_num6_holo"
             latin:popupCharacters="6" />
         <Key
             latin:keyLabel="у"
-            latin:keyHintIcon="@drawable/key_hint_num7"
+            latin:keyHintIcon="@drawable/key_hint_num7_holo"
             latin:popupCharacters="7" />
         <Key
             latin:keyLabel="и"
-            latin:keyHintIcon="@drawable/key_hint_num8"
+            latin:keyHintIcon="@drawable/key_hint_num8_holo"
             latin:popupCharacters="8" />
         <Key
             latin:keyLabel="о"
-            latin:keyHintIcon="@drawable/key_hint_num9"
+            latin:keyHintIcon="@drawable/key_hint_num9_holo"
             latin:popupCharacters="9" />
         <Key
             latin:keyLabel="п"
-            latin:keyHintIcon="@drawable/key_hint_num0"
+            latin:keyHintIcon="@drawable/key_hint_num0_holo"
             latin:popupCharacters="0" />
         <Key
             latin:keyLabel="ш"