diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png
index 9aa8db60e..87211a502 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
index 5e6a9d6a4..fa2cb8542 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index a3ba2230d..b1af23b6c 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index 9f4587b4a..814e40235 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 7ec33dd20..90abe3940 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 655bc01b1..48eeb3f54 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index 138e915d9..71e0683cd 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
index baff85873..6da273b09 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
index 5612c51a1..6768241a7 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png
index c2e8b3779..de1493151 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/java/res/drawable-hdpi/ic_emoji_light.png b/java/res/drawable-hdpi/ic_emoji_light.png
deleted file mode 100644
index 2e3638bf3..000000000
Binary files a/java/res/drawable-hdpi/ic_emoji_light.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_ime_light.png b/java/res/drawable-hdpi/ic_ime_light.png
deleted file mode 100644
index 4fd3ba126..000000000
Binary files a/java/res/drawable-hdpi/ic_ime_light.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_ime_switcher_dark.png b/java/res/drawable-hdpi/ic_ime_switcher_dark.png
new file mode 100644
index 000000000..7506af5a3
Binary files /dev/null and b/java/res/drawable-hdpi/ic_ime_switcher_dark.png differ
diff --git a/java/res/drawable-hdpi/ic_subtype_keyboard.png b/java/res/drawable-hdpi/ic_subtype_keyboard.png
deleted file mode 100644
index 484305655..000000000
Binary files a/java/res/drawable-hdpi/ic_subtype_keyboard.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/ic_subtype_mic_dark.png b/java/res/drawable-hdpi/ic_subtype_mic_dark.png
new file mode 100644
index 000000000..eacbcd255
Binary files /dev/null and b/java/res/drawable-hdpi/ic_subtype_mic_dark.png differ
diff --git a/java/res/drawable-hdpi/keyboard_background_ics.9.png b/java/res/drawable-hdpi/keyboard_background_holo.9.png
similarity index 100%
rename from java/res/drawable-hdpi/keyboard_background_ics.9.png
rename to java/res/drawable-hdpi/keyboard_background_holo.9.png
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 28b406a5c..50ed568ff 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_left_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_holo.9.png
index e42cd88dc..9fa6d0003 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png
index 160344073..c73269b7e 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_holo.9.png
index a40d4277c..fffd4021e 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png
index 1f6807376..61c23c19b 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png
index ec53593d9..827d74363 100644
Binary files a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_holo.9.png
index 53d7b6fb3..dc2fc7dfc 100644
Binary files a/java/res/drawable-hdpi/keyboard_popup_panel_background_holo.9.png and b/java/res/drawable-hdpi/keyboard_popup_panel_background_holo.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png
index e173beb73..32f426402 100644
Binary files a/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png and b/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png
deleted file mode 100644
index 0591b82cd..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png b/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index d3e108846..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_delete_holo_dark.png
new file mode 100644
index 000000000..d2d3560a3
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_delete_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_label_mic.png b/java/res/drawable-hdpi/sym_keyboard_label_mic.png
deleted file mode 100644
index 4e0a8ed8e..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_label_mic.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_label_mic_holo.png b/java/res/drawable-hdpi/sym_keyboard_label_mic_holo.png
deleted file mode 100644
index f8df44741..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_label_mic_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_switch.png b/java/res/drawable-hdpi/sym_keyboard_language_switch.png
deleted file mode 100644
index 7b980a0c8..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_language_switch.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_language_switch_dark.png b/java/res/drawable-hdpi/sym_keyboard_language_switch_dark.png
new file mode 100644
index 000000000..78d3a1fc5
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_language_switch_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png
deleted file mode 100644
index 520a40f09..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_mic.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_mic_holo_dark.png
new file mode 100644
index 000000000..3c5469403
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_mic_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png
deleted file mode 100644
index 9743c7f2f..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_return.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return_holo.png b/java/res/drawable-hdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index 8978934b8..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_return_holo_dark.png
new file mode 100644
index 000000000..60d893cf3
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_return_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png
deleted file mode 100644
index 8cd28c64a..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_search.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_search_holo.png b/java/res/drawable-hdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index b987a20f1..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_search_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_search_holo_dark.png
new file mode 100644
index 000000000..fa0d1bde1
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_search_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png
deleted file mode 100644
index 1e5bf939e..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png b/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 5af09ad8c..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png
new file mode 100644
index 000000000..c76008ab3
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_settings_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png
deleted file mode 100644
index 8e3d0320c..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png b/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index c58f9ab5c..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_shift_holo_dark.png
new file mode 100644
index 000000000..544b7e141
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_shift_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
deleted file mode 100644
index d345634a6..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index 7a5c03713..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo_dark.png
new file mode 100644
index 000000000..9b1d6a015
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_holo.png b/java/res/drawable-hdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index e8bc3902d..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_space_holo_dark.png
new file mode 100644
index 000000000..12e27ade7
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_space_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab.png b/java/res/drawable-hdpi/sym_keyboard_tab.png
deleted file mode 100644
index 3d1c5c0ea..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_tab.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab_holo.png b/java/res/drawable-hdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index 8d10d057c..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_tab_holo_dark.png
new file mode 100644
index 000000000..2e5f811f3
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_tab_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index 8a6336a57..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_voice_holo_dark.png
new file mode 100644
index 000000000..c1e16a651
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_voice_holo_dark.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
deleted file mode 100644
index edf1379ab..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo_dark.png
new file mode 100644
index 000000000..26d068490
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-hdpi/sym_keyboard_zwj_holo.png
deleted file mode 100644
index 5fa30ceb8..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_zwj_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwj_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_zwj_holo_dark.png
new file mode 100644
index 000000000..9f9bc173b
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_zwj_holo_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwnj_holo.png b/java/res/drawable-hdpi/sym_keyboard_zwnj_holo.png
deleted file mode 100644
index 91367f3d2..000000000
Binary files a/java/res/drawable-hdpi/sym_keyboard_zwnj_holo.png and /dev/null differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_zwnj_holo_dark.png b/java/res/drawable-hdpi/sym_keyboard_zwnj_holo_dark.png
new file mode 100644
index 000000000..f0f832e13
Binary files /dev/null and b/java/res/drawable-hdpi/sym_keyboard_zwnj_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png
index e810c7789..f98653ea1 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
index d449d7600..8e9a34957 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index fa24d5987..58a316fba 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index f3fc64114..b7b2dca43 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 8f340d355..4a92b80dd 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 53ea5f894..72125a065 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index 69c84e7ec..82413d4cc 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
index 976083fdf..2915588bf 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
index c39dd4a94..049385984 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png
index 93a6e7921..5b202e25b 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/java/res/drawable-mdpi/ic_emoji_light.png b/java/res/drawable-mdpi/ic_emoji_light.png
deleted file mode 100644
index a3195041a..000000000
Binary files a/java/res/drawable-mdpi/ic_emoji_light.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_ime_light.png b/java/res/drawable-mdpi/ic_ime_light.png
deleted file mode 100644
index d94ad6f7e..000000000
Binary files a/java/res/drawable-mdpi/ic_ime_light.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/ic_ime_switcher_dark.png b/java/res/drawable-mdpi/ic_ime_switcher_dark.png
new file mode 100644
index 000000000..152f65300
Binary files /dev/null and b/java/res/drawable-mdpi/ic_ime_switcher_dark.png differ
diff --git a/java/res/drawable-mdpi/ic_subtype_keyboard.png b/java/res/drawable-mdpi/ic_subtype_keyboard.png
deleted file mode 100644
index d28efc106..000000000
Binary files a/java/res/drawable-mdpi/ic_subtype_keyboard.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/keyboard_background_ics.9.png b/java/res/drawable-mdpi/keyboard_background_holo.9.png
similarity index 100%
rename from java/res/drawable-mdpi/keyboard_background_ics.9.png
rename to java/res/drawable-mdpi/keyboard_background_holo.9.png
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 7a9f640d1..564f5460c 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/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_holo.9.png
index 5b06f09bb..427c87061 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png
index fd992d6f4..ea757296d 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png
index 128dcd6ad..1911c429f 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png
index 0b08d1747..cdef116d2 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png
index cf0b33c1d..dea5d076c 100644
Binary files a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png
index 61988a8e1..441edc30b 100644
Binary files a/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png and b/java/res/drawable-mdpi/keyboard_popup_panel_background_holo.9.png differ
diff --git a/java/res/drawable-mdpi/suggestions_strip_divider.png b/java/res/drawable-mdpi/suggestions_strip_divider.png
index 2dbe2f94b..21e904939 100644
Binary files a/java/res/drawable-mdpi/suggestions_strip_divider.png and b/java/res/drawable-mdpi/suggestions_strip_divider.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_delete.png b/java/res/drawable-mdpi/sym_keyboard_delete.png
deleted file mode 100644
index 1b0f3f836..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_delete.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-mdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 86be35185..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_delete_holo_dark.png
new file mode 100644
index 000000000..edd9d164e
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_delete_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_label_mic.png b/java/res/drawable-mdpi/sym_keyboard_label_mic.png
deleted file mode 100644
index a354d5321..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_label_mic.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo.png b/java/res/drawable-mdpi/sym_keyboard_label_mic_holo.png
deleted file mode 100644
index 15606e95f..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png
new file mode 100644
index 000000000..537f39b02
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_label_mic_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_language_switch.png b/java/res/drawable-mdpi/sym_keyboard_language_switch.png
deleted file mode 100644
index f840a631d..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_language_switch.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_language_switch_dark.png b/java/res/drawable-mdpi/sym_keyboard_language_switch_dark.png
new file mode 100644
index 000000000..828929bc8
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_language_switch_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic.png b/java/res/drawable-mdpi/sym_keyboard_mic.png
deleted file mode 100644
index e926b3fa6..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_mic.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_mic_holo_dark.png
new file mode 100644
index 000000000..5e58866a7
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_mic_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png b/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png
new file mode 100644
index 000000000..84a63dc7f
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_mic_holo_light.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_return.png b/java/res/drawable-mdpi/sym_keyboard_return.png
deleted file mode 100644
index 0c10f004a..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_return.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-mdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index bfcb91328..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_return_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_return_holo_dark.png
new file mode 100644
index 000000000..e10103caf
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_return_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_search.png b/java/res/drawable-mdpi/sym_keyboard_search.png
deleted file mode 100644
index 614f85f5e..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_search.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_search_holo.png b/java/res/drawable-mdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index dd3c83a84..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_search_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_search_holo_dark.png
new file mode 100644
index 000000000..290cde41b
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_search_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings.png b/java/res/drawable-mdpi/sym_keyboard_settings.png
deleted file mode 100644
index ad7618fa0..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_settings.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 36c8c9623..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png
new file mode 100644
index 000000000..a76a976c5
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_settings_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift.png b/java/res/drawable-mdpi/sym_keyboard_shift.png
deleted file mode 100644
index 5109b0471..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-mdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index 621946455..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_shift_holo_dark.png
new file mode 100644
index 000000000..37375d935
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_shift_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked.png
deleted file mode 100644
index 244179c2d..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index fb3a020d8..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo_dark.png
new file mode 100644
index 000000000..3654868dc
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_smiley_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_smiley_holo_dark.png
new file mode 100644
index 000000000..71272bb88
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_smiley_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-mdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index 1f787d573..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_space_holo_dark.png
new file mode 100644
index 000000000..a38f99496
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_space_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tab.png b/java/res/drawable-mdpi/sym_keyboard_tab.png
deleted file mode 100644
index eddb9a592..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_tab.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tab_holo.png b/java/res/drawable-mdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index 8d20153ee..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tab_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_tab_holo_dark.png
new file mode 100644
index 000000000..f883807f2
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_tab_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-mdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index 0795fcc9b..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_voice_holo_dark.png
new file mode 100644
index 000000000..16be37d05
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_voice_holo_dark.png 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
deleted file mode 100644
index f76da5797..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo_dark.png
new file mode 100644
index 000000000..95d718a46
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-mdpi/sym_keyboard_zwj_holo.png
deleted file mode 100644
index 70370d83d..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_zwj_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwj_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_zwj_holo_dark.png
new file mode 100644
index 000000000..8957e282b
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_zwj_holo_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwnj_holo.png b/java/res/drawable-mdpi/sym_keyboard_zwnj_holo.png
deleted file mode 100644
index a69eade17..000000000
Binary files a/java/res/drawable-mdpi/sym_keyboard_zwnj_holo.png and /dev/null differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_zwnj_holo_dark.png b/java/res/drawable-mdpi/sym_keyboard_zwnj_holo_dark.png
new file mode 100644
index 000000000..5f49e64aa
Binary files /dev/null and b/java/res/drawable-mdpi/sym_keyboard_zwnj_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png
index d990c0258..738316d66 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
index d2cd029bb..a2f6ac0e2 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index bca39cf17..2f00fc623 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index ab8fb2e86..20251a000 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 3871689ef..84d173967 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 912506368..ee4490eac 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index 35ce67fdc..e8124776c 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
index b26f1d27a..0ef4a4b5f 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
index c23a4b225..f770962c3 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
index 0c7bfdace..af9187ed2 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/ic_emoji_light.png b/java/res/drawable-xhdpi/ic_emoji_light.png
deleted file mode 100644
index 21bc9090d..000000000
Binary files a/java/res/drawable-xhdpi/ic_emoji_light.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_ime_light.png b/java/res/drawable-xhdpi/ic_ime_light.png
deleted file mode 100644
index 9d2caeda6..000000000
Binary files a/java/res/drawable-xhdpi/ic_ime_light.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_ime_switcher_dark.png b/java/res/drawable-xhdpi/ic_ime_switcher_dark.png
new file mode 100644
index 000000000..c567077e5
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_ime_switcher_dark.png differ
diff --git a/java/res/drawable-xhdpi/ic_subtype_keyboard.png b/java/res/drawable-xhdpi/ic_subtype_keyboard.png
deleted file mode 100644
index a79bb3458..000000000
Binary files a/java/res/drawable-xhdpi/ic_subtype_keyboard.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/ic_subtype_mic_dark.png b/java/res/drawable-xhdpi/ic_subtype_mic_dark.png
new file mode 100644
index 000000000..17581ba89
Binary files /dev/null and b/java/res/drawable-xhdpi/ic_subtype_mic_dark.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_background_ics.9.png b/java/res/drawable-xhdpi/keyboard_background_holo.9.png
similarity index 100%
rename from java/res/drawable-xhdpi/keyboard_background_ics.9.png
rename to java/res/drawable-xhdpi/keyboard_background_holo.9.png
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png
index d999127f2..e8c65f677 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png
index c4d694136..543bc763e 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png
index 5429c1785..ec42aadb6 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_holo.9.png
index 5135a0869..319e9d7cf 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png
index 19a77a29f..052032be7 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png
index ae2ffff8e..c7e9d1c9e 100644
Binary files a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_holo.9.png
index 1dee699f4..dde1856e3 100644
Binary files a/java/res/drawable-xhdpi/keyboard_popup_panel_background_holo.9.png and b/java/res/drawable-xhdpi/keyboard_popup_panel_background_holo.9.png differ
diff --git a/java/res/drawable-xhdpi/suggestions_strip_divider.png b/java/res/drawable-xhdpi/suggestions_strip_divider.png
index 0d8b98437..4101ebc59 100644
Binary files a/java/res/drawable-xhdpi/suggestions_strip_divider.png and b/java/res/drawable-xhdpi/suggestions_strip_divider.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete.png b/java/res/drawable-xhdpi/sym_keyboard_delete.png
deleted file mode 100644
index 3c0b8b186..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_delete.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_holo.png b/java/res/drawable-xhdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 354c09ee6..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_delete_holo_dark.png
new file mode 100644
index 000000000..e3e37d5ff
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_delete_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_label_mic.png b/java/res/drawable-xhdpi/sym_keyboard_label_mic.png
deleted file mode 100644
index 49810a02f..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_label_mic.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_label_mic_holo.png b/java/res/drawable-xhdpi/sym_keyboard_label_mic_holo.png
deleted file mode 100644
index 8eeb179f5..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_label_mic_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_switch.png b/java/res/drawable-xhdpi/sym_keyboard_language_switch.png
deleted file mode 100644
index 6c2fb53ec..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_language_switch.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_switch_dark.png b/java/res/drawable-xhdpi/sym_keyboard_language_switch_dark.png
new file mode 100644
index 000000000..b8687f550
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_language_switch_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_mic.png b/java/res/drawable-xhdpi/sym_keyboard_mic.png
deleted file mode 100644
index 1323b6d1e..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_mic.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_mic_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_mic_holo_dark.png
new file mode 100644
index 000000000..566ba1fcd
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_mic_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_return.png b/java/res/drawable-xhdpi/sym_keyboard_return.png
deleted file mode 100644
index ad061227e..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_return.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_return_holo.png b/java/res/drawable-xhdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index ba424adfd..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_return_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_return_holo_dark.png
new file mode 100644
index 000000000..7b7ad1747
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_return_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_search.png b/java/res/drawable-xhdpi/sym_keyboard_search.png
deleted file mode 100644
index aa785a221..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_search.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_search_holo.png b/java/res/drawable-xhdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index f2fb2a2b5..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_search_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_search_holo_dark.png
new file mode 100644
index 000000000..36b1646bb
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_search_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings.png b/java/res/drawable-xhdpi/sym_keyboard_settings.png
deleted file mode 100644
index 50704255d..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_settings.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_holo.png b/java/res/drawable-xhdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 99ee97dbf..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png
new file mode 100644
index 000000000..05eaffe2e
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_settings_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift.png b/java/res/drawable-xhdpi/sym_keyboard_shift.png
deleted file mode 100644
index 290170619..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_holo.png b/java/res/drawable-xhdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index 1046b4545..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_shift_holo_dark.png
new file mode 100644
index 000000000..5ab549114
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_shift_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked.png
deleted file mode 100644
index a5deb60e9..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_locked.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index 6acb565d9..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo_dark.png
new file mode 100644
index 000000000..b820eaabb
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_smiley_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_smiley_holo_dark.png
new file mode 100644
index 000000000..686831fd3
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_smiley_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_holo.png b/java/res/drawable-xhdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index 504a3ed45..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_space_holo_dark.png
new file mode 100644
index 000000000..7114b740f
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_space_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab.png b/java/res/drawable-xhdpi/sym_keyboard_tab.png
deleted file mode 100644
index 0ef2ab5b9..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_tab.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab_holo.png b/java/res/drawable-xhdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index ff380eeab..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_tab_holo_dark.png
new file mode 100644
index 000000000..73ebfe525
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_tab_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png b/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index b2bb9b803..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_voice_holo_dark.png
new file mode 100644
index 000000000..944a8524d
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_voice_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png
deleted file mode 100644
index 23e75bfe7..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo_dark.png
new file mode 100644
index 000000000..2016caf40
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-xhdpi/sym_keyboard_zwj_holo.png
deleted file mode 100644
index 26694274e..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_zwj_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwj_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_zwj_holo_dark.png
new file mode 100644
index 000000000..2f9607add
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_zwj_holo_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo.png b/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo.png
deleted file mode 100644
index 75a22b65f..000000000
Binary files a/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo.png and /dev/null differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo_dark.png b/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo_dark.png
new file mode 100644
index 000000000..ab07f7549
Binary files /dev/null and b/java/res/drawable-xhdpi/sym_keyboard_zwnj_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png
index 680421eaf..b35c29fe6 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png
index ae2675053..17f0a7a58 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index c92a669f9..b0e815eb2 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index 40f5011c0..97f96258e 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 6ff6319d3..dfb16a76b 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 818ea70fd..bf1d34686 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index a476d2a9e..962277165 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png
index 9c280a655..4ddfdcb6c 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png
index 3c17c5eec..17144b673 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png
index 6d2af5942..c62051f37 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/ic_emoji_light.png b/java/res/drawable-xxhdpi/ic_emoji_light.png
deleted file mode 100644
index 7480e5294..000000000
Binary files a/java/res/drawable-xxhdpi/ic_emoji_light.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/ic_ime_light.png b/java/res/drawable-xxhdpi/ic_ime_light.png
deleted file mode 100644
index 0309635d2..000000000
Binary files a/java/res/drawable-xxhdpi/ic_ime_light.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/ic_ime_switcher_dark.png b/java/res/drawable-xxhdpi/ic_ime_switcher_dark.png
new file mode 100644
index 000000000..f99f7d0c7
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_ime_switcher_dark.png differ
diff --git a/java/res/drawable-xxhdpi/ic_subtype_keyboard.png b/java/res/drawable-xxhdpi/ic_subtype_keyboard.png
deleted file mode 100644
index 0bb4283b0..000000000
Binary files a/java/res/drawable-xxhdpi/ic_subtype_keyboard.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png b/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png
new file mode 100644
index 000000000..811103a56
Binary files /dev/null and b/java/res/drawable-xxhdpi/ic_subtype_mic_dark.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_background_ics.9.png b/java/res/drawable-xxhdpi/keyboard_background_holo.9.png
similarity index 100%
rename from java/res/drawable-xxhdpi/keyboard_background_ics.9.png
rename to java/res/drawable-xxhdpi/keyboard_background_holo.9.png
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_holo.9.png
index bd1ef3cd9..11eee94f3 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_holo.9.png
index 65af4b569..2079e0462 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_holo.9.png
index ac6750dcb..c4178d9a8 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_holo.9.png
index cea7c05f6..121411a06 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_holo.9.png
index 520fa7c6b..d3d8733fd 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_holo.9.png
index eee221758..d7ec8bcb2 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_holo.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_holo.9.png
index 721c24400..ca576deaf 100644
Binary files a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_holo.9.png and b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_holo.9.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_delete_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index be3cb7ce7..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_delete_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_delete_holo_dark.png
new file mode 100644
index 000000000..92be79241
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_delete_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_label_mic_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_label_mic_holo.png
deleted file mode 100644
index b6d4477bd..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_label_mic_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_language_switch.png b/java/res/drawable-xxhdpi/sym_keyboard_language_switch.png
deleted file mode 100644
index 7cd0684a0..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_language_switch.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_language_switch_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_dark.png
new file mode 100644
index 000000000..88b55bb37
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_language_switch_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_mic_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_mic_holo_dark.png
new file mode 100644
index 000000000..f55af308c
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_mic_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_return_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index 7d9580796..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_return_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_return_holo_dark.png
new file mode 100644
index 000000000..46ee50eba
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_return_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_search_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index 6b09d8e57..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_search_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_search_holo_dark.png
new file mode 100644
index 000000000..f518748ce
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_search_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 7041bb6ce..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png
new file mode 100644
index 000000000..e4358463b
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_settings_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index 2b4fbbba6..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_holo_dark.png
new file mode 100644
index 000000000..523286e6e
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_shift_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index 91c8603fd..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_holo_dark.png
new file mode 100644
index 000000000..87926d9a6
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_smiley_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_smiley_holo_dark.png
new file mode 100644
index 000000000..04b721617
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_smiley_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_space_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index 65aa5ea9b..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_space_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_space_holo_dark.png
new file mode 100644
index 000000000..1dab1f431
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_space_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_tab_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index 1f4ae3df7..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_tab_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_tab_holo_dark.png
new file mode 100644
index 000000000..6eb3eb0b3
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_tab_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index f04cadf6f..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_holo_dark.png
new file mode 100644
index 000000000..6809f0711
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_voice_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_holo.png
deleted file mode 100644
index e74d523bc..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_voice_off_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_holo_dark.png
new file mode 100644
index 000000000..6bd506a11
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_voice_off_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwj_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_zwj_holo.png
deleted file mode 100644
index 85289b2a3..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_zwj_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwj_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_zwj_holo_dark.png
new file mode 100644
index 000000000..5e225b837
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_zwj_holo_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwnj_holo.png b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_holo.png
deleted file mode 100644
index e610678b1..000000000
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_zwnj_holo.png and /dev/null differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_zwnj_holo_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_holo_dark.png
new file mode 100644
index 000000000..cdfc0295b
Binary files /dev/null and b/java/res/drawable-xxhdpi/sym_keyboard_zwnj_holo_dark.png differ
diff --git a/java/res/layout/emoji_keyboard_view.xml b/java/res/layout/emoji_keyboard_view.xml
index 36909a159..6a953a702 100644
--- a/java/res/layout/emoji_keyboard_view.xml
+++ b/java/res/layout/emoji_keyboard_view.xml
@@ -66,7 +66,7 @@
android:layout_width="0dip"
android:layout_weight="12.5"
android:layout_height="match_parent"
- android:src="@drawable/sym_keyboard_delete_holo" />
+ android:src="@drawable/sym_keyboard_delete_holo_dark" />
+ android:src="@drawable/ic_ime_switcher_dark" />
+ android:src="@drawable/sym_keyboard_return_holo_dark" />
diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml
index 7f8dd235b..d9ac4acb2 100644
--- a/java/res/values/themes-gb.xml
+++ b/java/res/values/themes-gb.xml
@@ -32,25 +32,25 @@