diff --git a/java/res/drawable-hdpi/btn_candidate_normal.9.png b/java/res/drawable-hdpi/btn_candidate_normal.9.png
deleted file mode 100644
index 7cab5a899..000000000
Binary files a/java/res/drawable-hdpi/btn_candidate_normal.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png
index 50cc49fdb..01fc8ca78 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png
index dabf77ec6..af4017e2c 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png
index 6e7d74c88..4c35aca95 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png
index ddb77c224..174f3452c 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png
index 1e9227e1c..1fcbd9a88 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png
index 7207b2ece..072753f37 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
index a524168c9..b6c234c04 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
index 4395e978a..73a8cd1c3 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png
index 9d85c7b74..1ad746053 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
index 2ed1b3447..e3a77d61b 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
index 77e17dbae..431c44967 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png
index a409639e7..ccd59d5fa 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
index 6ec7e6592..42c7c146d 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
index 995780cbf..01e2506b0 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png
index 1388b6694..fad0ec458 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_off_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
index 7215782eb..83c6eb3fc 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png
index 5a94cb6ac..215f8157c 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_on_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
index c6373a8af..88acdd748 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
index 0bd49a0e7..e047eaff1 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
index 634419f1b..218a2d29e 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
index 8474f9f42..afe49512e 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png differ
diff --git a/java/res/drawable-hdpi/cancel.png b/java/res/drawable-hdpi/cancel.png
deleted file mode 100644
index fdf01dba6..000000000
Binary files a/java/res/drawable-hdpi/cancel.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/cancel_holo.9.png b/java/res/drawable-hdpi/cancel_holo.9.png
deleted file mode 100644
index 33548d606..000000000
Binary files a/java/res/drawable-hdpi/cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/candidate_feedback_background.9.png b/java/res/drawable-hdpi/candidate_feedback_background.9.png
index 16499002e..203c4e640 100644
Binary files a/java/res/drawable-hdpi/candidate_feedback_background.9.png and b/java/res/drawable-hdpi/candidate_feedback_background.9.png differ
diff --git a/java/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png
index caed9419d..5cb6c54b9 100644
Binary files a/java/res/drawable-hdpi/caution.png and b/java/res/drawable-hdpi/caution.png differ
diff --git a/java/res/drawable-hdpi/dialog_bubble_step02.9.png b/java/res/drawable-hdpi/dialog_bubble_step02.9.png
deleted file mode 100644
index 2a3ac18c0..000000000
Binary files a/java/res/drawable-hdpi/dialog_bubble_step02.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/dialog_bubble_step07.9.png b/java/res/drawable-hdpi/dialog_bubble_step07.9.png
deleted file mode 100644
index 0a5046b07..000000000
Binary files a/java/res/drawable-hdpi/dialog_bubble_step07.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/highlight_pressed.png b/java/res/drawable-hdpi/highlight_pressed.png
deleted file mode 100644
index 638df19bc..000000000
Binary files a/java/res/drawable-hdpi/highlight_pressed.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/hint_popup.9.png b/java/res/drawable-hdpi/hint_popup.9.png
index 5b2ad5388..b5ec003e6 100644
Binary files a/java/res/drawable-hdpi/hint_popup.9.png and b/java/res/drawable-hdpi/hint_popup.9.png differ
diff --git a/java/res/drawable-hdpi/ic_dialog_keyboard.png b/java/res/drawable-hdpi/ic_dialog_keyboard.png
index fb6d89879..c7729566c 100644
Binary files a/java/res/drawable-hdpi/ic_dialog_keyboard.png and b/java/res/drawable-hdpi/ic_dialog_keyboard.png differ
diff --git a/java/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png
index 6498cd589..349dc4b37 100644
Binary files a/java/res/drawable-hdpi/ic_mic_dialog.png and b/java/res/drawable-hdpi/ic_mic_dialog.png differ
diff --git a/java/res/drawable-hdpi/ic_subtype_keyboard.png b/java/res/drawable-hdpi/ic_subtype_keyboard.png
index b5a9fa866..7015e266a 100644
Binary files a/java/res/drawable-hdpi/ic_subtype_keyboard.png and b/java/res/drawable-hdpi/ic_subtype_keyboard.png differ
diff --git a/java/res/drawable-hdpi/ic_subtype_mic.png b/java/res/drawable-hdpi/ic_subtype_mic.png
index 5d68e85a6..cb86a5598 100644
Binary files a/java/res/drawable-hdpi/ic_subtype_mic.png and b/java/res/drawable-hdpi/ic_subtype_mic.png differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
index 0462bdd16..c00b4aaa6 100644
Binary files a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png and b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
index 80c20f691..256dc3d61 100644
Binary files a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png and b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png differ
diff --git a/java/res/drawable-hdpi/key_hint_dash_holo.9.png b/java/res/drawable-hdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index a2b2fceeb..000000000
Binary files a/java/res/drawable-hdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index d5af9f8c7..000000000
Binary files a/java/res/drawable-hdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_equal_holo.9.png b/java/res/drawable-hdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index 4acc3c3be..000000000
Binary files a/java/res/drawable-hdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_larger_holo.9.png b/java/res/drawable-hdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index 10614d9fe..000000000
Binary files a/java/res/drawable-hdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_minus_holo.9.png b/java/res/drawable-hdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index 2c34ef90b..000000000
Binary files a/java/res/drawable-hdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-hdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 0df056ee1..000000000
Binary files a/java/res/drawable-hdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 9096362e0..000000000
Binary files a/java/res/drawable-hdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index bb4cbd40d..000000000
Binary files a/java/res/drawable-hdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_period_holo.9.png b/java/res/drawable-hdpi/key_hint_period_holo.9.png
deleted file mode 100644
index 68f789b95..000000000
Binary files a/java/res/drawable-hdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index ac3de374c..000000000
Binary files a/java/res/drawable-hdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index 20d56c549..000000000
Binary files a/java/res/drawable-hdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_slash_holo.9.png b/java/res/drawable-hdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 3fe2c4271..000000000
Binary files a/java/res/drawable-hdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index 47e767557..000000000
Binary files a/java/res/drawable-hdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_smaller_holo.9.png b/java/res/drawable-hdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 19a7d937e..000000000
Binary files a/java/res/drawable-hdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_star_holo.9.png b/java/res/drawable-hdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 4e4340d63..000000000
Binary files a/java/res/drawable-hdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_underscore_holo.9.png b/java/res/drawable-hdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index e4f271918..000000000
Binary files a/java/res/drawable-hdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-hdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index dad34fc72..000000000
Binary files a/java/res/drawable-hdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png
index d57463fb6..edffac5b8 100644
Binary files a/java/res/drawable-hdpi/keyboard_background.9.png and b/java/res/drawable-hdpi/keyboard_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_dark_background.9.png b/java/res/drawable-hdpi/keyboard_dark_background.9.png
index fa3d449f7..f315cbdd4 100644
Binary files a/java/res/drawable-hdpi/keyboard_dark_background.9.png and b/java/res/drawable-hdpi/keyboard_dark_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_0.9.png b/java/res/drawable-hdpi/keyboard_hint_0.9.png
index da52e0f5b..271264e92 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_0.9.png and b/java/res/drawable-hdpi/keyboard_hint_0.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_1.9.png b/java/res/drawable-hdpi/keyboard_hint_1.9.png
index 7325c4cbb..eaf374262 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_1.9.png and b/java/res/drawable-hdpi/keyboard_hint_1.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_2.9.png b/java/res/drawable-hdpi/keyboard_hint_2.9.png
index 35b7f2527..8a1657117 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_2.9.png and b/java/res/drawable-hdpi/keyboard_hint_2.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_3.9.png b/java/res/drawable-hdpi/keyboard_hint_3.9.png
index 1ae284838..34b501109 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_3.9.png and b/java/res/drawable-hdpi/keyboard_hint_3.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_4.9.png b/java/res/drawable-hdpi/keyboard_hint_4.9.png
index b67d6dd51..d4cc250dd 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_4.9.png and b/java/res/drawable-hdpi/keyboard_hint_4.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_5.9.png b/java/res/drawable-hdpi/keyboard_hint_5.9.png
index ec52198d8..6a054b42f 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_5.9.png and b/java/res/drawable-hdpi/keyboard_hint_5.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_6.9.png b/java/res/drawable-hdpi/keyboard_hint_6.9.png
index 66dcf67e5..66e91400a 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_6.9.png and b/java/res/drawable-hdpi/keyboard_hint_6.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_7.9.png b/java/res/drawable-hdpi/keyboard_hint_7.9.png
index 9d5499272..5eae24f4f 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_7.9.png and b/java/res/drawable-hdpi/keyboard_hint_7.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_8.9.png b/java/res/drawable-hdpi/keyboard_hint_8.9.png
index beba1624c..ea7f512fd 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_8.9.png and b/java/res/drawable-hdpi/keyboard_hint_8.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_9.9.png b/java/res/drawable-hdpi/keyboard_hint_9.9.png
index 31ea54f32..0bf85de93 100644
Binary files a/java/res/drawable-hdpi/keyboard_hint_9.9.png and b/java/res/drawable-hdpi/keyboard_hint_9.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_at.9.png b/java/res/drawable-hdpi/keyboard_hint_at.9.png
deleted file mode 100644
index 4b49c0dd9..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_at.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_colon.9.png b/java/res/drawable-hdpi/keyboard_hint_colon.9.png
deleted file mode 100644
index a91dc47f1..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_colon.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_doublecross.9.png b/java/res/drawable-hdpi/keyboard_hint_doublecross.9.png
deleted file mode 100644
index c0917c200..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_doublecross.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_exclamation.9.png b/java/res/drawable-hdpi/keyboard_hint_exclamation.9.png
deleted file mode 100644
index 98c07d94a..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_exclamation.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_greater.9.png b/java/res/drawable-hdpi/keyboard_hint_greater.9.png
deleted file mode 100644
index f2bf37dc2..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_greater.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_plus.9.png b/java/res/drawable-hdpi/keyboard_hint_plus.9.png
deleted file mode 100644
index 586e9c158..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_plus.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_question.9.png b/java/res/drawable-hdpi/keyboard_hint_question.9.png
deleted file mode 100644
index 6c7d4310a..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_question.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_quote.9.png b/java/res/drawable-hdpi/keyboard_hint_quote.9.png
deleted file mode 100644
index 57f44e4a2..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_quote.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_smaller.9.png b/java/res/drawable-hdpi/keyboard_hint_smaller.9.png
deleted file mode 100644
index 438b95ea8..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_smaller.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_hint_star.9.png b/java/res/drawable-hdpi/keyboard_hint_star.9.png
deleted file mode 100644
index 33f8281b2..000000000
Binary files a/java/res/drawable-hdpi/keyboard_hint_star.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png
index 27d992375..762a25704 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png
index 943f9e4bc..8d6acacfb 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
index 33263b9d7..141d2d6be 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png
index baff80950..d6b2c7936 100644
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png and b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
index 7cab5a899..0ccdb6ab2 100644
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png and b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
index 7fca8c608..7ca3e6131 100644
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png and b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png differ
diff --git a/java/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png
index 71f4dc506..dc8da6252 100644
Binary files a/java/res/drawable-hdpi/mic_slash.png and b/java/res/drawable-hdpi/mic_slash.png differ
diff --git a/java/res/drawable-hdpi/mic_slash_holo.png b/java/res/drawable-hdpi/mic_slash_holo.png
deleted file mode 100644
index 27a05dec3..000000000
Binary files a/java/res/drawable-hdpi/mic_slash_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ok_cancel.png b/java/res/drawable-hdpi/ok_cancel.png
deleted file mode 100644
index 48c00f094..000000000
Binary files a/java/res/drawable-hdpi/ok_cancel.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ok_cancel_holo.9.png b/java/res/drawable-hdpi/ok_cancel_holo.9.png
deleted file mode 100644
index 5be81c35a..000000000
Binary files a/java/res/drawable-hdpi/ok_cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level0.png b/java/res/drawable-hdpi/speak_now_level0.png
deleted file mode 100644
index 31571f75b..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level0.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level0_holo.png b/java/res/drawable-hdpi/speak_now_level0_holo.png
deleted file mode 100644
index 29eef926b..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level0_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level1.png b/java/res/drawable-hdpi/speak_now_level1.png
deleted file mode 100644
index c8d0aae5d..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level1.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level1_holo.png b/java/res/drawable-hdpi/speak_now_level1_holo.png
deleted file mode 100644
index a76e990b7..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level1_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level2.png b/java/res/drawable-hdpi/speak_now_level2.png
deleted file mode 100644
index 123eea66e..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level2.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level2_holo.png b/java/res/drawable-hdpi/speak_now_level2_holo.png
deleted file mode 100644
index 8cd462d20..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level2_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level3.png b/java/res/drawable-hdpi/speak_now_level3.png
deleted file mode 100644
index a8a2c5cff..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level3.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level3_holo.png b/java/res/drawable-hdpi/speak_now_level3_holo.png
deleted file mode 100644
index b7371dc88..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level3_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level4.png b/java/res/drawable-hdpi/speak_now_level4.png
deleted file mode 100644
index b84d7b0e9..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level4.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level4_holo.png b/java/res/drawable-hdpi/speak_now_level4_holo.png
deleted file mode 100644
index 74befc8c3..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level4_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level5.png b/java/res/drawable-hdpi/speak_now_level5.png
deleted file mode 100644
index 8dd2b607f..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level5.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level5_holo.png b/java/res/drawable-hdpi/speak_now_level5_holo.png
deleted file mode 100644
index b027e8343..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level5_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level6.png b/java/res/drawable-hdpi/speak_now_level6.png
deleted file mode 100644
index 888d0e5c7..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level6.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/speak_now_level6_holo.png b/java/res/drawable-hdpi/speak_now_level6_holo.png
deleted file mode 100644
index 17bb03452..000000000
Binary files a/java/res/drawable-hdpi/speak_now_level6_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png
index 24edfaa1c..3e4eff698 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png and b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_delete.png b/java/res/drawable-hdpi/sym_bkeyboard_delete.png
index 4ccd218ac..1d24cc85c 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_delete.png and b/java/res/drawable-hdpi/sym_bkeyboard_delete.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_done.png b/java/res/drawable-hdpi/sym_bkeyboard_done.png
deleted file mode 100644
index 6959aeeef..000000000
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_mic.png
index 6876fb64a..512f46080 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_mic.png and b/java/res/drawable-hdpi/sym_bkeyboard_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num0.png b/java/res/drawable-hdpi/sym_bkeyboard_num0.png
index 08df3f3dd..678a790de 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num0.png and b/java/res/drawable-hdpi/sym_bkeyboard_num0.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num1.png b/java/res/drawable-hdpi/sym_bkeyboard_num1.png
index 36d8e5696..4e68e35b3 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num1.png and b/java/res/drawable-hdpi/sym_bkeyboard_num1.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num2.png b/java/res/drawable-hdpi/sym_bkeyboard_num2.png
index c67fe2ea4..546663fda 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num2.png and b/java/res/drawable-hdpi/sym_bkeyboard_num2.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num3.png b/java/res/drawable-hdpi/sym_bkeyboard_num3.png
index cf80b2745..57f9a8d8e 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num3.png and b/java/res/drawable-hdpi/sym_bkeyboard_num3.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num4.png b/java/res/drawable-hdpi/sym_bkeyboard_num4.png
index bfbb55a8f..de504388f 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num4.png and b/java/res/drawable-hdpi/sym_bkeyboard_num4.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num5.png b/java/res/drawable-hdpi/sym_bkeyboard_num5.png
index 9f121ec12..1d2e1ef89 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num5.png and b/java/res/drawable-hdpi/sym_bkeyboard_num5.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num6.png b/java/res/drawable-hdpi/sym_bkeyboard_num6.png
index 256186f3a..39788b727 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num6.png and b/java/res/drawable-hdpi/sym_bkeyboard_num6.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num7.png b/java/res/drawable-hdpi/sym_bkeyboard_num7.png
index 7c8ce205e..fff6f27bf 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num7.png and b/java/res/drawable-hdpi/sym_bkeyboard_num7.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num8.png b/java/res/drawable-hdpi/sym_bkeyboard_num8.png
index 4cfe7b11c..8cc1a955e 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num8.png and b/java/res/drawable-hdpi/sym_bkeyboard_num8.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num9.png b/java/res/drawable-hdpi/sym_bkeyboard_num9.png
index d19c15cc8..021742509 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_num9.png and b/java/res/drawable-hdpi/sym_bkeyboard_num9.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numalt.png b/java/res/drawable-hdpi/sym_bkeyboard_numalt.png
index 762fd8cd7..200714f66 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_numalt.png and b/java/res/drawable-hdpi/sym_bkeyboard_numalt.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numpound.png b/java/res/drawable-hdpi/sym_bkeyboard_numpound.png
index 2bd800d68..0a46122b2 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_numpound.png and b/java/res/drawable-hdpi/sym_bkeyboard_numpound.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numstar.png b/java/res/drawable-hdpi/sym_bkeyboard_numstar.png
index b574f83f3..ca22bd535 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_numstar.png and b/java/res/drawable-hdpi/sym_bkeyboard_numstar.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_return.png b/java/res/drawable-hdpi/sym_bkeyboard_return.png
index 2f9631a20..426e1599e 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_return.png and b/java/res/drawable-hdpi/sym_bkeyboard_return.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_search.png b/java/res/drawable-hdpi/sym_bkeyboard_search.png
index 7a5a0aab8..1b6f884fa 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_search.png and b/java/res/drawable-hdpi/sym_bkeyboard_search.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_settings.png b/java/res/drawable-hdpi/sym_bkeyboard_settings.png
index 8a8caa895..08ba18f28 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_settings.png and b/java/res/drawable-hdpi/sym_bkeyboard_settings.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift.png b/java/res/drawable-hdpi/sym_bkeyboard_shift.png
index 1e3d5ec14..5a22dd309 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_shift.png and b/java/res/drawable-hdpi/sym_bkeyboard_shift.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png
index e8a4d6423..566449126 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png and b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_space.png b/java/res/drawable-hdpi/sym_bkeyboard_space.png
index 9937a6288..cd0ebe2f4 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_space.png and b/java/res/drawable-hdpi/sym_bkeyboard_space.png differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_tab.png b/java/res/drawable-hdpi/sym_bkeyboard_tab.png
index 8dee747d2..3466e1271 100644
Binary files a/java/res/drawable-hdpi/sym_bkeyboard_tab.png and b/java/res/drawable-hdpi/sym_bkeyboard_tab.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
index 6f8292912..62669803d 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_123_mic.png and b/java/res/drawable-hdpi/sym_keyboard_123_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png
index 8db099a7a..459ebcff8 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete.png and b/java/res/drawable-hdpi/sym_keyboard_delete.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_done.png b/java/res/drawable-hdpi/sym_keyboard_done.png
deleted file mode 100644
index 6ba51d58c..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
index 4867298fa..eef789680 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
index 7c12f79a1..8322e8e1d 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_done.png b/java/res/drawable-hdpi/sym_keyboard_feedback_done.png
deleted file mode 100644
index e79bbb382..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_done.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
index 4f4923b85..889477cfb 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
index ed2ebe66c..b0f6d7feb 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
index f228910c3..f82c33ae3 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
index bb69300d1..819236c8e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
index 99fa13cae..f038d3abe 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
index c006866d2..337f9e4fe 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
index 5c685f9c3..8a02be07e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
index 5b91afb82..abf15f8f9 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
deleted file mode 100644
index 77e6a5fe9..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
index 2d1b4a4b4..70debca9b 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
index 82280c608..d2efb1619 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png and b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
index 34b8e931a..dcc4bd59b 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png and b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
index b6ea3362b..ecf61a98e 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png and b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png
index 7207f8a92..c8dca62a0 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_mic.png and b/java/res/drawable-hdpi/sym_keyboard_mic.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic_disabled.png b/java/res/drawable-hdpi/sym_keyboard_mic_disabled.png
deleted file mode 100644
index c8dca62a0..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_mic_disabled.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png
index 169efe21e..10ac70b9d 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num0.png and b/java/res/drawable-hdpi/sym_keyboard_num0.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png
index 5b868489f..0fc03efa5 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num1.png and b/java/res/drawable-hdpi/sym_keyboard_num1.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png
index ddbe2199c..283560b35 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num2.png and b/java/res/drawable-hdpi/sym_keyboard_num2.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png
index 1de90f3b1..9a3b3294b 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num3.png and b/java/res/drawable-hdpi/sym_keyboard_num3.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png
index c67ba5206..f13ff1ae9 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num4.png and b/java/res/drawable-hdpi/sym_keyboard_num4.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png
index 8410f2537..c251329fa 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num5.png and b/java/res/drawable-hdpi/sym_keyboard_num5.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png
index 22fa29d3f..4acba4c91 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num6.png and b/java/res/drawable-hdpi/sym_keyboard_num6.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png
index a3798ea34..14931c18c 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num7.png and b/java/res/drawable-hdpi/sym_keyboard_num7.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png
index 7e963ad6b..d4973fdc9 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num8.png and b/java/res/drawable-hdpi/sym_keyboard_num8.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png
index 1160d8545..49cec66f4 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_num9.png and b/java/res/drawable-hdpi/sym_keyboard_num9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numalt.png b/java/res/drawable-hdpi/sym_keyboard_numalt.png
index f3a73deb0..3cc5311cd 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_numalt.png and b/java/res/drawable-hdpi/sym_keyboard_numalt.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numpound.png b/java/res/drawable-hdpi/sym_keyboard_numpound.png
index 471f4fda3..d09133929 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_numpound.png and b/java/res/drawable-hdpi/sym_keyboard_numpound.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numstar.png b/java/res/drawable-hdpi/sym_keyboard_numstar.png
index 017c0f461..e838e169f 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_numstar.png and b/java/res/drawable-hdpi/sym_keyboard_numstar.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png
index 984db426e..9d97e1efd 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_return.png and b/java/res/drawable-hdpi/sym_keyboard_return.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png
index 179e725f6..1aa22d7e2 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_search.png and b/java/res/drawable-hdpi/sym_keyboard_search.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png
index 164117812..35d1ed6e6 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings.png and b/java/res/drawable-hdpi/sym_keyboard_settings.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png
index 2b3bd668d..bf217d147 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift.png and b/java/res/drawable-hdpi/sym_keyboard_shift.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
index 8a34a98a3..d11b39712 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png and b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-hdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index a3f5e840d..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space.png b/java/res/drawable-hdpi/sym_keyboard_space.png
index dacc97d0a..fcd20de7d 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_space.png and b/java/res/drawable-hdpi/sym_keyboard_space.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png
index c76f64b94..2c6f4a925 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png and b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab.png b/java/res/drawable-hdpi/sym_keyboard_tab.png
index efd740b5b..51d17d989 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_tab.png and b/java/res/drawable-hdpi/sym_keyboard_tab.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png
index 8a445eb56..6e6279a8a 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png and b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png differ
diff --git a/java/res/drawable-hdpi/top_suggest_line_holo.9.png b/java/res/drawable-hdpi/top_suggest_line_holo.9.png
deleted file mode 100644
index dcce3015f..000000000
Binary files a/java/res/drawable-hdpi/top_suggest_line_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/voice_ime_background.9.png b/java/res/drawable-hdpi/voice_ime_background.9.png
deleted file mode 100644
index a604f497c..000000000
Binary files a/java/res/drawable-hdpi/voice_ime_background.9.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/voice_swipe_hint.png b/java/res/drawable-hdpi/voice_swipe_hint.png
deleted file mode 100644
index 976fd56d6..000000000
Binary files a/java/res/drawable-hdpi/voice_swipe_hint.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/working.png b/java/res/drawable-hdpi/working.png
deleted file mode 100644
index c43439e93..000000000
Binary files a/java/res/drawable-hdpi/working.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_dash_holo.9.png b/java/res/drawable-land-hdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index c045b8c54..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-land-hdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index 6975ab71f..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_equal_holo.9.png b/java/res/drawable-land-hdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index a619fb29f..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_larger_holo.9.png b/java/res/drawable-land-hdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index f8d960f17..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_minus_holo.9.png b/java/res/drawable-land-hdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index 2c34ef90b..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 0df056ee1..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-land-hdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 9d8b05761..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-land-hdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index 8e2d8f2ad..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_period_holo.9.png b/java/res/drawable-land-hdpi/key_hint_period_holo.9.png
deleted file mode 100644
index bf8c6d722..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-land-hdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index f35275857..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-land-hdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index e69a9696e..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_slash_holo.9.png b/java/res/drawable-land-hdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 592ea4434..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index b18be7bb5..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_smaller_holo.9.png b/java/res/drawable-land-hdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 145320dab..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_star_holo.9.png b/java/res/drawable-land-hdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 9bde78a21..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_underscore_holo.9.png b/java/res/drawable-land-hdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index e4f271918..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-hdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-land-hdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index dad34fc72..000000000
Binary files a/java/res/drawable-land-hdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png b/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index 1cb0bdfaa..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index 7e7ceb3fc..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png b/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index 8e570595c..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png b/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index 37c05275e..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_minus_holo.9.png b/java/res/drawable-land-mdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index e59a31587..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 52c28dd87..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 97e1f1449..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index 36add5d51..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_period_holo.9.png b/java/res/drawable-land-mdpi/key_hint_period_holo.9.png
deleted file mode 100644
index 4a70f07dc..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index 63a3875b5..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index 3c217b058..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png b/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 98545f0ac..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index a3a02973c..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png b/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 5af183644..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_star_holo.9.png b/java/res/drawable-land-mdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 18304d738..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_underscore_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index 52e871e0a..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-land-mdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-land-mdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index ee0e83578..000000000
Binary files a/java/res/drawable-land-mdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/btn_candidate_normal.9.png b/java/res/drawable-mdpi/btn_candidate_normal.9.png
deleted file mode 100644
index fa6c0feff..000000000
Binary files a/java/res/drawable-mdpi/btn_candidate_normal.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/cancel.png b/java/res/drawable-mdpi/cancel.png
deleted file mode 100644
index 713a37875..000000000
Binary files a/java/res/drawable-mdpi/cancel.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/cancel_holo.9.png b/java/res/drawable-mdpi/cancel_holo.9.png
deleted file mode 100644
index 74f967eb9..000000000
Binary files a/java/res/drawable-mdpi/cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/dialog_bubble_step02.9.png b/java/res/drawable-mdpi/dialog_bubble_step02.9.png
deleted file mode 100644
index d77f85fe2..000000000
Binary files a/java/res/drawable-mdpi/dialog_bubble_step02.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/dialog_bubble_step07.9.png b/java/res/drawable-mdpi/dialog_bubble_step07.9.png
deleted file mode 100644
index 80f4a0eaa..000000000
Binary files a/java/res/drawable-mdpi/dialog_bubble_step07.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/highlight_pressed.png b/java/res/drawable-mdpi/highlight_pressed.png
deleted file mode 100644
index d27f1061a..000000000
Binary files a/java/res/drawable-mdpi/highlight_pressed.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_dash_holo.9.png b/java/res/drawable-mdpi/key_hint_dash_holo.9.png
deleted file mode 100644
index 2ee22ba79..000000000
Binary files a/java/res/drawable-mdpi/key_hint_dash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png b/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png
deleted file mode 100644
index 0da933239..000000000
Binary files a/java/res/drawable-mdpi/key_hint_doublecross_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_equal_holo.9.png b/java/res/drawable-mdpi/key_hint_equal_holo.9.png
deleted file mode 100644
index f5a9ba2f4..000000000
Binary files a/java/res/drawable-mdpi/key_hint_equal_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_larger_holo.9.png b/java/res/drawable-mdpi/key_hint_larger_holo.9.png
deleted file mode 100644
index 50652bb13..000000000
Binary files a/java/res/drawable-mdpi/key_hint_larger_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_minus_holo.9.png b/java/res/drawable-mdpi/key_hint_minus_holo.9.png
deleted file mode 100644
index e59a31587..000000000
Binary files a/java/res/drawable-mdpi/key_hint_minus_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_minus_large_holo.9.png b/java/res/drawable-mdpi/key_hint_minus_large_holo.9.png
deleted file mode 100644
index 52c28dd87..000000000
Binary files a/java/res/drawable-mdpi/key_hint_minus_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png b/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png
deleted file mode 100644
index 52ee86a0f..000000000
Binary files a/java/res/drawable-mdpi/key_hint_parenclose_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png b/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png
deleted file mode 100644
index b0ed388ad..000000000
Binary files a/java/res/drawable-mdpi/key_hint_parenopen_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_period_holo.9.png b/java/res/drawable-mdpi/key_hint_period_holo.9.png
deleted file mode 100644
index 8d798a57f..000000000
Binary files a/java/res/drawable-mdpi/key_hint_period_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png b/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png
deleted file mode 100644
index 7f9e8c90e..000000000
Binary files a/java/res/drawable-mdpi/key_hint_semicolon_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png b/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png
deleted file mode 100644
index 5e1a45c0e..000000000
Binary files a/java/res/drawable-mdpi/key_hint_simplequote_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_slash_holo.9.png b/java/res/drawable-mdpi/key_hint_slash_holo.9.png
deleted file mode 100644
index 645586a30..000000000
Binary files a/java/res/drawable-mdpi/key_hint_slash_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png b/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png
deleted file mode 100644
index 75c3bb1a6..000000000
Binary files a/java/res/drawable-mdpi/key_hint_slash_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_smaller_holo.9.png b/java/res/drawable-mdpi/key_hint_smaller_holo.9.png
deleted file mode 100644
index 2a0587cbd..000000000
Binary files a/java/res/drawable-mdpi/key_hint_smaller_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_star_holo.9.png b/java/res/drawable-mdpi/key_hint_star_holo.9.png
deleted file mode 100644
index 9f33b9830..000000000
Binary files a/java/res/drawable-mdpi/key_hint_star_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_underscore_holo.9.png b/java/res/drawable-mdpi/key_hint_underscore_holo.9.png
deleted file mode 100644
index 52e871e0a..000000000
Binary files a/java/res/drawable-mdpi/key_hint_underscore_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/key_hint_underscore_large_holo.9.png b/java/res/drawable-mdpi/key_hint_underscore_large_holo.9.png
deleted file mode 100644
index ee0e83578..000000000
Binary files a/java/res/drawable-mdpi/key_hint_underscore_large_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_at.9.png b/java/res/drawable-mdpi/keyboard_hint_at.9.png
deleted file mode 100644
index 69baedef4..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_at.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_colon.9.png b/java/res/drawable-mdpi/keyboard_hint_colon.9.png
deleted file mode 100644
index 9d0d7cbab..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_colon.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_doublecross.9.png b/java/res/drawable-mdpi/keyboard_hint_doublecross.9.png
deleted file mode 100644
index d24aa0f07..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_doublecross.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_exclamation.9.png b/java/res/drawable-mdpi/keyboard_hint_exclamation.9.png
deleted file mode 100644
index f6cc7fe84..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_exclamation.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_greater.9.png b/java/res/drawable-mdpi/keyboard_hint_greater.9.png
deleted file mode 100644
index 5210392bf..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_greater.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_plus.9.png b/java/res/drawable-mdpi/keyboard_hint_plus.9.png
deleted file mode 100644
index d1d85ac87..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_plus.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_question.9.png b/java/res/drawable-mdpi/keyboard_hint_question.9.png
deleted file mode 100644
index 37f6e5f36..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_question.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_quote.9.png b/java/res/drawable-mdpi/keyboard_hint_quote.9.png
deleted file mode 100644
index e7d2cb5e3..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_quote.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_smaller.9.png b/java/res/drawable-mdpi/keyboard_hint_smaller.9.png
deleted file mode 100644
index 76553cf96..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_smaller.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_hint_star.9.png b/java/res/drawable-mdpi/keyboard_hint_star.9.png
deleted file mode 100644
index 47978c46c..000000000
Binary files a/java/res/drawable-mdpi/keyboard_hint_star.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png
index a7acb4a4d..286cf84fc 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/mic_slash_holo.png b/java/res/drawable-mdpi/mic_slash_holo.png
deleted file mode 100644
index 07181e6fa..000000000
Binary files a/java/res/drawable-mdpi/mic_slash_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ok_cancel.png b/java/res/drawable-mdpi/ok_cancel.png
deleted file mode 100644
index 20d10f986..000000000
Binary files a/java/res/drawable-mdpi/ok_cancel.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ok_cancel_holo.9.png b/java/res/drawable-mdpi/ok_cancel_holo.9.png
deleted file mode 100644
index 035a4f6f0..000000000
Binary files a/java/res/drawable-mdpi/ok_cancel_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level0.png b/java/res/drawable-mdpi/speak_now_level0.png
deleted file mode 100644
index 5bd13603e..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level0.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level0_holo.png b/java/res/drawable-mdpi/speak_now_level0_holo.png
deleted file mode 100644
index 2090b95a5..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level0_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level1.png b/java/res/drawable-mdpi/speak_now_level1.png
deleted file mode 100644
index ccb76b879..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level1.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level1_holo.png b/java/res/drawable-mdpi/speak_now_level1_holo.png
deleted file mode 100644
index 8acf482aa..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level1_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level2.png b/java/res/drawable-mdpi/speak_now_level2.png
deleted file mode 100644
index 715f90081..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level2.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level2_holo.png b/java/res/drawable-mdpi/speak_now_level2_holo.png
deleted file mode 100644
index 4b307d542..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level2_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level3.png b/java/res/drawable-mdpi/speak_now_level3.png
deleted file mode 100644
index 725248a25..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level3.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level3_holo.png b/java/res/drawable-mdpi/speak_now_level3_holo.png
deleted file mode 100644
index 7c7cd666f..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level3_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level4.png b/java/res/drawable-mdpi/speak_now_level4.png
deleted file mode 100644
index ff6c50b40..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level4.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level4_holo.png b/java/res/drawable-mdpi/speak_now_level4_holo.png
deleted file mode 100644
index 362c45337..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level4_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level5.png b/java/res/drawable-mdpi/speak_now_level5.png
deleted file mode 100644
index a5d6b89d6..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level5.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level5_holo.png b/java/res/drawable-mdpi/speak_now_level5_holo.png
deleted file mode 100644
index 1886befff..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level5_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level6.png b/java/res/drawable-mdpi/speak_now_level6.png
deleted file mode 100644
index dcdb48d08..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level6.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/speak_now_level6_holo.png b/java/res/drawable-mdpi/speak_now_level6_holo.png
deleted file mode 100644
index 88e4131c8..000000000
Binary files a/java/res/drawable-mdpi/speak_now_level6_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_done.png b/java/res/drawable-mdpi/sym_bkeyboard_done.png
deleted file mode 100644
index 05ce7c643..000000000
Binary files a/java/res/drawable-mdpi/sym_bkeyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_done.png b/java/res/drawable-mdpi/sym_keyboard_done.png
deleted file mode 100644
index c0d6d1394..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_done.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_done.png b/java/res/drawable-mdpi/sym_keyboard_feedback_done.png
deleted file mode 100644
index 0d7ebd4e5..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_feedback_done.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
deleted file mode 100644
index 494524a66..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic_disabled.png b/java/res/drawable-mdpi/sym_keyboard_mic_disabled.png
deleted file mode 100644
index e926b3fa6..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_mic_disabled.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index 594fe211c..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png
index 081a13096..44919dfcc 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png and b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png differ
diff --git a/java/res/drawable-mdpi/top_suggest_line_holo.9.png b/java/res/drawable-mdpi/top_suggest_line_holo.9.png
deleted file mode 100644
index 8fdffd317..000000000
Binary files a/java/res/drawable-mdpi/top_suggest_line_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/voice_ime_background.9.png b/java/res/drawable-mdpi/voice_ime_background.9.png
deleted file mode 100644
index 9b15bc25f..000000000
Binary files a/java/res/drawable-mdpi/voice_ime_background.9.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/voice_swipe_hint.png b/java/res/drawable-mdpi/voice_swipe_hint.png
deleted file mode 100644
index bb8873251..000000000
Binary files a/java/res/drawable-mdpi/voice_swipe_hint.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/working.png b/java/res/drawable-mdpi/working.png
deleted file mode 100644
index 4a930c52d..000000000
Binary files a/java/res/drawable-mdpi/working.png and /dev/null differ
diff --git a/java/res/drawable/btn_candidate.xml b/java/res/drawable/btn_candidate.xml
index b0c1c3038..efcee9f54 100644
--- a/java/res/drawable/btn_candidate.xml
+++ b/java/res/drawable/btn_candidate.xml
@@ -24,6 +24,4 @@
-
diff --git a/java/res/drawable/btn_keyboard_key2.xml b/java/res/drawable/btn_keyboard_key2.xml
deleted file mode 100644
index bd745b76e..000000000
--- a/java/res/drawable/btn_keyboard_key2.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/res/drawable/ic_suggest_scroll_background.xml b/java/res/drawable/ic_suggest_scroll_background.xml
deleted file mode 100644
index 9d246e40e..000000000
--- a/java/res/drawable/ic_suggest_scroll_background.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/java/res/drawable/keyboard_key_feedback_honeycomb.xml b/java/res/drawable/keyboard_key_feedback_honeycomb.xml
index dd9b53e46..a3ea140cd 100644
--- a/java/res/drawable/keyboard_key_feedback_honeycomb.xml
+++ b/java/res/drawable/keyboard_key_feedback_honeycomb.xml
@@ -16,6 +16,6 @@
+ android:drawable="@drawable/keyboard_key_feedback_more_background_holo" />
diff --git a/java/res/layout/bubble_text.xml b/java/res/layout/bubble_text.xml
deleted file mode 100644
index c3957b65e..000000000
--- a/java/res/layout/bubble_text.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
diff --git a/java/res/raw/type3.ogg b/java/res/raw/type3.ogg
deleted file mode 100644
index 20e670807..000000000
Binary files a/java/res/raw/type3.ogg and /dev/null differ
diff --git a/java/res/values-ar/strings.xml b/java/res/values-ar/strings.xml
index d1d70ff74..f4bc3cac9 100644
--- a/java/res/values-ar/strings.xml
+++ b/java/res/values-ar/strings.xml
@@ -111,7 +111,6 @@
"لوحة مفاتيح إنجليزية (بريطانيا)"
"لوحة مفاتيح إنجليزية (الولايات المتحدة)"
"لوحة مفاتيح إسبانية"
- "لوحة مفاتيح إسبانية (الولايات المتحدة)"
"لوحة مفاتيح فرنسية"
"لوحة مفاتيح فرنسية (كندا)"
"لوحة مفاتيح فرنسية (سويسرا)"
diff --git a/java/res/values-bg/strings.xml b/java/res/values-bg/strings.xml
index 418bb18a1..939fd75c8 100644
--- a/java/res/values-bg/strings.xml
+++ b/java/res/values-bg/strings.xml
@@ -111,7 +111,6 @@
"английска (Великобрит.) клавиатура"
"английска (САЩ) клавиатура"
"испанска клавиатура"
- "испанска (САЩ) клавиатура"
"френска клавиатура"
"френска (Канада) клавиатура"
"френска (Швейцария) клавиатура"
diff --git a/java/res/values-ca/strings.xml b/java/res/values-ca/strings.xml
index 1bfa3a9ab..f596a37af 100644
--- a/java/res/values-ca/strings.xml
+++ b/java/res/values-ca/strings.xml
@@ -111,7 +111,6 @@
"Teclat anglès (Regne Unit)"
"Teclat anglès (Estats Units)"
"Teclat espanyol"
- "Teclat espanyol (Estats Units)"
"Teclat francès"
"Teclat francès (Canadà)"
"Teclat francès (Suïssa)"
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index b0cb7daf7..a8091bb57 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -111,7 +111,6 @@
"Klávesnice – angličtina (VB)"
"Klávesnice – angličtina (USA)"
"Klávesnice – španělština"
- "Klávesnice – španělština (USA)"
"Klávesnice – francouzština"
"Klávesnice – francouzština (Kanada)"
"Klávesnice – francouzština (Švýc.)"
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index eb79888d6..5c23ccf5f 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -111,7 +111,6 @@
"Engelsk tastatur (Storbritannien)"
"Engelsk tastatur (USA)"
"Spansk tastatur"
- "Spansk tastatur (USA)"
"Fransk tastatur"
"Fransk tastatur (Canada)"
"Fransk tastatur (Schweiz)"
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index e79d2c833..23eeb5b91 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -111,7 +111,6 @@
"Englische Tastatur (GB)"
"Englische Tastatur (USA)"
"Spanische Tastatur"
- "Spanische Tastatur (USA)"
"Französische Tastatur"
"Französische Tastatur (Kanada)"
"Französische Tastatur (Schweiz)"
diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml
index 4412fa45d..355d7a3c6 100644
--- a/java/res/values-el/strings.xml
+++ b/java/res/values-el/strings.xml
@@ -111,7 +111,6 @@
"Αγγλικό (ΗΒ) πληκτρολόγιο"
"Αγγλικό (ΗΠΑ) πληκτρολόγιο"
"Ισπανικό πληκτρολόγιο"
- "Ισπανικό (ΗΠΑ) πληκτρολόγιο"
"Γαλλικό πληκτρολόγιο"
"Γαλλικό (Καναδάς) πληκτρολόγιο"
"Γαλλικό (Ελβετία) πληκτρολόγιο"
diff --git a/java/res/values-en-rGB/strings.xml b/java/res/values-en-rGB/strings.xml
index b2e62b0cd..89a6a2e78 100644
--- a/java/res/values-en-rGB/strings.xml
+++ b/java/res/values-en-rGB/strings.xml
@@ -111,7 +111,6 @@
"English (UK) Keyboard"
"English (US) Keyboard"
"Spanish Keyboard"
- "Spanish (US) Keyboard"
"French Keyboard"
"French (Canada) Keyboard"
"French (Switzerland) Keyboard"
diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml
index 02f36ff79..9a45219b0 100644
--- a/java/res/values-es-rUS/strings.xml
+++ b/java/res/values-es-rUS/strings.xml
@@ -111,7 +111,6 @@
"Teclado en inglés (Reino Unido)"
"Teclado en inglés (EE.UU.)"
"Teclado en español"
- "Teclado en español (EE.UU.)"
"Teclado en francés"
"Teclado en francés (Canadá)"
"Teclado en francés (Suiza)"
diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml
index 24e975baa..1e72a0c37 100644
--- a/java/res/values-es/strings.xml
+++ b/java/res/values-es/strings.xml
@@ -111,7 +111,6 @@
"Teclado inglés (Reino Unido)"
"Teclado de inglés (EE.UU.)"
"Teclado español"
- "Teclado en español (EE.UU.)"
"Teclado francés"
"Teclado francés (Canadá)"
"Teclado francés (Suiza)"
diff --git a/java/res/values-fa/strings.xml b/java/res/values-fa/strings.xml
index b594411ac..ceeee52d9 100644
--- a/java/res/values-fa/strings.xml
+++ b/java/res/values-fa/strings.xml
@@ -111,7 +111,6 @@
"صفحه کلید انگلیسی (بریتانیایی)"
"صفحه کلید انگلیسی (آمریکایی)"
"صفحه کلید اسپانیایی"
- "صفحه کلید اسپانیایی (آمریکایی)"
"صفحه کلید فرانسوی"
"صفحه کلید فرانسوی (کانادایی)"
"صفحه کلید فرانسوی (سوئیس)"
diff --git a/java/res/values-fi/strings.xml b/java/res/values-fi/strings.xml
index 0bf385552..ee49c998f 100644
--- a/java/res/values-fi/strings.xml
+++ b/java/res/values-fi/strings.xml
@@ -111,7 +111,6 @@
"Näppäimistö: englanti (UK)"
"Näppäimistö: englanti (US)"
"Näppäimistö: espanja"
- "Näppäimistö: espanja (US)"
"Näppäimistö: ranska"
"Näppäimistö: ranska (Kanada)"
"Näppäimistö: ranska (Sveitsi)"
diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml
index 65e88c1ff..59a1387cf 100644
--- a/java/res/values-fr/strings.xml
+++ b/java/res/values-fr/strings.xml
@@ -111,7 +111,6 @@
"Clavier anglais (Royaume-Uni)"
"Clavier anglais (États-Unis)"
"Clavier espagnol"
- "Clavier espagnol (États-Unis)"
"Clavier français"
"Clavier français (Canada)"
"Clavier français (Suisse)"
diff --git a/java/res/values-hr/strings.xml b/java/res/values-hr/strings.xml
index e6879a6d1..34476d4c6 100644
--- a/java/res/values-hr/strings.xml
+++ b/java/res/values-hr/strings.xml
@@ -111,7 +111,6 @@
"Engleska (UK) tipkovnica"
"Engleska (SAD) tipkovnica"
"Španjolska tipkovnica"
- "Tipkovnica za španjolski (SAD)"
"Francuska tipkovnica"
"Francuska (Kanada) tipkovnica"
"Francuska (Švicarska) tipkovnica"
diff --git a/java/res/values-hu/strings.xml b/java/res/values-hu/strings.xml
index a8bf98367..923103bce 100644
--- a/java/res/values-hu/strings.xml
+++ b/java/res/values-hu/strings.xml
@@ -111,7 +111,6 @@
"Angol (UK) billentyűzet"
"Angol (US) billentyűzet"
"Spanyol billentyűzet"
- "Spanyol (US) billentyűzet"
"Francia billentyűzet"
"Francia (kanadai) billentyűzet"
"Francia (svájci) billentyűzet"
diff --git a/java/res/values-in/strings.xml b/java/res/values-in/strings.xml
index 4df7f1e7f..3322109c4 100644
--- a/java/res/values-in/strings.xml
+++ b/java/res/values-in/strings.xml
@@ -111,7 +111,6 @@
"Keyboard Inggris (Britania Raya)"
"Keyboard Inggris (AS)"
"Keyboard Spanyol"
- "Keyboard Spanyol (AS)"
"Keyboard Prancis"
"Keyboard Prancis (Kanada)"
"Keyboard Prancis (Swiss)"
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 9bf4f9e30..337a04e07 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -111,7 +111,6 @@
"Tastiera inglese (Regno Unito)"
"Tastiera inglese (Stati Uniti)"
"Tastiera spagnola"
- "Tastiera spagnola (Stati Uniti)"
"Tastiera francese"
"Tastiera francese (Canada)"
"Tastiera francese (Svizzera)"
diff --git a/java/res/values-iw/strings.xml b/java/res/values-iw/strings.xml
index af0854c97..e71ab56c3 100644
--- a/java/res/values-iw/strings.xml
+++ b/java/res/values-iw/strings.xml
@@ -111,7 +111,6 @@
"מקלדת אנגלית (בריטניה)"
"מקלדת אנגלית (ארה\"ב)"
"מקלדת ספרדית"
- "מקלדת ספרדית (ארה\"ב)"
"מקלדת צרפתית"
"מקלדת צרפתית (קנדה)"
"מקלדת צרפתית (שוויץ)"
diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml
index cd2cf8070..5d82a453b 100644
--- a/java/res/values-ja/strings.xml
+++ b/java/res/values-ja/strings.xml
@@ -111,7 +111,6 @@
"英語(英国)のキーボード"
"英語(米国)のキーボード"
"スペイン語のキーボード"
- "スペイン語(米国)のキーボード"
"フランス語のキーボード"
"フランス語(カナダ)のキーボード"
"フランス語(スイス)のキーボード"
diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml
index 7a09da880..2cf0ec2aa 100644
--- a/java/res/values-ko/strings.xml
+++ b/java/res/values-ko/strings.xml
@@ -111,7 +111,6 @@
"영어(영국) 키보드"
"영어(미국) 키보드"
"스페인어 키보드"
- "스페인어(미국) 키보드"
"프랑스어 키보드"
"프랑스어(캐나다) 키보드"
"프랑스어(스위스) 키보드"
diff --git a/java/res/values-lt/strings.xml b/java/res/values-lt/strings.xml
index c12c62aaa..3ff1543c6 100644
--- a/java/res/values-lt/strings.xml
+++ b/java/res/values-lt/strings.xml
@@ -111,7 +111,6 @@
"Angliška (JK) klaviatūra"
"Angliška (JAV) klaviatūra"
"Ispaniška klaviatūra"
- "Ispaniška (JAV) klaviatūra"
"Prancūziška klaviatūra"
"Prancūziška (Kanada) klaviatūra"
"Prancūziška (Šveicarija) klaviatūra"
diff --git a/java/res/values-lv/strings.xml b/java/res/values-lv/strings.xml
index 8b975b033..11e768fce 100644
--- a/java/res/values-lv/strings.xml
+++ b/java/res/values-lv/strings.xml
@@ -111,7 +111,6 @@
"Angļu (Lielbritānija) tastatūra"
"Angļu (ASV) tastatūra"
"Spāņu tastatūra"
- "Spāņu (ASV) tastatūra"
"Franču tastatūra"
"Franču (Kanāda) tastatūra"
"Franču (Šveices) tastatūra"
diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml
index 0471e74c3..db163b963 100644
--- a/java/res/values-nb/strings.xml
+++ b/java/res/values-nb/strings.xml
@@ -111,7 +111,6 @@
"Engelsk tastatur (Storbritannia)"
"Engelsk tastatur (USA)"
"Spansk tastatur"
- "Spansk tastatur (USA)"
"Fransk tastatur"
"Fransk tastatur (Canada)"
"Fransk tastatur (Sveits)"
diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml
index a1213ec33..6dece4885 100644
--- a/java/res/values-nl/strings.xml
+++ b/java/res/values-nl/strings.xml
@@ -111,7 +111,6 @@
"Engels toetsenbord (VK)"
"Engels toetsenbord (VS)"
"Spaans toetsenbord"
- "Spaans toetsenbord (VS)"
"Frans toetsenbord"
"Frans toetsenbord (Canada)"
"Frans toetsenbord (Zwitserland)"
diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml
index 633b159c9..70c4b18df 100644
--- a/java/res/values-pl/strings.xml
+++ b/java/res/values-pl/strings.xml
@@ -111,7 +111,6 @@
"Klawiatura angielska (UK)"
"Klawiatura angielska (USA)"
"Klawiatura hiszpańska"
- "Klawiatura hiszpańska (USA)"
"Klawiatura francuska"
"Klawiatura francuska (Kanada)"
"Klawiatura francuska (Szwajcaria)"
diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml
index f06d64c70..5845ebc59 100644
--- a/java/res/values-pt-rPT/strings.xml
+++ b/java/res/values-pt-rPT/strings.xml
@@ -111,7 +111,6 @@
"Teclado inglês (Reino Unido)"
"Teclado inglês (EUA)"
"Teclado espanhol"
- "Teclado espanhol (EUA)"
"Teclado francês"
"Teclado francês (Canadá)"
"Teclado francês (Suíça)"
diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml
index 9fc1a97f2..f1203c671 100644
--- a/java/res/values-pt/strings.xml
+++ b/java/res/values-pt/strings.xml
@@ -111,7 +111,6 @@
"Teclado para inglês (Reino Unido)"
"Teclado para inglês (EUA)"
"Teclado para espanhol"
- "Teclado para espanhol"
"Teclado para francês"
"Teclado para francês (Canadá)"
"Teclado para francês (Suíça)"
diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml
index 57548b5e4..9c51cad72 100644
--- a/java/res/values-rm/strings.xml
+++ b/java/res/values-rm/strings.xml
@@ -156,8 +156,6 @@
-
-
diff --git a/java/res/values-ro/strings.xml b/java/res/values-ro/strings.xml
index 9c973922a..0a80911ce 100644
--- a/java/res/values-ro/strings.xml
+++ b/java/res/values-ro/strings.xml
@@ -111,7 +111,6 @@
"Tastatură engleză (Marea Britanie)"
"Tastatură engleză (S.U.A.)"
"Tastatură spaniolă"
- "Tastatură spaniolă (S.U.A.)"
"Tastatură franceză"
"Tastatură franceză (Canada)"
"Tastatură franceză (Elveţia)"
diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml
index f8fdab021..6dab43cb9 100644
--- a/java/res/values-ru/strings.xml
+++ b/java/res/values-ru/strings.xml
@@ -111,7 +111,6 @@
"Клавиатура: английская (Великобритания)"
"Клавиатура: английская (США)"
"Клавиатура: испанская"
- "Клавиатура: испанская (США)"
"Клавиатура: французская"
"Клавиатура: французская"
"Клавиатура: французская (Швейцария)"
diff --git a/java/res/values-sk/strings.xml b/java/res/values-sk/strings.xml
index 569f273a4..e7a7cd194 100644
--- a/java/res/values-sk/strings.xml
+++ b/java/res/values-sk/strings.xml
@@ -111,7 +111,6 @@
"klávesnica – angličtina (br.)"
"klávesnica – angličtina (am.)"
"klávesnica – španielčina"
- "klávesnica – španielčina (am.)"
"klávesnica – francúzština"
"klávesnica – francúzština (Kanada)"
"klávesnica – francúzština (Švajč.)"
diff --git a/java/res/values-sl/strings.xml b/java/res/values-sl/strings.xml
index 715e6c567..6bb0b36c8 100644
--- a/java/res/values-sl/strings.xml
+++ b/java/res/values-sl/strings.xml
@@ -111,7 +111,6 @@
"Tipkovnica za britansko angleščino"
"Tipkovnica za ameriško angleščino"
"Španska tipkovnica"
- "Tipkovnica za ameriško španščino"
"Francoska tipkovnica"
"Tipkovnica za kanadsko francoščino"
"Tipkovnica za švicarsko francoščino"
diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml
index 115732779..02e7593ca 100644
--- a/java/res/values-sr/strings.xml
+++ b/java/res/values-sr/strings.xml
@@ -111,7 +111,6 @@
"Језик тастатуре: енглески (УК)"
"Језик тастатуре: енглески (САД)"
"Језик тастатуре: шпански"
- "Језик тастатуре: шпански (САД)"
"Језик тастатуре: француски"
"Језик тастатуре: француски (Канада)"
"Језик тастатуре: француски (Швајц.)"
diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml
index b8c62f46e..eaf350583 100644
--- a/java/res/values-sv/strings.xml
+++ b/java/res/values-sv/strings.xml
@@ -111,7 +111,6 @@
"Engelskt tangentbord (Storbrit.)"
"Engelskt tangentbord (USA)"
"Spanskt tangentbord"
- "Spanskt tangentbord (USA)"
"Franskt tangentbord"
"Franskt tangentbord (Kanada)"
"Franskt tangentbord (Schweiz)"
diff --git a/java/res/values-th/strings.xml b/java/res/values-th/strings.xml
index 836b98724..6dc813b74 100644
--- a/java/res/values-th/strings.xml
+++ b/java/res/values-th/strings.xml
@@ -111,7 +111,6 @@
"แป้นพิมพ์ภาษาอังกฤษ (สหราชอาณาจักร)"
"แป้นพิมพ์ภาษาอังกฤษ (สหรัฐอเมริกา)"
"แปันพิมพ์ภาษาสเปน"
- "แป้นพิมพ์ภาษาสเปน (สหรัฐอเมริกา)"
"แป้นพิมพ์ภาษาฝรั่งเศส"
"แป้นพิมพ์ภาษาฝรั่งเศส (แคนาดา)"
"แป้นพิมพ์ภาษาฝรั่งเศส (สวิตเซอร์แลนด์)"
diff --git a/java/res/values-tl/strings.xml b/java/res/values-tl/strings.xml
index 386b1fdd8..bdd700b67 100644
--- a/java/res/values-tl/strings.xml
+++ b/java/res/values-tl/strings.xml
@@ -111,7 +111,6 @@
"Ingles (UK) na Keyboard"
"Ingles (US) na Keyboard"
"Spanish na Keyboard"
- "Spanish (US) na Keyboard"
"French na Keyboard"
"French (Canada) na Keyboard"
"French (Switzerland) na Keyboard"
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index 71a6215dd..a88b50960 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -111,7 +111,6 @@
"İngilizce (İngiltere) Klavye"
"İngilizce (ABD) Klavye"
"İspanyolca Klavye"
- "İspanyolca (ABD) Klavye"
"Fransızca Klavye"
"Fransızca (Kanada) Klavye"
"Fransızca (İsviçre) Klavye"
diff --git a/java/res/values-uk/strings.xml b/java/res/values-uk/strings.xml
index 26906329a..5010ee9b5 100644
--- a/java/res/values-uk/strings.xml
+++ b/java/res/values-uk/strings.xml
@@ -111,7 +111,6 @@
"Англ. розкладка (Великобританія)"
"Англійська розкладка (США)"
"Іспанська розкладка"
- "Іспанська розкладка (США)"
"Французька розкладка"
"Французька розкладка (Канада)"
"Французька розкладка (Швейцарія)"
diff --git a/java/res/values-vi/strings.xml b/java/res/values-vi/strings.xml
index 70defe3b7..8dac2f922 100644
--- a/java/res/values-vi/strings.xml
+++ b/java/res/values-vi/strings.xml
@@ -111,7 +111,6 @@
"Bàn phím tiếng Anh (Anh)"
"Bàn phím tiếng Anh (Mỹ)"
"Bàn phím tiếng Tây Ban Nha"
- "Bàn phím tiếng Tây Ban Nha (Mỹ)"
"Bàn phím tiếng Pháp"
"Bàn phím tiếng Pháp (Canada)"
"Bàn phím tiếng Pháp (Thụy Sĩ)"
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index 3b092bfcc..9d7689153 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -111,7 +111,6 @@
"英语(英国)键盘"
"英语(美国)键盘"
"西班牙语键盘"
- "西班牙语(美国)键盘"
"法语键盘"
"法语(加拿大)键盘"
"法语(瑞士)键盘"
diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml
index a3bf911a1..9ba728461 100644
--- a/java/res/values-zh-rTW/strings.xml
+++ b/java/res/values-zh-rTW/strings.xml
@@ -111,7 +111,6 @@
"英文 (英國) 鍵盤"
"英文 (美國) 鍵盤"
"西班牙文鍵盤"
- "西班牙文 (美國) 鍵盤"
"法文鍵盤"
"法文 (加拿大) 鍵盤"
"法文 (瑞士) 鍵盤"
diff --git a/java/res/values/bools.xml b/java/res/values/bools.xml
index 2a181e17d..889d8f784 100644
--- a/java/res/values/bools.xml
+++ b/java/res/values/bools.xml
@@ -21,6 +21,4 @@
false
-
- true
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 0161589a4..741171f88 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -25,7 +25,6 @@
#80000000
#80FFFFFF
#FFC0C0C0
- #A0000000
#FFFFFFFF
#FFFFFFFF
#FF000000
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index bdb4409f0..7c100c367 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -20,7 +20,6 @@
true
- true
true
true
true
@@ -51,8 +50,6 @@
10
0
70
- 0
- 100
400
50
32
@@ -65,9 +62,7 @@
4
small
- 10
-
- true
+ 5
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 7f00cdba3..d28b9232b 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -57,7 +57,6 @@
2.5in
- 22dip
0.05in
diff --git a/java/res/values/durations.xml b/java/res/values/durations.xml
deleted file mode 100644
index 92af68e39..000000000
--- a/java/res/values/durations.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
- 40
-
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 3c0a9c1a2..ac14a2082 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -252,8 +252,6 @@
English (US) Keyboard
Spanish Keyboard
-
- Spanish (US) Keyboard
French Keyboard