diff --git a/java/res/drawable-hdpi/btn_center_default.9.png b/java/res/drawable-hdpi/btn_center_default.9.png
index d5ec36b..4f5f01c 100644
--- a/java/res/drawable-hdpi/btn_center_default.9.png
+++ b/java/res/drawable-hdpi/btn_center_default.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_center_pressed.9.png b/java/res/drawable-hdpi/btn_center_pressed.9.png
index 593a679..213b482 100644
--- a/java/res/drawable-hdpi/btn_center_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_center_pressed.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_center_selected.9.png b/java/res/drawable-hdpi/btn_center_selected.9.png
index f1914a8..213b482 100644
--- a/java/res/drawable-hdpi/btn_center_selected.9.png
+++ b/java/res/drawable-hdpi/btn_center_selected.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_close_candidates_pane.9.png b/java/res/drawable-hdpi/btn_close_candidates_pane.9.png
index 6df00f2..bdd9495 100644
--- a/java/res/drawable-hdpi/btn_close_candidates_pane.9.png
+++ b/java/res/drawable-hdpi/btn_close_candidates_pane.9.png
Binary files 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 a8c1688..2dc1bed 100644
--- 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
Binary files 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 8296476..575781f 100644
--- 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
Binary files 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 020a65d..6c5b42e 100644
--- 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
Binary files 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 88b27c0..8c999f6 100644
--- 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
Binary files 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 87497bc..8c7c2f3 100644
--- 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
Binary files 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 f0d76df..02497b4 100644
--- 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
Binary files 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 b6c234c..a524168 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png
Binary files 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 73a8cd1..4395e97 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_fulltrans_pressed.9.png
Binary files 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 3115fa4..a13b200 100644
--- 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
Binary files 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 dc08102..0b76855 100644
--- 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
Binary files 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 42c7c14..6ec7e65 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal.9.png
Binary files 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 01e2506..995780c 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_off.9.png
Binary files 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 fad0ec4..1388b66 100644
--- 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
Binary files 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 83c6eb3..7215782 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_on.9.png
Binary files 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 215f815..5a94cb6 100644
--- 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
Binary files 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 88acdd7..c6373a8 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_normal_stone.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_background_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_background_holo.9.png
new file mode 100644
index 0000000..0b27589
--- /dev/null
+++ b/java/res/drawable-hdpi/btn_keyboard_key_popup_background_holo.9.png
Binary files 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 5ecdaf4..166de2a 100644
--- 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
Binary files 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 e047eaf..0bd49a0 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed.9.png
Binary files 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 218a2d2..634419f 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_off.9.png
Binary files 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 afe4951..8474f9f 100644
--- a/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
+++ b/java/res/drawable-hdpi/btn_keyboard_key_pressed_on.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/candidate_feedback_background.9.png b/java/res/drawable-hdpi/candidate_feedback_background.9.png
index 203c4e6..1649900 100644
--- a/java/res/drawable-hdpi/candidate_feedback_background.9.png
+++ b/java/res/drawable-hdpi/candidate_feedback_background.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/caution.png b/java/res/drawable-hdpi/caution.png
index 5cb6c54..61eb4dd 100644
--- a/java/res/drawable-hdpi/caution.png
+++ b/java/res/drawable-hdpi/caution.png
Binary files differ
diff --git a/java/res/drawable-hdpi/hint_popup.9.png b/java/res/drawable-hdpi/hint_popup.9.png
index b5ec003..5b2ad53 100644
--- a/java/res/drawable-hdpi/hint_popup.9.png
+++ b/java/res/drawable-hdpi/hint_popup.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/hint_popup_holo.9.png b/java/res/drawable-hdpi/hint_popup_holo.9.png
index 2ffc6ea..c44af88 100644
--- a/java/res/drawable-hdpi/hint_popup_holo.9.png
+++ b/java/res/drawable-hdpi/hint_popup_holo.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_dialog_keyboard.png b/java/res/drawable-hdpi/ic_dialog_keyboard.png
index c772956..3054416 100644
--- a/java/res/drawable-hdpi/ic_dialog_keyboard.png
+++ b/java/res/drawable-hdpi/ic_dialog_keyboard.png
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_mic_dialog.png b/java/res/drawable-hdpi/ic_mic_dialog.png
index 349dc4b..6107f87 100644
--- a/java/res/drawable-hdpi/ic_mic_dialog.png
+++ b/java/res/drawable-hdpi/ic_mic_dialog.png
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_subtype_keyboard.png b/java/res/drawable-hdpi/ic_subtype_keyboard.png
index 7015e26..4843056 100644
--- a/java/res/drawable-hdpi/ic_subtype_keyboard.png
+++ b/java/res/drawable-hdpi/ic_subtype_keyboard.png
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_subtype_mic.png b/java/res/drawable-hdpi/ic_subtype_mic.png
index cb86a55..25c9ee2 100644
--- a/java/res/drawable-hdpi/ic_subtype_mic.png
+++ b/java/res/drawable-hdpi/ic_subtype_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
index c00b4aa..189a861 100644
--- a/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_microphone.png
Binary files 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 256dc3d..b4a6e37 100644
--- a/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
+++ b/java/res/drawable-hdpi/ic_suggest_strip_microphone_swipe.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_background.9.png b/java/res/drawable-hdpi/keyboard_background.9.png
index edffac5..d57463f 100644
--- a/java/res/drawable-hdpi/keyboard_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_background.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_background_holo.9.png b/java/res/drawable-hdpi/keyboard_background_holo.9.png
index 76fe2c8..39746ff 100644
--- a/java/res/drawable-hdpi/keyboard_background_holo.9.png
+++ b/java/res/drawable-hdpi/keyboard_background_holo.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_dark_background.9.png b/java/res/drawable-hdpi/keyboard_dark_background.9.png
index f315cbd..fa3d449 100644
--- a/java/res/drawable-hdpi/keyboard_dark_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_dark_background.9.png
Binary files 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 943f9e4..fd7a56e 100644
--- a/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..60d9203
--- /dev/null
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..f694b79
--- /dev/null
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_holo.9.png
Binary files 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 c21240f..3165d08 100644
--- 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
Binary files 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
new file mode 100644
index 0000000..3136073
--- /dev/null
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..13d5af9
--- /dev/null
+++ b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_holo.9.png
Binary files 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 d6b2c79..baff809 100644
--- a/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png
+++ b/java/res/drawable-hdpi/keyboard_popup_panel_background.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
index 0ccdb6a..7cab5a8 100644
--- a/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
index 7ca3e61..a62daf9 100644
--- a/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_divider.png
Binary files 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 f55bcc9..f250034 100644
--- a/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png
+++ b/java/res/drawable-hdpi/keyboard_suggest_strip_holo.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/mic_base.png b/java/res/drawable-hdpi/mic_base.png
index 53e29ff..504a1aa 100644
--- a/java/res/drawable-hdpi/mic_base.png
+++ b/java/res/drawable-hdpi/mic_base.png
Binary files differ
diff --git a/java/res/drawable-hdpi/mic_full.png b/java/res/drawable-hdpi/mic_full.png
index e3e3dfa..3f4a676 100644
--- a/java/res/drawable-hdpi/mic_full.png
+++ b/java/res/drawable-hdpi/mic_full.png
Binary files differ
diff --git a/java/res/drawable-hdpi/mic_slash.png b/java/res/drawable-hdpi/mic_slash.png
index 1dd05c5..c3b1092 100644
--- a/java/res/drawable-hdpi/mic_slash.png
+++ b/java/res/drawable-hdpi/mic_slash.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png
index 3e4eff6..af6082d 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_123_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_delete.png b/java/res/drawable-hdpi/sym_bkeyboard_delete.png
index 1d24cc8..999a182 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_delete.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_delete.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_mic.png b/java/res/drawable-hdpi/sym_bkeyboard_mic.png
index 512f460..5c73600 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_mic.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num0.png b/java/res/drawable-hdpi/sym_bkeyboard_num0.png
index 678a790..02f2811 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num0.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num0.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num1.png b/java/res/drawable-hdpi/sym_bkeyboard_num1.png
index 4e68e35..304acfd 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num1.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num1.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num2.png b/java/res/drawable-hdpi/sym_bkeyboard_num2.png
index 546663f..295eba1 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num2.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num2.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num3.png b/java/res/drawable-hdpi/sym_bkeyboard_num3.png
index 57f9a8d..9ee6e44 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num3.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num3.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num4.png b/java/res/drawable-hdpi/sym_bkeyboard_num4.png
index de50438..ab4392d 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num4.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num4.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num5.png b/java/res/drawable-hdpi/sym_bkeyboard_num5.png
index 1d2e1ef..004ecd7 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num5.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num5.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num6.png b/java/res/drawable-hdpi/sym_bkeyboard_num6.png
index 39788b7..2aa317d 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num6.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num6.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num7.png b/java/res/drawable-hdpi/sym_bkeyboard_num7.png
index fff6f27..721361c 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num7.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num7.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num8.png b/java/res/drawable-hdpi/sym_bkeyboard_num8.png
index 8cc1a95..941359f 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num8.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num8.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_num9.png b/java/res/drawable-hdpi/sym_bkeyboard_num9.png
index 0217425..74e08a0 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_num9.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_num9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numalt.png b/java/res/drawable-hdpi/sym_bkeyboard_numalt.png
deleted file mode 100644
index 200714f..0000000
--- a/java/res/drawable-hdpi/sym_bkeyboard_numalt.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numpound.png b/java/res/drawable-hdpi/sym_bkeyboard_numpound.png
deleted file mode 100644
index 0a46122..0000000
--- a/java/res/drawable-hdpi/sym_bkeyboard_numpound.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_numstar.png b/java/res/drawable-hdpi/sym_bkeyboard_numstar.png
deleted file mode 100644
index ca22bd5..0000000
--- a/java/res/drawable-hdpi/sym_bkeyboard_numstar.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_return.png b/java/res/drawable-hdpi/sym_bkeyboard_return.png
index 426e159..91bb397 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_return.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_return.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_search.png b/java/res/drawable-hdpi/sym_bkeyboard_search.png
index 1b6f884..0ac0814 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_search.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_search.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_settings.png b/java/res/drawable-hdpi/sym_bkeyboard_settings.png
index 08ba18f..5b6217a 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_settings.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_settings.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift.png b/java/res/drawable-hdpi/sym_bkeyboard_shift.png
index 5a22dd3..5ef01b8 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_shift.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_shift.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png
index 5664491..7d36dcb 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_shift_locked.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_space.png b/java/res/drawable-hdpi/sym_bkeyboard_space.png
index cd0ebe2..77518cc 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_space.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_space.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_bkeyboard_tab.png b/java/res/drawable-hdpi/sym_bkeyboard_tab.png
index 3466e12..5db4cef 100644
--- a/java/res/drawable-hdpi/sym_bkeyboard_tab.png
+++ b/java/res/drawable-hdpi/sym_bkeyboard_tab.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_123_mic.png b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
index 6266980..6f0aec2 100644
--- a/java/res/drawable-hdpi/sym_keyboard_123_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_123_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete.png b/java/res/drawable-hdpi/sym_keyboard_delete.png
index 459ebcf..0591b82 100644
--- a/java/res/drawable-hdpi/sym_keyboard_delete.png
+++ b/java/res/drawable-hdpi/sym_keyboard_delete.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png b/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
index ff2a4ac..9d87ba6 100644
--- a/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_delete_holo.png
Binary files 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 eef7896..e56799c 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
index 8322e8e..960bb4e 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_delete.png
Binary files 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 889477c..5d1cb78 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
Binary files 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 b0f6d7f..3a56d47 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
index f82c33a..a88a19d 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
index 819236c..7d418d9 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_numalt.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
index f038d3a..f73ff3c 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_return.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
index 337f9e4..0e69157 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_search.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
index 8a02be0..6304b00 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_settings.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
index abf15f8..fc858f2 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_shift.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
index 70debca..67311fc 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_space.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
index d2efb16..d75fcac 100644
--- a/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
+++ b/java/res/drawable-hdpi/sym_keyboard_feedback_tab.png
Binary files 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 dcc4bd5..79f235f 100644
--- a/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
+++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
Binary files 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 ecf61a9..e1444e8 100644
--- a/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
+++ b/java/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_mic.png b/java/res/drawable-hdpi/sym_keyboard_mic.png
index c8dca62..520a40f 100644
--- a/java/res/drawable-hdpi/sym_keyboard_mic.png
+++ b/java/res/drawable-hdpi/sym_keyboard_mic.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num0.png b/java/res/drawable-hdpi/sym_keyboard_num0.png
index 10ac70b..2024f41 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num0.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num0.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num0_holo.png b/java/res/drawable-hdpi/sym_keyboard_num0_holo.png
index ec8b5a8..fbd55d6 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num0_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num0_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num1.png b/java/res/drawable-hdpi/sym_keyboard_num1.png
index 0fc03ef..5e66b9a 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num1.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num1.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num1_holo.png b/java/res/drawable-hdpi/sym_keyboard_num1_holo.png
index 60c8ab8..e651c3e 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num1_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num1_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num2.png b/java/res/drawable-hdpi/sym_keyboard_num2.png
index 283560b..3933270 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num2.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num2.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num2_holo.png b/java/res/drawable-hdpi/sym_keyboard_num2_holo.png
index 578e37d..8458f53 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num2_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num2_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num3.png b/java/res/drawable-hdpi/sym_keyboard_num3.png
index 9a3b329..c695483 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num3.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num3.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num3_holo.png b/java/res/drawable-hdpi/sym_keyboard_num3_holo.png
index fb62506..81025c6 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num3_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num3_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num4.png b/java/res/drawable-hdpi/sym_keyboard_num4.png
index f13ff1a..ef20add 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num4.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num4.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num4_holo.png b/java/res/drawable-hdpi/sym_keyboard_num4_holo.png
index c0e54a5..30a0c77 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num4_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num4_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num5.png b/java/res/drawable-hdpi/sym_keyboard_num5.png
index c251329..9a2f51f 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num5.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num5.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num5_holo.png b/java/res/drawable-hdpi/sym_keyboard_num5_holo.png
index b581a46..147f056 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num5_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num5_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num6.png b/java/res/drawable-hdpi/sym_keyboard_num6.png
index 4acba4c..6829f81 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num6.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num6.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num6_holo.png b/java/res/drawable-hdpi/sym_keyboard_num6_holo.png
index 0791802..b968308 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num6_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num6_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num7.png b/java/res/drawable-hdpi/sym_keyboard_num7.png
index 14931c1..dc608d4 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num7.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num7.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num7_holo.png b/java/res/drawable-hdpi/sym_keyboard_num7_holo.png
index 7b3d3a8..7d44bfb 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num7_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num7_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num8.png b/java/res/drawable-hdpi/sym_keyboard_num8.png
index d4973fd..f0978c6 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num8.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num8.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num8_holo.png b/java/res/drawable-hdpi/sym_keyboard_num8_holo.png
index e076aed..093cd74 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num8_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num8_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num9.png b/java/res/drawable-hdpi/sym_keyboard_num9.png
index 49cec66..4b8328d 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num9.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_num9_holo.png b/java/res/drawable-hdpi/sym_keyboard_num9_holo.png
index 4189cda..f35e80d 100644
--- a/java/res/drawable-hdpi/sym_keyboard_num9_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_num9_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numalt.png b/java/res/drawable-hdpi/sym_keyboard_numalt.png
deleted file mode 100644
index 3cc5311..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_numalt.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-hdpi/sym_keyboard_numbpound_holo.png
deleted file mode 100644
index 73f8be0..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_numbpound_holo.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-hdpi/sym_keyboard_numbstar_holo.png
deleted file mode 100644
index fcb891b..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_numbstar_holo.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numpound.png b/java/res/drawable-hdpi/sym_keyboard_numpound.png
deleted file mode 100644
index d091339..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_numpound.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_numstar.png b/java/res/drawable-hdpi/sym_keyboard_numstar.png
deleted file mode 100644
index e838e16..0000000
--- a/java/res/drawable-hdpi/sym_keyboard_numstar.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return.png b/java/res/drawable-hdpi/sym_keyboard_return.png
index 9d97e1e..9743c7f 100644
--- a/java/res/drawable-hdpi/sym_keyboard_return.png
+++ b/java/res/drawable-hdpi/sym_keyboard_return.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_return_holo.png b/java/res/drawable-hdpi/sym_keyboard_return_holo.png
index ca3c02d..ef04d67 100644
--- a/java/res/drawable-hdpi/sym_keyboard_return_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_return_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_search.png b/java/res/drawable-hdpi/sym_keyboard_search.png
index 1aa22d7..8cd28c6 100644
--- a/java/res/drawable-hdpi/sym_keyboard_search.png
+++ b/java/res/drawable-hdpi/sym_keyboard_search.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings.png b/java/res/drawable-hdpi/sym_keyboard_settings.png
index 35d1ed6..1e5bf93 100644
--- a/java/res/drawable-hdpi/sym_keyboard_settings.png
+++ b/java/res/drawable-hdpi/sym_keyboard_settings.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png b/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
index 471bd0b..29085e5 100644
--- a/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_settings_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift.png b/java/res/drawable-hdpi/sym_keyboard_shift.png
index bf217d1..8e3d032 100644
--- a/java/res/drawable-hdpi/sym_keyboard_shift.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png b/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
index 375c1b4..1e074a7 100644
--- a/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
index d11b397..d345634 100644
--- a/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked.png
Binary files 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
index 57362ea..ab77b95 100644
--- a/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_shift_locked_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space.png b/java/res/drawable-hdpi/sym_keyboard_space.png
index fcd20de..780733e 100644
--- a/java/res/drawable-hdpi/sym_keyboard_space.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_space_holo.png b/java/res/drawable-hdpi/sym_keyboard_space_holo.png
index a8e5f7d..143a899 100644
--- a/java/res/drawable-hdpi/sym_keyboard_space_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space_holo.png
Binary files 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 2c6f4a9..c76f64b 100644
--- a/java/res/drawable-hdpi/sym_keyboard_space_led.9.png
+++ b/java/res/drawable-hdpi/sym_keyboard_space_led.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_tab_holo.png b/java/res/drawable-hdpi/sym_keyboard_tab_holo.png
new file mode 100644
index 0000000..321c541
--- /dev/null
+++ b/java/res/drawable-hdpi/sym_keyboard_tab_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
index 5ea2edc..d3cb46e 100644
--- a/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_voice_holo.png
Binary files 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 6e6279a..45e3e79 100644
--- a/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png
+++ b/java/res/drawable-hdpi/sym_keyboard_voice_off_holo.png
Binary files differ
diff --git a/java/res/drawable-hdpi/vs_dialog_blue.9.png b/java/res/drawable-hdpi/vs_dialog_blue.9.png
index cf27e8f..4f813ea 100644
--- a/java/res/drawable-hdpi/vs_dialog_blue.9.png
+++ b/java/res/drawable-hdpi/vs_dialog_blue.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/vs_dialog_red.9.png b/java/res/drawable-hdpi/vs_dialog_red.9.png
index 6c08d5a..a205560 100644
--- a/java/res/drawable-hdpi/vs_dialog_red.9.png
+++ b/java/res/drawable-hdpi/vs_dialog_red.9.png
Binary files differ
diff --git a/java/res/drawable-hdpi/vs_dialog_yellow.9.png b/java/res/drawable-hdpi/vs_dialog_yellow.9.png
index 2fb06c2..ce664b6 100644
--- a/java/res/drawable-hdpi/vs_dialog_yellow.9.png
+++ b/java/res/drawable-hdpi/vs_dialog_yellow.9.png
Binary files 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 1534d99..034d638 100644
--- 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
Binary files 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 936513a..0cb53d5 100644
--- 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
Binary files 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 b071251..0050a01 100644
--- 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
Binary files 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 9fed21e..27f8fda 100644
--- 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
Binary files 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 3fce559..b8ce952 100644
--- 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
Binary files 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 3f82b67..4d4d1a7 100644
--- 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
Binary files 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 eded173..90f471f 100644
--- 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
Binary files 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 e6a1dce..c850768 100644
--- 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
Binary files differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_background_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_background_holo.9.png
new file mode 100644
index 0000000..e9186b7
--- /dev/null
+++ b/java/res/drawable-mdpi/btn_keyboard_key_popup_background_holo.9.png
Binary files 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 d2f5f3b..e96c8c5 100644
--- 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
Binary files differ
diff --git a/java/res/drawable-mdpi/hint_popup_holo.9.png b/java/res/drawable-mdpi/hint_popup_holo.9.png
index 01d1139..e9e131c 100644
--- a/java/res/drawable-mdpi/hint_popup_holo.9.png
+++ b/java/res/drawable-mdpi/hint_popup_holo.9.png
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_background_holo.9.png b/java/res/drawable-mdpi/keyboard_background_holo.9.png
index a93966c..f1d55c6 100644
--- a/java/res/drawable-mdpi/keyboard_background_holo.9.png
+++ b/java/res/drawable-mdpi/keyboard_background_holo.9.png
Binary files 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 3d6a76f..9a1b7aa 100644
--- a/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png
+++ b/java/res/drawable-mdpi/keyboard_key_feedback_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..cb222b0
--- /dev/null
+++ b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..07d9800
--- /dev/null
+++ b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_holo.9.png
Binary files 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 e3f5be8..05a332b 100644
--- 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
Binary files 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
new file mode 100644
index 0000000..fd16755
--- /dev/null
+++ b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..1acbd82
--- /dev/null
+++ b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_holo.9.png
Binary files differ
diff --git a/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png
index 1f87a68..17faf86 100644
--- a/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png
+++ b/java/res/drawable-mdpi/keyboard_suggest_strip_holo.9.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_numalt.png b/java/res/drawable-mdpi/sym_bkeyboard_numalt.png
deleted file mode 100644
index 4fa410b..0000000
--- a/java/res/drawable-mdpi/sym_bkeyboard_numalt.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_numpound.png b/java/res/drawable-mdpi/sym_bkeyboard_numpound.png
deleted file mode 100644
index 9126eed..0000000
--- a/java/res/drawable-mdpi/sym_bkeyboard_numpound.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_bkeyboard_numstar.png b/java/res/drawable-mdpi/sym_bkeyboard_numstar.png
deleted file mode 100644
index 9b9f1b9..0000000
--- a/java/res/drawable-mdpi/sym_bkeyboard_numstar.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-mdpi/sym_keyboard_delete_holo.png
index 1555791..f8f6e6a 100644
--- a/java/res/drawable-mdpi/sym_keyboard_delete_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_delete_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png b/java/res/drawable-mdpi/sym_keyboard_num0_holo.png
index e1d395b..2c57adf 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num0_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num0_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png b/java/res/drawable-mdpi/sym_keyboard_num1_holo.png
index 225436a..509e28f 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num1_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num1_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png b/java/res/drawable-mdpi/sym_keyboard_num2_holo.png
index e513fa4..0da18e7 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num2_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num2_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png b/java/res/drawable-mdpi/sym_keyboard_num3_holo.png
index b91e005..e847058 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num3_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num3_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png b/java/res/drawable-mdpi/sym_keyboard_num4_holo.png
index 65f8824..13c216d 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num4_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num4_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png b/java/res/drawable-mdpi/sym_keyboard_num5_holo.png
index b89ef07..0065153 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num5_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num5_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png b/java/res/drawable-mdpi/sym_keyboard_num6_holo.png
index 931275a..09fab76 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num6_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num6_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png b/java/res/drawable-mdpi/sym_keyboard_num7_holo.png
index 9396c4c..d350fdd 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num7_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num7_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png b/java/res/drawable-mdpi/sym_keyboard_num8_holo.png
index 12e3eef..c40cb89 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num8_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num8_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png b/java/res/drawable-mdpi/sym_keyboard_num9_holo.png
index 6911c2b..7352693 100644
--- a/java/res/drawable-mdpi/sym_keyboard_num9_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_num9_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_numalt.png b/java/res/drawable-mdpi/sym_keyboard_numalt.png
deleted file mode 100644
index 32a2cf3..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_numalt.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png b/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png
deleted file mode 100644
index e3a8b49..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_numbpound_holo.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png b/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png
deleted file mode 100644
index e80e934..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_numbstar_holo.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_numpound.png b/java/res/drawable-mdpi/sym_keyboard_numpound.png
deleted file mode 100644
index b2419d9..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_numpound.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_numstar.png b/java/res/drawable-mdpi/sym_keyboard_numstar.png
deleted file mode 100644
index cb66f96..0000000
--- a/java/res/drawable-mdpi/sym_keyboard_numstar.png
+++ /dev/null
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-mdpi/sym_keyboard_return_holo.png
index d519cce..abbce52 100644
--- a/java/res/drawable-mdpi/sym_keyboard_return_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_return_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png
index 784a450..82df903 100644
--- a/java/res/drawable-mdpi/sym_keyboard_settings_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_settings_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-mdpi/sym_keyboard_shift_holo.png
index 91d6e32..49b9fc0 100644
--- a/java/res/drawable-mdpi/sym_keyboard_shift_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_shift_holo.png
Binary files 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
index 2bd0536..5375beb 100644
--- a/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_shift_locked_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-mdpi/sym_keyboard_space_holo.png
index 25e655d..e413ddf 100644
--- a/java/res/drawable-mdpi/sym_keyboard_space_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_space_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_tab_holo.png b/java/res/drawable-mdpi/sym_keyboard_tab_holo.png
new file mode 100644
index 0000000..c41af7b
--- /dev/null
+++ b/java/res/drawable-mdpi/sym_keyboard_tab_holo.png
Binary files differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-mdpi/sym_keyboard_voice_holo.png
index c1116dc..158439a 100644
--- a/java/res/drawable-mdpi/sym_keyboard_voice_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_voice_holo.png
Binary files 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 081a130..79026f1 100644
--- a/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png
+++ b/java/res/drawable-mdpi/sym_keyboard_voice_off_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_candidate_pressed.9.png b/java/res/drawable-xhdpi/btn_candidate_pressed.9.png
new file mode 100644
index 0000000..41e126a
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_candidate_pressed.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_center_default.9.png b/java/res/drawable-xhdpi/btn_center_default.9.png
new file mode 100644
index 0000000..e847425
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_center_default.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_center_pressed.9.png b/java/res/drawable-xhdpi/btn_center_pressed.9.png
new file mode 100644
index 0000000..facfd43
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_center_pressed.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_center_selected.9.png b/java/res/drawable-xhdpi/btn_center_selected.9.png
new file mode 100644
index 0000000..facfd43
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_center_selected.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_close_candidates_pane.9.png b/java/res/drawable-xhdpi/btn_close_candidates_pane.9.png
new file mode 100644
index 0000000..9d797ed
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_close_candidates_pane.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_expand_candidates_pane.9.png b/java/res/drawable-xhdpi/btn_expand_candidates_pane.9.png
new file mode 100644
index 0000000..88d01c9
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_expand_candidates_pane.9.png
Binary files 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 3e4a812..b9667be 100644
--- 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
Binary files 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 d61dd2b..1719992 100644
--- 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
Binary files 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 c127e2a..0eb9c9f 100644
--- 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
Binary files 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 ac3f358..5114bf5 100644
--- 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
Binary files 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 e5de3b0..9923950 100644
--- 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
Binary files 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 c63b69a..474951c 100644
--- 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
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png
new file mode 100644
index 0000000..f7e32f7
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_normal.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png
new file mode 100644
index 0000000..00c4476
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_fulltrans_pressed.9.png
Binary files 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 e1361ed..4a255f7 100644
--- 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
Binary files 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 6efd3a7..5bcd1c9 100644
--- 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
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png
new file mode 100644
index 0000000..f53b404
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png
new file mode 100644
index 0000000..3c6ae6b
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png
new file mode 100644
index 0000000..eebe7d3
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_off_stone.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png
new file mode 100644
index 0000000..655bfb2
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png
new file mode 100644
index 0000000..336248a
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_on_stone.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png
new file mode 100644
index 0000000..bb1c72b
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_normal_stone.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_background_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_background_holo.9.png
new file mode 100644
index 0000000..10d788d
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_popup_background_holo.9.png
Binary files 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 3ed9b1e..0a9a9e4 100644
--- 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
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png
new file mode 100644
index 0000000..f739116
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png
new file mode 100644
index 0000000..34a948f
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_off.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png
new file mode 100644
index 0000000..520f12d
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_pressed_on.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/candidate_feedback_background.9.png b/java/res/drawable-xhdpi/candidate_feedback_background.9.png
new file mode 100644
index 0000000..0ec90e5
--- /dev/null
+++ b/java/res/drawable-xhdpi/candidate_feedback_background.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/caution.png b/java/res/drawable-xhdpi/caution.png
new file mode 100644
index 0000000..cfc3f75
--- /dev/null
+++ b/java/res/drawable-xhdpi/caution.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/hint_popup.9.png b/java/res/drawable-xhdpi/hint_popup.9.png
new file mode 100644
index 0000000..add4743
--- /dev/null
+++ b/java/res/drawable-xhdpi/hint_popup.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/hint_popup_holo.9.png b/java/res/drawable-xhdpi/hint_popup_holo.9.png
index bc37fa8..a2b114e 100644
--- a/java/res/drawable-xhdpi/hint_popup_holo.9.png
+++ b/java/res/drawable-xhdpi/hint_popup_holo.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_dialog_keyboard.png b/java/res/drawable-xhdpi/ic_dialog_keyboard.png
new file mode 100644
index 0000000..f114c93
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_dialog_keyboard.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_mic_dialog.png b/java/res/drawable-xhdpi/ic_mic_dialog.png
new file mode 100644
index 0000000..5d6399c
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_mic_dialog.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_subtype_keyboard.png b/java/res/drawable-xhdpi/ic_subtype_keyboard.png
new file mode 100644
index 0000000..a79bb34
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_subtype_keyboard.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_subtype_mic.png b/java/res/drawable-xhdpi/ic_subtype_mic.png
new file mode 100644
index 0000000..fc8d18c
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_subtype_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png b/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png
new file mode 100644
index 0000000..d65d287
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_suggest_strip_microphone.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png b/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png
new file mode 100644
index 0000000..889378a
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_suggest_strip_microphone_swipe.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_background.9.png b/java/res/drawable-xhdpi/keyboard_background.9.png
new file mode 100644
index 0000000..2639963
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_background.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_background_holo.9.png b/java/res/drawable-xhdpi/keyboard_background_holo.9.png
new file mode 100644
index 0000000..58d1514
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_background_holo.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_dark_background.9.png b/java/res/drawable-xhdpi/keyboard_dark_background.9.png
new file mode 100644
index 0000000..27b7a10
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_dark_background.9.png
Binary files differ
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 943f9e4..44675ba 100644
--- a/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png
+++ b/java/res/drawable-xhdpi/keyboard_key_feedback_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..cfd1f52
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..a01c173
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_holo.9.png
Binary files 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 f66e545..1d2abc2 100644
--- 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
Binary files 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
new file mode 100644
index 0000000..5616d19
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_holo.9.png
Binary files 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
new file mode 100644
index 0000000..ecf9c2c
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_holo.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background.9.png
new file mode 100644
index 0000000..79f7ab0
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_popup_panel_background.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip.9.png
new file mode 100644
index 0000000..1b568df
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_suggest_strip.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip_divider.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_divider.png
new file mode 100644
index 0000000..cd7c2c7
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_suggest_strip_divider.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/keyboard_suggest_strip_holo.9.png b/java/res/drawable-xhdpi/keyboard_suggest_strip_holo.9.png
new file mode 100644
index 0000000..f4ff7dc
--- /dev/null
+++ b/java/res/drawable-xhdpi/keyboard_suggest_strip_holo.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/mic_base.png b/java/res/drawable-xhdpi/mic_base.png
new file mode 100644
index 0000000..5c060be
--- /dev/null
+++ b/java/res/drawable-xhdpi/mic_base.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/mic_full.png b/java/res/drawable-xhdpi/mic_full.png
new file mode 100644
index 0000000..32ffe12
--- /dev/null
+++ b/java/res/drawable-xhdpi/mic_full.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/mic_slash.png b/java/res/drawable-xhdpi/mic_slash.png
new file mode 100644
index 0000000..18b2254
--- /dev/null
+++ b/java/res/drawable-xhdpi/mic_slash.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_123_mic.png b/java/res/drawable-xhdpi/sym_bkeyboard_123_mic.png
new file mode 100644
index 0000000..0aefaa1
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_123_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_delete.png b/java/res/drawable-xhdpi/sym_bkeyboard_delete.png
new file mode 100644
index 0000000..b84ee76
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_delete.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_mic.png b/java/res/drawable-xhdpi/sym_bkeyboard_mic.png
new file mode 100644
index 0000000..8c3f11d
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num0.png b/java/res/drawable-xhdpi/sym_bkeyboard_num0.png
new file mode 100644
index 0000000..da8d50a
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num0.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num1.png b/java/res/drawable-xhdpi/sym_bkeyboard_num1.png
new file mode 100644
index 0000000..62443eb
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num1.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num2.png b/java/res/drawable-xhdpi/sym_bkeyboard_num2.png
new file mode 100644
index 0000000..4b3ef7e
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num2.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num3.png b/java/res/drawable-xhdpi/sym_bkeyboard_num3.png
new file mode 100644
index 0000000..48315e4
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num3.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num4.png b/java/res/drawable-xhdpi/sym_bkeyboard_num4.png
new file mode 100644
index 0000000..17958d7
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num4.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num5.png b/java/res/drawable-xhdpi/sym_bkeyboard_num5.png
new file mode 100644
index 0000000..43716c4
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num5.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num6.png b/java/res/drawable-xhdpi/sym_bkeyboard_num6.png
new file mode 100644
index 0000000..09f2b42
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num6.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num7.png b/java/res/drawable-xhdpi/sym_bkeyboard_num7.png
new file mode 100644
index 0000000..72438ec
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num7.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num8.png b/java/res/drawable-xhdpi/sym_bkeyboard_num8.png
new file mode 100644
index 0000000..403b53f
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num8.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_num9.png b/java/res/drawable-xhdpi/sym_bkeyboard_num9.png
new file mode 100644
index 0000000..644c2a4
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_num9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_return.png b/java/res/drawable-xhdpi/sym_bkeyboard_return.png
new file mode 100644
index 0000000..1632ecd
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_return.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_search.png b/java/res/drawable-xhdpi/sym_bkeyboard_search.png
new file mode 100644
index 0000000..69d8b22
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_search.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_settings.png b/java/res/drawable-xhdpi/sym_bkeyboard_settings.png
new file mode 100644
index 0000000..050154a
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_settings.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_shift.png b/java/res/drawable-xhdpi/sym_bkeyboard_shift.png
new file mode 100644
index 0000000..d15d11a
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_shift.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_shift_locked.png b/java/res/drawable-xhdpi/sym_bkeyboard_shift_locked.png
new file mode 100644
index 0000000..83b287f
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_shift_locked.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_space.png b/java/res/drawable-xhdpi/sym_bkeyboard_space.png
new file mode 100644
index 0000000..5ca62c7
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_space.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_tab.png b/java/res/drawable-xhdpi/sym_bkeyboard_tab.png
new file mode 100644
index 0000000..6ca1997
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_tab.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_bkeyboard_voice_off.png b/java/res/drawable-xhdpi/sym_bkeyboard_voice_off.png
new file mode 100644
index 0000000..fc6a4eb
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_bkeyboard_voice_off.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_123_mic.png b/java/res/drawable-xhdpi/sym_keyboard_123_mic.png
new file mode 100644
index 0000000..bcb0979
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_123_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete.png b/java/res/drawable-xhdpi/sym_keyboard_delete.png
new file mode 100644
index 0000000..3c0b8b1
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_delete.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_delete_holo.png b/java/res/drawable-xhdpi/sym_keyboard_delete_holo.png
new file mode 100644
index 0000000..5150073
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_delete_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_123_mic.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_123_mic.png
new file mode 100644
index 0000000..5238c16
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_123_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_delete.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_delete.png
new file mode 100644
index 0000000..f0c29e7
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_delete.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_language_arrows_left.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_language_arrows_left.png
new file mode 100644
index 0000000..a90b8da
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_language_arrows_left.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_language_arrows_right.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_language_arrows_right.png
new file mode 100644
index 0000000..1123bf3
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_language_arrows_right.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_mic.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_mic.png
new file mode 100644
index 0000000..5ac27eb
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_numalt.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_numalt.png
new file mode 100644
index 0000000..b68e606
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_numalt.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_return.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_return.png
new file mode 100644
index 0000000..c777d00
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_return.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_search.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_search.png
new file mode 100644
index 0000000..32e0789
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_search.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_settings.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_settings.png
new file mode 100644
index 0000000..021cafa
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_settings.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_shift.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_shift.png
new file mode 100644
index 0000000..d8c0325
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_shift.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_space.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_space.png
new file mode 100644
index 0000000..cee1056
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_space.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png b/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png
new file mode 100644
index 0000000..0650e01
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_feedback_tab.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_arrows_left.png b/java/res/drawable-xhdpi/sym_keyboard_language_arrows_left.png
new file mode 100644
index 0000000..226f2e6
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_language_arrows_left.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_language_arrows_right.png b/java/res/drawable-xhdpi/sym_keyboard_language_arrows_right.png
new file mode 100644
index 0000000..1e02e7e
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_language_arrows_right.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_mic.png b/java/res/drawable-xhdpi/sym_keyboard_mic.png
new file mode 100644
index 0000000..1323b6d
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_mic.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num0.png b/java/res/drawable-xhdpi/sym_keyboard_num0.png
new file mode 100644
index 0000000..06bd3bf
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num0.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png
new file mode 100644
index 0000000..33e80bd
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num0_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num1.png b/java/res/drawable-xhdpi/sym_keyboard_num1.png
new file mode 100644
index 0000000..dfa0cfe
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num1.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png
new file mode 100644
index 0000000..dce3ee8
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num1_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num2.png b/java/res/drawable-xhdpi/sym_keyboard_num2.png
new file mode 100644
index 0000000..4bd2ead
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num2.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png
new file mode 100644
index 0000000..e776efb
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num2_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num3.png b/java/res/drawable-xhdpi/sym_keyboard_num3.png
new file mode 100644
index 0000000..39db112
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num3.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png
new file mode 100644
index 0000000..66e7b37
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num3_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num4.png b/java/res/drawable-xhdpi/sym_keyboard_num4.png
new file mode 100644
index 0000000..6035694
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num4.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png
new file mode 100644
index 0000000..bf70e28
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num4_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num5.png b/java/res/drawable-xhdpi/sym_keyboard_num5.png
new file mode 100644
index 0000000..3238b3f
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num5.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png
new file mode 100644
index 0000000..98d0b5c
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num5_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num6.png b/java/res/drawable-xhdpi/sym_keyboard_num6.png
new file mode 100644
index 0000000..c8da5a9
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num6.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png
new file mode 100644
index 0000000..67340ef
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num6_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num7.png b/java/res/drawable-xhdpi/sym_keyboard_num7.png
new file mode 100644
index 0000000..553cf5f
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num7.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png
new file mode 100644
index 0000000..8432249
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num7_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num8.png b/java/res/drawable-xhdpi/sym_keyboard_num8.png
new file mode 100644
index 0000000..eaaf533
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num8.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png
new file mode 100644
index 0000000..6d520bc
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num8_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num9.png b/java/res/drawable-xhdpi/sym_keyboard_num9.png
new file mode 100644
index 0000000..b510d37
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png b/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png
new file mode 100644
index 0000000..158c879
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_num9_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_return.png b/java/res/drawable-xhdpi/sym_keyboard_return.png
new file mode 100644
index 0000000..ad06122
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_return.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_return_holo.png b/java/res/drawable-xhdpi/sym_keyboard_return_holo.png
new file mode 100644
index 0000000..6e2e1c0
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_return_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_search.png b/java/res/drawable-xhdpi/sym_keyboard_search.png
new file mode 100644
index 0000000..aa785a2
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_search.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings.png b/java/res/drawable-xhdpi/sym_keyboard_settings.png
new file mode 100644
index 0000000..5070425
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_settings.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_settings_holo.png b/java/res/drawable-xhdpi/sym_keyboard_settings_holo.png
new file mode 100644
index 0000000..018e45d
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_settings_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift.png b/java/res/drawable-xhdpi/sym_keyboard_shift.png
new file mode 100644
index 0000000..2901706
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_shift.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_holo.png b/java/res/drawable-xhdpi/sym_keyboard_shift_holo.png
new file mode 100644
index 0000000..41d4ca1
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_shift_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked.png
new file mode 100644
index 0000000..a5deb60
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_shift_locked.png
Binary files 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
new file mode 100644
index 0000000..b811b74
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space.png b/java/res/drawable-xhdpi/sym_keyboard_space.png
new file mode 100644
index 0000000..66fc3e9
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_space.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_holo.png b/java/res/drawable-xhdpi/sym_keyboard_space_holo.png
new file mode 100644
index 0000000..da89264
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_space_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_space_led.9.png b/java/res/drawable-xhdpi/sym_keyboard_space_led.9.png
new file mode 100644
index 0000000..6525fef
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_space_led.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab.png b/java/res/drawable-xhdpi/sym_keyboard_tab.png
new file mode 100644
index 0000000..0ef2ab5
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_tab.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_tab_holo.png b/java/res/drawable-xhdpi/sym_keyboard_tab_holo.png
new file mode 100644
index 0000000..dd207ca
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_tab_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png b/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png
new file mode 100644
index 0000000..d73e499
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_voice_holo.png
Binary files 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
new file mode 100644
index 0000000..8d34a5a
--- /dev/null
+++ b/java/res/drawable-xhdpi/sym_keyboard_voice_off_holo.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/vs_dialog_blue.9.png b/java/res/drawable-xhdpi/vs_dialog_blue.9.png
new file mode 100644
index 0000000..3284d78
--- /dev/null
+++ b/java/res/drawable-xhdpi/vs_dialog_blue.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/vs_dialog_red.9.png b/java/res/drawable-xhdpi/vs_dialog_red.9.png
new file mode 100644
index 0000000..5af2465
--- /dev/null
+++ b/java/res/drawable-xhdpi/vs_dialog_red.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/vs_dialog_yellow.9.png b/java/res/drawable-xhdpi/vs_dialog_yellow.9.png
new file mode 100644
index 0000000..4f50439
--- /dev/null
+++ b/java/res/drawable-xhdpi/vs_dialog_yellow.9.png
Binary files differ
diff --git a/java/res/drawable-xhdpi/vs_popup_mic_edge.png b/java/res/drawable-xhdpi/vs_popup_mic_edge.png
new file mode 100644
index 0000000..1063cb4
--- /dev/null
+++ b/java/res/drawable-xhdpi/vs_popup_mic_edge.png
Binary files differ
diff --git a/java/res/drawable/btn_candidate_holo.xml b/java/res/drawable/btn_candidate_ics.xml
similarity index 93%
rename from java/res/drawable/btn_candidate_holo.xml
rename to java/res/drawable/btn_candidate_ics.xml
index 66cd246..e4257e3 100644
--- a/java/res/drawable/btn_candidate_holo.xml
+++ b/java/res/drawable/btn_candidate_ics.xml
@@ -2,7 +2,7 @@
 <!--
 /*
 **
-** Copyright 2010, The Android Open Source Project
+** Copyright 2011, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
diff --git a/java/res/drawable/btn_keyboard_key_honeycomb.xml b/java/res/drawable/btn_keyboard_key_ics.xml
similarity index 92%
rename from java/res/drawable/btn_keyboard_key_honeycomb.xml
rename to java/res/drawable/btn_keyboard_key_ics.xml
index 3dab843..7335cc2 100644
--- a/java/res/drawable/btn_keyboard_key_honeycomb.xml
+++ b/java/res/drawable/btn_keyboard_key_ics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,7 +14,6 @@
      limitations under the License.
 -->
 
-<!-- TODO: Remove "gingerbread" from file name and rename this to "btn_keyboard_key.xml". -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Functional keys. -->
diff --git a/java/res/drawable/btn_keyboard_key_popup_honeycomb.xml b/java/res/drawable/btn_keyboard_key_popup_ics.xml
similarity index 91%
rename from java/res/drawable/btn_keyboard_key_popup_honeycomb.xml
rename to java/res/drawable/btn_keyboard_key_popup_ics.xml
index f5a191f..8f797ac 100644
--- a/java/res/drawable/btn_keyboard_key_popup_honeycomb.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_ics.xml
@@ -17,4 +17,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_popup_selected_holo" />
+    <item android:drawable="@drawable/btn_keyboard_key_popup_background_holo" />
 </selector>
diff --git a/java/res/drawable/keyboard_key_feedback_honeycomb.xml b/java/res/drawable/keyboard_key_feedback_ics.xml
similarity index 93%
rename from java/res/drawable/keyboard_key_feedback_honeycomb.xml
rename to java/res/drawable/keyboard_key_feedback_ics.xml
index a3ea140..04c8679 100644
--- a/java/res/drawable/keyboard_key_feedback_honeycomb.xml
+++ b/java/res/drawable/keyboard_key_feedback_ics.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!-- Copyright (C) 2011 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/java/res/layout/key_preview.xml b/java/res/layout/key_preview.xml
index 5032dd5..5332d15 100644
--- a/java/res/layout/key_preview.xml
+++ b/java/res/layout/key_preview.xml
@@ -22,7 +22,6 @@
     android:layout_width="wrap_content"
     android:layout_height="80sp"
     android:textSize="40sp"
-    android:textColor="@color/latinkeyboard_key_color_white"
     android:minWidth="32dip"
     android:gravity="center"
     style="?attr/keyPreviewStyle"
diff --git a/java/res/values-land/dimens.xml b/java/res/values-land/dimens.xml
index 7fc1571..b374227 100644
--- a/java/res/values-land/dimens.xml
+++ b/java/res/values-land/dimens.xml
@@ -26,8 +26,12 @@
 <!--    <dimen name="key_height">0.260in</dimen>-->
     <dimen name="key_bottom_gap">0.020in</dimen>
     <dimen name="popup_key_height">0.280in</dimen>
-    <dimen name="keyboard_top_padding">0.0in</dimen>
-    <dimen name="keyboard_bottom_padding">0.0in</dimen>
+    <dimen name="keyboard_top_padding">0.00in</dimen>
+    <dimen name="keyboard_bottom_padding">0.00in</dimen>
+    <dimen name="key_bottom_gap_ics">0.04in</dimen>
+    <dimen name="key_horizontal_gap_ics">0.01in</dimen>
+    <dimen name="keyboard_top_padding_ics">0.03in</dimen>
+    <dimen name="keyboard_bottom_padding_ics">0.00in</dimen>
     <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen>
     <fraction name="key_letter_ratio">55%</fraction>
     <fraction name="key_label_ratio">35%</fraction>
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
index a7167af..9da8f89 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@@ -26,9 +26,13 @@
     <!-- <dimen name="key_height">14.5mm</dimen> -->
     <dimen name="key_bottom_gap">1.3mm</dimen>
     <dimen name="key_horizontal_gap">1.3mm</dimen>
-    <dimen name="popup_key_height">13.0mm</dimen>
     <dimen name="keyboard_top_padding">1.1mm</dimen>
     <dimen name="keyboard_bottom_padding">0.0mm</dimen>
+    <dimen name="key_bottom_gap_ics">1.3mm</dimen>
+    <dimen name="key_horizontal_gap_ics">1.3mm</dimen>
+    <dimen name="keyboard_top_padding_ics">1.1mm</dimen>
+    <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen>
+    <dimen name="popup_key_height">13.0mm</dimen>
     <!-- key_height x 1.0 -->
     <dimen name="key_preview_height">13.0mm</dimen>
 
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index 6125270..c2c0c25 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -32,6 +32,7 @@
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">false</bool>
     <bool name="config_default_sound_enabled">true</bool>
+    <bool name="config_auto_correction_spacebar_led_enabled">false</bool>
     <bool name="config_use_spacebar_language_switcher">false</bool>
     <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
     <bool name="config_show_mini_keyboard_at_touched_point">true</bool>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 8ecf542..6c67746 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -30,6 +30,10 @@
     <dimen name="popup_key_height">10.0mm</dimen>
     <dimen name="keyboard_top_padding">1.1mm</dimen>
     <dimen name="keyboard_bottom_padding">0.0mm</dimen>
+    <dimen name="key_bottom_gap_ics">1.0mm</dimen>
+    <dimen name="key_horizontal_gap_ics">1.0mm</dimen>
+    <dimen name="keyboard_top_padding_ics">1.1mm</dimen>
+    <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen>
     <!-- key_height x 1.0 -->
     <dimen name="key_preview_height">13.0mm</dimen>
     <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen>
diff --git a/java/res/values-sw768dp-land/dimens.xml b/java/res/values-sw768dp-land/dimens.xml
index 73885c2..a6cd85b 100644
--- a/java/res/values-sw768dp-land/dimens.xml
+++ b/java/res/values-sw768dp-land/dimens.xml
@@ -26,9 +26,13 @@
     <!-- <dimen name="key_height">14.5mm</dimen> -->
     <dimen name="key_bottom_gap">1.6mm</dimen>
     <dimen name="key_horizontal_gap">1.6mm</dimen>
-    <dimen name="popup_key_height">13.0mm</dimen>
     <dimen name="keyboard_top_padding">1.1mm</dimen>
     <dimen name="keyboard_bottom_padding">0.0mm</dimen>
+    <dimen name="key_bottom_gap_ics">1.6mm</dimen>
+    <dimen name="key_horizontal_gap_ics">1.6mm</dimen>
+    <dimen name="keyboard_top_padding_ics">1.1mm</dimen>
+    <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen>
+    <dimen name="popup_key_height">13.0mm</dimen>
     <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen>
 
     <fraction name="key_letter_ratio">38%</fraction>
diff --git a/java/res/values-sw768dp/config.xml b/java/res/values-sw768dp/config.xml
index 95d5e7e..dc4c287 100644
--- a/java/res/values-sw768dp/config.xml
+++ b/java/res/values-sw768dp/config.xml
@@ -32,6 +32,7 @@
     <!-- Whether or not Popup on key press is enabled by default -->
     <bool name="config_default_popup_preview">false</bool>
     <bool name="config_default_sound_enabled">true</bool>
+    <bool name="config_auto_correction_spacebar_led_enabled">true</bool>
     <bool name="config_use_spacebar_language_switcher">false</bool>
     <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
     <bool name="config_show_mini_keyboard_at_touched_point">true</bool>
diff --git a/java/res/values-sw768dp/dimens.xml b/java/res/values-sw768dp/dimens.xml
index d8d1332..8152673 100644
--- a/java/res/values-sw768dp/dimens.xml
+++ b/java/res/values-sw768dp/dimens.xml
@@ -27,9 +27,13 @@
     <!-- <dimen name="key_height">14.5mm</dimen> -->
     <dimen name="key_bottom_gap">1.1mm</dimen>
     <dimen name="key_horizontal_gap">1.1mm</dimen>
-    <dimen name="popup_key_height">10.0mm</dimen>
     <dimen name="keyboard_top_padding">1.1mm</dimen>
     <dimen name="keyboard_bottom_padding">0.0mm</dimen>
+    <dimen name="key_bottom_gap_ics">1.1mm</dimen>
+    <dimen name="key_horizontal_gap_ics">1.1mm</dimen>
+    <dimen name="keyboard_top_padding_ics">1.1mm</dimen>
+    <dimen name="keyboard_bottom_padding_ics">0.0mm</dimen>
+    <dimen name="popup_key_height">10.0mm</dimen>
     <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen>
     <dimen name="mini_keyboard_horizontal_padding_holo">40dip</dimen>
     <dimen name="mini_keyboard_key_horizontal_padding">12dip</dimen>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index d8d31e3..5c00510 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -63,10 +63,8 @@
 
         <!-- Layout resource for key press feedback.-->
         <attr name="keyPreviewLayout" format="reference" />
-
         <!-- Vertical offset of the key press feedback from the key. -->
         <attr name="keyPreviewOffset" format="dimension" />
-
         <!-- Height of the key press feedback popup. -->
         <attr name="keyPreviewHeight" format="dimension" />
 
@@ -113,6 +111,9 @@
         <!-- Minimum keyboard height represented in pixels, percentage of display height if fraction
              is positive, or percentage of display width if fraction is negative. -->
         <attr name="minKeyboardHeight" format="dimension|fraction" />
+        <!-- Keyboard top and bottom paddings. -->
+        <attr name="keyboardTopPadding" format="dimension" />
+        <attr name="keyboardBottomPadding" format="dimension" />
         <!-- Default width of a key, in pixels or percentage of display width.
              If the value is zero, the actual key width will be determined to fill out the area up
              to the right edge of the keyboard.
@@ -155,9 +156,6 @@
         <attr name="iconNum8Key" format="reference" />
         <attr name="iconNum9Key" format="reference" />
         <attr name="iconNum0Key" format="reference" />
-        <attr name="iconNumStarKey" format="reference" />
-        <attr name="iconNumPoundKey" format="reference" />
-        <attr name="iconNumAltKey" format="reference" />
         <attr name="iconShiftedShiftKey" format="reference" />
         <attr name="iconPreviewSpaceKey" format="reference" />
         <attr name="iconPreviewTabKey" format="reference" />
@@ -198,8 +196,10 @@
             <flag name="alignRight" value="0x02" />
             <flag name="alignBottom" value="0x08" />
             <flag name="fontNormal" value="0x10" />
-            <flag name="popupHint" value="0x20" />
-            <flag name="hasUppercaseLetter" value="0x40" />
+            <flag name="fontFixedWidth" value="0x20" />
+            <flag name="followKeyLetterRatio" value="0x40" />
+            <flag name="popupHint" value="0x80" />
+            <flag name="hasUppercaseLetter" value="0x100" />
         </attr>
         <!-- The icon to display on the key instead of the label. -->
         <attr name="keyIcon" format="enum">
@@ -224,22 +224,19 @@
             <enum name="iconNum8Key" value="18" />
             <enum name="iconNum9Key" value="19" />
             <enum name="iconNum0Key" value="20" />
-            <enum name="iconNumStarKey" value="21" />
-            <enum name="iconNumPoundKey" value="22" />
-            <enum name="iconNumAltKey" value="23" />
         </attr>
         <!-- Shift key icon for shifted state -->
         <attr name="keyIconShifted" format="enum">
             <!-- This should be aligned with KeyboardIcons.ICON_SHIFTED_* -->
-            <enum name="iconShiftedShiftKey" value="24" />
+            <enum name="iconShiftedShiftKey" value="21" />
         </attr>
         <!-- The icon to show in the popup preview. -->
         <attr name="keyIconPreview" format="enum">
             <!-- This should be aligned with KeyboardIcons.ICON_PREVIEW_* -->
-            <enum name="iconPreviewSpaceKey" value="25" />
-            <enum name="iconPreviewTabKey" value="26" />
-            <enum name="iconPreviewSettingsKey" value="27" />
-            <enum name="iconPreviewShortcutKey" value="28" />
+            <enum name="iconPreviewSpaceKey" value="22" />
+            <enum name="iconPreviewTabKey" value="23" />
+            <enum name="iconPreviewSettingsKey" value="24" />
+            <enum name="iconPreviewShortcutKey" value="25" />
         </attr>
         <!-- The key style to specify a set of key attributes defined by <key_style/> -->
         <attr name="keyStyle" format="string" />
@@ -304,6 +301,7 @@
     </declare-styleable>
 
     <declare-styleable name="LatinKeyboard">
+        <attr name="autoCorrectionSpacebarLedEnabled" format="boolean" />
         <attr name="autoCorrectionSpacebarLedIcon" format="reference" />
         <attr name="disabledShortcutIcon" format="reference" />
         <attr name="spacebarTextColor" format="color" />
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
deleted file mode 100644
index d786918..0000000
--- a/java/res/values/colors.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2008, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License"); 
-** you may not use this file except in compliance with the License. 
-** You may obtain a copy of the License at 
-**
-**     http://www.apache.org/licenses/LICENSE-2.0 
-**
-** Unless required by applicable law or agreed to in writing, software 
-** distributed under the License is distributed on an "AS IS" BASIS, 
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-** See the License for the specific language governing permissions and 
-** limitations under the License.
-*/
--->
-<resources>
-    <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
-    <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
-    <color name="latinkeyboard_bar_language_text">#FFC0C0C0</color>
-    <color name="latinkeyboard_feedback_language_text">#FFFFFFFF</color>
-    <color name="latinkeyboard_key_color_white">#FFFFFFFF</color>
-    <color name="latinkeyboard_key_color_black">#FF000000</color>
-</resources>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index a08e2ae..ad580cc 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -42,6 +42,7 @@
     <bool name="config_default_bigram_prediction">false</bool>
     <bool name="config_default_recorrection_enabled">true</bool>
     <bool name="config_default_sound_enabled">false</bool>
+    <bool name="config_auto_correction_spacebar_led_enabled">true</bool>
     <bool name="config_use_spacebar_language_switcher">true</bool>
     <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false -->
     <bool name="config_show_mini_keyboard_at_touched_point">false</bool>
@@ -66,7 +67,7 @@
     <integer name="config_double_spaces_turn_into_period_timeout">1100</integer>
     <dimen name="config_touch_noise_threshold_distance">2.0mm</dimen>
     <!-- This configuration is the index of the array {@link KeyboardSwitcher.KEYBOARD_THEMES}. -->
-    <string name="config_default_keyboard_theme_id" translatable="false">4</string>
+    <string name="config_default_keyboard_theme_id" translatable="false">5</string>
     <string name="config_text_size_of_language_on_spacebar" translatable="false">small</string>
     <integer name="config_max_popup_keyboard_column">5</integer>
     <string-array name="auto_correction_threshold_values" translatable="false">
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index a76c78a..665245c 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -30,9 +30,15 @@
     <dimen name="popup_key_height">0.330in</dimen>
     <dimen name="keyboard_top_padding">0.00in</dimen>
     <dimen name="keyboard_bottom_padding">0.06in</dimen>
+    <dimen name="key_bottom_gap_stone">0.00in</dimen>
+    <dimen name="key_horizontal_gap_stone">0.00in</dimen>
+    <dimen name="key_bottom_gap_ics">0.06in</dimen>
+    <dimen name="key_horizontal_gap_ics">0.01in</dimen>
+    <dimen name="keyboard_top_padding_ics">0.03in</dimen>
+    <dimen name="keyboard_bottom_padding_ics">0.06in</dimen>
     <dimen name="keyboard_horizontal_edges_padding">0.0in</dimen>
     <dimen name="mini_keyboard_horizontal_padding">16dip</dimen>
-    <dimen name="mini_keyboard_horizontal_padding_holo">32dip</dimen>
+    <dimen name="mini_keyboard_horizontal_padding_holo">38dip</dimen>
     <dimen name="mini_keyboard_key_horizontal_padding">8dip</dimen>
     <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
     <!-- popup_key_height x 1.2 -->
@@ -52,8 +58,7 @@
     <dimen name="key_preview_height">80sp</dimen>
     <dimen name="key_preview_offset">0.1in</dimen>
     <fraction name="key_preview_text_ratio">82%</fraction>
-    <dimen name="key_preview_height_holo">130sp</dimen>
-    <dimen name="key_preview_offset_holo">0.193in</dimen>
+    <dimen name="key_preview_offset_ics">0.05in</dimen>
 
     <dimen name="candidate_strip_height">42dip</dimen>
     <!-- candidate_strip_minimum_height =
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index 2dbfe92..1c198d9 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -38,8 +38,10 @@
     <string name="label_tab_key">Tab</string>
     <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
     <string name="label_to_symbol_key">\?123</string>
-    <!-- Label for "switch to numeric" key.  Must be short to fit on key! -->
-    <string name="label_to_numeric_key">123</string>
+    <!-- Label for "switch to phone numeric" key.  Must be short to fit on key! -->
+    <string name="label_to_phone_numeric_key">123</string>
+    <!-- Label for "switch to phone symbols" key.  Must be short to fit on key! -->
+    <string name="label_to_phone_symbols_key">\uff0a\uff03\uff08</string>
 
     <!-- Option values to show/hide the settings key in onscreen keyboard -->
     <!-- Automatically decide to show or hide the settings key -->
@@ -126,7 +128,7 @@
     <string name="layout_stone_bold">Stone (bold)</string>
     <string name="layout_stone_normal">Stone (normal)</string>
     <string name="layout_gingerbread">Gingerbread</string>
-    <string name="layout_honeycomb">Honeycomb</string>
+    <string name="layout_ics">IceCreamSandwich</string>
 
     <!-- For keyboard theme switcher dialog -->
     <string-array name="keyboard_layout_modes">
@@ -135,7 +137,7 @@
         <item>@string/layout_stone_normal</item>
         <item>@string/layout_stone_bold</item>
         <item>@string/layout_gingerbread</item>
-        <item>@string/layout_honeycomb</item>
+        <item>@string/layout_ics</item>
     </string-array>
     <string-array name="keyboard_layout_modes_values">
         <item>0</item>
diff --git a/java/res/values/keyboard-icons-black.xml b/java/res/values/keyboard-icons-black.xml
index f11a9c4..3ba3455 100644
--- a/java/res/values/keyboard-icons-black.xml
+++ b/java/res/values/keyboard-icons-black.xml
@@ -16,6 +16,7 @@
 
 <resources>
     <style name="KeyboardIcons.Black" parent="android:Theme.Light">
+        <!-- Keyboard icons -->
         <item name="iconShiftKey">@drawable/sym_bkeyboard_shift</item>
         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_bkeyboard_123_mic</item>
         <item name="iconDeleteKey">@drawable/sym_bkeyboard_delete</item>
@@ -35,13 +36,17 @@
         <item name="iconNum8Key">@drawable/sym_bkeyboard_num8</item>
         <item name="iconNum9Key">@drawable/sym_bkeyboard_num9</item>
         <item name="iconNum0Key">@drawable/sym_bkeyboard_num0</item>
-        <item name="iconNumStarKey">@drawable/sym_bkeyboard_numstar</item>
-        <item name="iconNumPoundKey">@drawable/sym_bkeyboard_numpound</item>
-        <item name="iconNumAltKey">@drawable/sym_bkeyboard_numalt</item>
         <item name="iconShiftedShiftKey">@drawable/sym_bkeyboard_shift_locked</item>
         <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>
         <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
         <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</item>
         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>
+        <!-- LatinKeyboard icons -->
+        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
+        <item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
+        <item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
+        <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item>
+        <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item>
     </style>
 </resources>
diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml
deleted file mode 100644
index 5f396ca..0000000
--- a/java/res/values/keyboard-icons-holo.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <style name="KeyboardIcons.Holo" parent="android:Theme.Holo">
-        <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item>
-<!--         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic_holo</item> -->
-        <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item>
-        <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item>
-        <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item>
-        <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item>
-        <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item>
-<!--         <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item> -->
-        <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item>
-        <item name="iconNum1Key">@drawable/sym_keyboard_num1_holo</item>
-        <item name="iconNum2Key">@drawable/sym_keyboard_num2_holo</item>
-        <item name="iconNum3Key">@drawable/sym_keyboard_num3_holo</item>
-        <item name="iconNum4Key">@drawable/sym_keyboard_num4_holo</item>
-        <item name="iconNum5Key">@drawable/sym_keyboard_num5_holo</item>
-        <item name="iconNum6Key">@drawable/sym_keyboard_num6_holo</item>
-        <item name="iconNum7Key">@drawable/sym_keyboard_num7_holo</item>
-        <item name="iconNum8Key">@drawable/sym_keyboard_num8_holo</item>
-        <item name="iconNum9Key">@drawable/sym_keyboard_num9_holo</item>
-        <item name="iconNum0Key">@drawable/sym_keyboard_num0_holo</item>
-        <item name="iconNumStarKey">@drawable/sym_keyboard_numbstar_holo</item>
-        <item name="iconNumPoundKey">@drawable/sym_keyboard_numbpound_holo</item>
-<!--         <item name="iconNumAltKey">@drawable/sym_keyboard_numalt_holo</item> -->
-        <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item>
-        <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_space_holo</item>
-        <item name="iconPreviewTabKey">@drawable/sym_keyboard_tab_holo</item>
-        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item>
-<!--         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_voice_holo</item> -->
-    </style>
-</resources>
diff --git a/java/res/values/keyboard-icons-ics.xml b/java/res/values/keyboard-icons-ics.xml
new file mode 100644
index 0000000..3029695
--- /dev/null
+++ b/java/res/values/keyboard-icons-ics.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <style name="KeyboardIcons.IceCreamSandwich" parent="android:Theme.Holo">
+        <!-- Keyboard icons -->
+<!--         <item name="iconShiftKey">@drawable/sym_keyboard_shift_holo</item> -->
+        <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
+<!--         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_voice_holo</item> -->
+        <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>
+<!--         <item name="iconDeleteKey">@drawable/sym_keyboard_delete_holo</item> -->
+        <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>
+<!--         <item name="iconSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
+        <item name="iconSettingsKey">@drawable/sym_keyboard_settings</item>
+<!--         <item name="iconShortcutKey">@drawable/sym_keyboard_voice_holo</item> -->
+        <item name="iconShortcutKey">@drawable/sym_keyboard_mic</item>
+<!--         <item name="iconSpaceKey">@drawable/sym_keyboard_space_holo</item> -->
+        <item name="iconSpaceKey">@drawable/sym_keyboard_space</item>
+<!--         <item name="iconReturnKey">@drawable/sym_keyboard_return_holo</item> -->
+        <item name="iconReturnKey">@drawable/sym_keyboard_return</item>
+<!--         <item name="iconSearchKey">@drawable/sym_keyboard_search_holo</item> -->
+        <item name="iconSearchKey">@drawable/sym_keyboard_search</item>
+<!--         <item name="iconTabKey">@drawable/sym_keyboard_tab_holo</item> -->
+        <item name="iconTabKey">@drawable/sym_keyboard_tab</item>
+<!--         <item name="iconNum1Key">@drawable/sym_keyboard_num1_holo</item> -->
+<!--         <item name="iconNum2Key">@drawable/sym_keyboard_num2_holo</item> -->
+<!--         <item name="iconNum3Key">@drawable/sym_keyboard_num3_holo</item> -->
+<!--         <item name="iconNum4Key">@drawable/sym_keyboard_num4_holo</item> -->
+<!--         <item name="iconNum5Key">@drawable/sym_keyboard_num5_holo</item> -->
+<!--         <item name="iconNum6Key">@drawable/sym_keyboard_num6_holo</item> -->
+<!--         <item name="iconNum7Key">@drawable/sym_keyboard_num7_holo</item> -->
+<!--         <item name="iconNum8Key">@drawable/sym_keyboard_num8_holo</item> -->
+<!--         <item name="iconNum9Key">@drawable/sym_keyboard_num9_holo</item> -->
+<!--         <item name="iconNum0Key">@drawable/sym_keyboard_num0_holo</item> -->
+<!--         <item name="iconNumStarKey">@drawable/sym_keyboard_numbstar_holo</item> -->
+<!--         <item name="iconNumPoundKey">@drawable/sym_keyboard_numbpound_holo</item> -->
+<!--         <item name="iconNumAltKey">@drawable/sym_keyboard_numalt_holo</item> -->
+        <item name="iconNum1Key">@drawable/sym_keyboard_num1</item>
+        <item name="iconNum2Key">@drawable/sym_keyboard_num2</item>
+        <item name="iconNum3Key">@drawable/sym_keyboard_num3</item>
+        <item name="iconNum4Key">@drawable/sym_keyboard_num4</item>
+        <item name="iconNum5Key">@drawable/sym_keyboard_num5</item>
+        <item name="iconNum6Key">@drawable/sym_keyboard_num6</item>
+        <item name="iconNum7Key">@drawable/sym_keyboard_num7</item>
+        <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>
+        <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>
+        <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
+<!--         <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked_holo</item> -->
+        <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
+        <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_space_holo</item>
+<!--         <item name="iconPreviewTabKey">@drawable/sym_keyboard_tab_holo</item> -->
+        <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
+<!--         <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings_holo</item> -->
+        <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_settings</item>
+<!--         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_voice_holo</item> -->
+        <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>
+        <!-- LatinKeyboard icons -->
+        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
+        <item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
+        <item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
+        <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item>
+        <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item>
+    </style>
+</resources>
diff --git a/java/res/values/keyboard-icons-white.xml b/java/res/values/keyboard-icons-white.xml
index f25f7d4..9f5fb5a 100644
--- a/java/res/values/keyboard-icons-white.xml
+++ b/java/res/values/keyboard-icons-white.xml
@@ -16,6 +16,7 @@
 
 <resources>
     <style name="KeyboardIcons" parent="android:Theme">
+        <!-- Keyboard icons -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift</item>
         <item name="iconToSymbolKeyWithShortcut">@drawable/sym_keyboard_123_mic</item>
         <item name="iconDeleteKey">@drawable/sym_keyboard_delete</item>
@@ -35,13 +36,17 @@
         <item name="iconNum8Key">@drawable/sym_keyboard_num8</item>
         <item name="iconNum9Key">@drawable/sym_keyboard_num9</item>
         <item name="iconNum0Key">@drawable/sym_keyboard_num0</item>
-        <item name="iconNumStarKey">@drawable/sym_keyboard_numstar</item>
-        <item name="iconNumPoundKey">@drawable/sym_keyboard_numpound</item>
-        <item name="iconNumAltKey">@drawable/sym_keyboard_numalt</item>
         <item name="iconShiftedShiftKey">@drawable/sym_keyboard_shift_locked</item>
         <item name="iconPreviewSpaceKey">@drawable/sym_keyboard_feedback_space</item>
         <item name="iconPreviewTabKey">@drawable/sym_keyboard_feedback_tab</item>
         <item name="iconPreviewSettingsKey">@drawable/sym_keyboard_feedback_settings</item>
         <item name="iconPreviewShortcutKey">@drawable/sym_keyboard_feedback_mic</item>
+        <!-- LatinKeyboard icons -->
+        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
+        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
+        <item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
+        <item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
+        <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item>
+        <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item>
     </style>
 </resources>
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 1363f64..05defcb 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -22,19 +22,16 @@
         <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>
         <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>
         <item name="popupKeyboardTemplate">@xml/kbd_popup_template</item>
+        <item name="keyboardTopPadding">@dimen/keyboard_top_padding</item>
+        <item name="keyboardBottomPadding">@dimen/keyboard_bottom_padding</item>
         <item name="horizontalGap">@dimen/key_horizontal_gap</item>
         <item name="verticalGap">@dimen/key_bottom_gap</item>
         <item name="maxPopupKeyboardColumn">@integer/config_max_popup_keyboard_column</item>
     </style>
     <style name="LatinKeyboard">
-        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>
-        <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
-        <item name="spacebarTextColor">@color/latinkeyboard_bar_language_text</item>
-        <item name="spacebarTextShadowColor">@color/latinkeyboard_bar_language_shadow_white</item>
-        <item name="spacebarArrowLeftIcon">@drawable/sym_keyboard_language_arrows_left</item>
-        <item name="spacebarArrowRightIcon">@drawable/sym_keyboard_language_arrows_right</item>
-        <item name="spacebarArrowPreviewLeftIcon">@drawable/sym_keyboard_feedback_language_arrows_left</item>
-        <item name="spacebarArrowPreviewRightIcon">@drawable/sym_keyboard_feedback_language_arrows_right</item>
+        <item name="autoCorrectionSpacebarLedEnabled">@bool/config_auto_correction_spacebar_led_enabled</item>
+        <item name="spacebarTextColor">#FFC0C0C0</item>
+        <item name="spacebarTextShadowColor">#80000000</item>
     </style>
     <style name="KeyboardView">
         <item name="android:background">@drawable/keyboard_background</item>
@@ -62,6 +59,7 @@
     </style>
     <style name="KeyPreviewStyle">
         <item name="android:background">@drawable/keyboard_key_feedback</item>
+        <item name="android:textColor">#FFFFFFFF</item>
     </style>
     <style name="PopupMiniKeyboardView" parent="KeyboardView">
         <item name="keyBackground">@drawable/btn_keyboard_key_popup</item>
@@ -96,21 +94,24 @@
         <item name="keyBackground">@drawable/btn_keyboard_key3</item>
     </style>
     <!-- Theme "Stone" -->
-    <style name="LatinKeyboard.Stone" patent="LatinKeyboard">
+    <style name="Keyboard.Stone" parent="Keyboard">
+        <item name="horizontalGap">@dimen/key_horizontal_gap_stone</item>
+        <item name="verticalGap">@dimen/key_bottom_gap_stone</item>
+    </style>
+    <style name="LatinKeyboard.Stone" parent="LatinKeyboard">
         <item name="spacebarTextColor">#FF444444</item>
-        <item name="spacebarTextShadowColor">@color/latinkeyboard_bar_language_shadow_black</item>
-        <item name="disabledShortcutIcon">@drawable/sym_bkeyboard_voice_off</item>
+        <item name="spacebarTextShadowColor">#80FFFFFF</item>
     </style>
     <style name="KeyboardView.Stone" parent="KeyboardView">
         <item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
-        <item name="keyTextColor">@color/latinkeyboard_key_color_black</item>
+        <item name="keyTextColor">#FF000000</item>
         <item name="keyTextInactivatedColor">#FF808080</item>
-        <item name="shadowColor">@color/latinkeyboard_key_color_white</item>
+        <item name="shadowColor">#FFFFFFFF</item>
     </style>
     <style name="PopupMiniKeyboardView.Stone" parent="PopupMiniKeyboardView">
         <item name="keyBackground">@drawable/btn_keyboard_key_stone</item>
-        <item name="keyTextColor">@color/latinkeyboard_key_color_black</item>
-        <item name="shadowColor">@color/latinkeyboard_key_color_white</item>
+        <item name="keyTextColor">#FF000000</item>
+        <item name="shadowColor">#FFFFFFFF</item>
     </style>
     <!-- Theme "Stone bold" -->
     <style name="KeyboardView.Stone.Bold" parent="KeyboardView.Stone">
@@ -125,49 +126,52 @@
     <style name="PopupMiniKeyboardView.Gingerbread" parent="PopupMiniKeyboardView">
         <item name="android:background">@null</item>
     </style>
-    <!-- Theme "Honeycomb" -->
-    <style name="Keyboard.Honeycomb" parent="Keyboard" >
+    <!-- Theme "IceCreamSandwich" -->
+    <style name="Keyboard.IceCreamSandwich" parent="Keyboard" >
+        <item name="keyboardTopPadding">@dimen/keyboard_top_padding_ics</item>
+        <item name="keyboardBottomPadding">@dimen/keyboard_bottom_padding_ics</item>
+        <item name="horizontalGap">@dimen/key_horizontal_gap_ics</item>
+        <item name="verticalGap">@dimen/key_bottom_gap_ics</item>
     </style>
-    <style name="LatinKeyboard.Honeycomb" parent="LatinKeyboard">
-        <item name="autoCorrectionSpacebarLedIcon">@null</item>
+    <style name="LatinKeyboard.IceCreamSandwich" parent="LatinKeyboard">
         <item name="disabledShortcutIcon">@drawable/sym_keyboard_voice_off_holo</item>
     </style>
-    <style name="KeyboardView.Honeycomb" parent="KeyboardView">
+    <style name="KeyboardView.IceCreamSandwich" parent="KeyboardView">
         <item name="android:background">@drawable/keyboard_background_holo</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_honeycomb</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_ics</item>
         <item name="keyTextStyle">bold</item>
         <item name="keyTextInactivatedColor">#66E0E4E5</item>
         <item name="keyHintLetterColor">#80000000</item>
         <item name="keyUppercaseLetterInactivatedColor">#66E0E4E5</item>
         <item name="keyUppercaseLetterActivatedColor">#FFFFFFFF</item>
-        <item name="keyPopupHintIcon">@drawable/hint_popup_holo</item>
-        <item name="keyPreviewHeight">@dimen/key_preview_height_holo</item>
-        <item name="keyPreviewOffset">@dimen/key_preview_offset_holo</item>
+        <item name="keyPopupHintIcon">@drawable/hint_popup</item>
+        <item name="keyPreviewHeight">@dimen/key_preview_height</item>
+        <item name="keyPreviewOffset">@dimen/key_preview_offset_ics</item>
         <item name="shadowColor">#00000000</item>
         <item name="shadowRadius">0.0</item>
     </style>
-    <style name="KeyPreviewStyle.Honeycomb">
-        <item name="android:background">@drawable/keyboard_key_feedback_honeycomb</item>
+    <style name="KeyPreviewStyle.IceCreamSandwich">
+        <item name="android:background">@drawable/keyboard_key_feedback_ics</item>
     </style>
-    <style name="PopupMiniKeyboardView.Honeycomb" parent="PopupMiniKeyboardView">
+    <style name="PopupMiniKeyboardView.IceCreamSandwich" parent="PopupMiniKeyboardView">
         <item name="android:background">@null</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_honeycomb</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_ics</item>
     </style>
-    <style name="PopupMiniKeyboardPanelStyle.Honeycomb">
+    <style name="PopupMiniKeyboardPanelStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
         <item name="android:paddingLeft">@dimen/mini_keyboard_horizontal_padding_holo</item>
         <item name="android:paddingRight">@dimen/mini_keyboard_horizontal_padding_holo</item>
     </style>
-    <style name="SuggestionsStripBackgroundStyle.Honeycomb">
+    <style name="SuggestionsStripBackgroundStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_suggest_strip_holo</item>
     </style>
-    <style name="SuggestionBackgroundStyle.Honeycomb">
-        <item name="android:background">@drawable/btn_candidate_holo</item>
+    <style name="SuggestionBackgroundStyle.IceCreamSandwich">
+        <item name="android:background">@drawable/btn_candidate_ics</item>
     </style>
-    <style name="SuggestionPreviewBackgroundStyle.Honeycomb">
+    <style name="SuggestionPreviewBackgroundStyle.IceCreamSandwich">
         <item name="android:background">@drawable/keyboard_popup_panel_background_holo</item>
     </style>
-    <style name="CandidateViewStyle.Honeycomb" parent="SuggestionsStripBackgroundStyle.Honeycomb">
+    <style name="CandidateViewStyle.IceCreamSandwich" parent="SuggestionsStripBackgroundStyle.IceCreamSandwich">
         <item name="autoCorrectHighlight">autoCorrectUnderline|autoCorrectInvert</item>
         <item name="colorTypedWord">#FFFFFFFF</item>
         <item name="colorAutoCorrect">#FFFFFFFF</item>
diff --git a/java/res/values/themes-honeycomb.xml b/java/res/values/themes-ics.xml
similarity index 61%
rename from java/res/values/themes-honeycomb.xml
rename to java/res/values/themes-ics.xml
index 07f5b83..33c4081 100644
--- a/java/res/values/themes-honeycomb.xml
+++ b/java/res/values/themes-ics.xml
@@ -15,16 +15,16 @@
 -->
 
 <resources>
-    <style name="KeyboardTheme.Honeycomb" parent="KeyboardIcons.Holo">
-        <item name="keyboardStyle">@style/Keyboard.Honeycomb</item>
-        <item name="latinKeyboardStyle">@style/LatinKeyboard.Honeycomb</item>
-        <item name="keyboardViewStyle">@style/KeyboardView.Honeycomb</item>
-        <item name="keyPreviewStyle">@style/KeyPreviewStyle.Honeycomb</item>
-        <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.Honeycomb</item>
-        <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle.Honeycomb</item>
-        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.Honeycomb</item>
-        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.Honeycomb</item>
-        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.Honeycomb</item>
-        <item name="candidateViewStyle">@style/CandidateViewStyle.Honeycomb</item>
+    <style name="KeyboardTheme.IceCreamSandwich" parent="KeyboardIcons.IceCreamSandwich">
+        <item name="keyboardStyle">@style/Keyboard.IceCreamSandwich</item>
+        <item name="latinKeyboardStyle">@style/LatinKeyboard.IceCreamSandwich</item>
+        <item name="keyboardViewStyle">@style/KeyboardView.IceCreamSandwich</item>
+        <item name="keyPreviewStyle">@style/KeyPreviewStyle.IceCreamSandwich</item>
+        <item name="popupMiniKeyboardViewStyle">@style/PopupMiniKeyboardView.IceCreamSandwich</item>
+        <item name="popupMiniKeyboardPanelStyle">@style/PopupMiniKeyboardPanelStyle.IceCreamSandwich</item>
+        <item name="suggestionsStripBackgroundStyle">@style/SuggestionsStripBackgroundStyle.IceCreamSandwich</item>
+        <item name="suggestionBackgroundStyle">@style/SuggestionBackgroundStyle.IceCreamSandwich</item>
+        <item name="suggestionPreviewBackgroundStyle">@style/SuggestionPreviewBackgroundStyle.IceCreamSandwich</item>
+        <item name="candidateViewStyle">@style/CandidateViewStyle.IceCreamSandwich</item>
     </style>
 </resources>
diff --git a/java/res/values/themes-stone-bold.xml b/java/res/values/themes-stone-bold.xml
index 4955f22..6589807 100644
--- a/java/res/values/themes-stone-bold.xml
+++ b/java/res/values/themes-stone-bold.xml
@@ -16,7 +16,7 @@
 
 <resources>
     <style name="KeyboardTheme.Stone.Bold" parent="KeyboardIcons.Black">
-        <item name="keyboardStyle">@style/Keyboard</item>
+        <item name="keyboardStyle">@style/Keyboard.Stone</item>
         <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
         <item name="keyboardViewStyle">@style/KeyboardView.Stone.Bold</item>
         <item name="keyPreviewStyle">@style/KeyPreviewStyle</item>
diff --git a/java/res/values/themes-stone.xml b/java/res/values/themes-stone.xml
index 39a011b..a8608f6 100644
--- a/java/res/values/themes-stone.xml
+++ b/java/res/values/themes-stone.xml
@@ -16,7 +16,7 @@
 
 <resources>
     <style name="KeyboardTheme.Stone" parent="KeyboardIcons.Black">
-        <item name="keyboardStyle">@style/Keyboard</item>
+        <item name="keyboardStyle">@style/Keyboard.Stone</item>
         <item name="latinKeyboardStyle">@style/LatinKeyboard.Stone</item>
         <item name="keyboardViewStyle">@style/KeyboardView.Stone</item>
         <item name="keyPreviewStyle">@style/KeyPreviewStyle</item>
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 3a370c8..42d7d07 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -92,13 +92,16 @@
             <Row>
                 <Key
                     latin:keyLabel="-"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="+"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="."
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="1"
@@ -116,13 +119,16 @@
             <Row>
                 <Key
                     latin:keyLabel="*"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="/"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel=","
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="4"
@@ -143,13 +149,16 @@
                      edge key. -->
                 <Key
                     latin:keyLabel="("
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="11.00%p"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel=")"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="="
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="9.25%p" />
                 <Key
                     latin:keyLabel="7"
@@ -169,12 +178,13 @@
                     latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
                     latin:keyWidth="27.75%p" />
                 <Key
-                    latin:keyLabel="*"
+                    latin:keyStyle="numStarKeyStyle"
                     latin:keyXPos="38.75%p" />
                 <Key
                     latin:keyLabel="0" />
                 <Key
-                    latin:keyLabel="#" />
+                    latin:keyLabel="#"
+                    latin:keyStyle="numLabelStyle" />
                 <Key
                     latin:keyStyle="shortcutOrSettingsKeyStyle"
                     latin:keyXPos="-11.00%p"
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 133983d..017d003 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -30,10 +30,12 @@
     <Row>
         <Key
             latin:keyLabel="-"
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="15.625%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="+"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
@@ -51,10 +53,12 @@
     <Row>
         <Key
             latin:keyLabel=","
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="15.625%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="."
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
@@ -78,10 +82,12 @@
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:keyLabel="("
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="15.625%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel=")"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -107,7 +113,8 @@
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
-            latin:keyStyle="numPoundKeyStyle" />
+            latin:keyLabel="#"
+            latin:keyStyle="numLabelStyle" />
         <Key
             latin:keyStyle="shortcutOrSettingsKeyStyle"
             latin:keyXPos="-11.00%p"
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index 73b7e4d..168e6b1 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -30,10 +30,12 @@
     <Row>
         <Key
             latin:keyLabel="-"
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="11.00%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="+"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:code="44"
@@ -55,10 +57,12 @@
     <Row>
         <Key
             latin:keyLabel=","
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="11.00%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="."
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:code="59"
@@ -86,12 +90,15 @@
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:keyLabel="("
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel=")"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel="N"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -116,7 +123,8 @@
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
-            latin:keyStyle="numPoundKeyStyle" />
+            latin:keyLabel="#"
+            latin:keyStyle="numLabelStyle" />
         <Key
             latin:keyStyle="shortcutOrSettingsKeyStyle"
             latin:keyXPos="-11.00%p"
diff --git a/java/res/xml-sw768dp/kbd_number.xml b/java/res/xml-sw768dp/kbd_number.xml
index 1e478fd..1ae6984 100644
--- a/java/res/xml-sw768dp/kbd_number.xml
+++ b/java/res/xml-sw768dp/kbd_number.xml
@@ -98,13 +98,16 @@
                     latin:keyEdgeFlags="left" />
                 <Key
                     latin:keyLabel="-"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="+"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="."
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="1"
@@ -122,13 +125,16 @@
             <Row>
                 <Key
                     latin:keyLabel="*"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="/"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel=","
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="4"
@@ -149,13 +155,16 @@
                      edge key. -->
                 <Key
                     latin:keyLabel="("
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="13.829%p"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel=")"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="="
+                    latin:keyStyle="numLabelStyle"
                     latin:keyWidth="8.047%p" />
                 <Key
                     latin:keyLabel="7"
@@ -183,11 +192,13 @@
                     latin:keyWidth="24.140%p" />
                 <Key
                     latin:keyLabel="*"
+                    latin:keyStyle="numLabelStyle"
                     latin:keyXPos="43.125%p" />
                 <Key
                     latin:keyLabel="0" />
                 <Key
-                    latin:keyLabel="#" />
+                    latin:keyLabel="#"
+                    latin:keyStyle="numLabelStyle" />
                 <switch>
                     <case
                         latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml
index b0d9337..6801ac5 100644
--- a/java/res/xml-sw768dp/kbd_phone.xml
+++ b/java/res/xml-sw768dp/kbd_phone.xml
@@ -35,10 +35,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="-"
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="20.400%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="+"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
@@ -60,10 +62,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel=","
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="20.400%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="."
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
@@ -83,10 +87,12 @@
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:keyLabel="("
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="20.400%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel=")"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -117,7 +123,8 @@
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
-            latin:keyStyle="numPoundKeyStyle" />
+            latin:keyLabel="#"
+            latin:keyStyle="numLabelStyle" />
         <switch>
             <case
                 latin:voiceKeyEnabled="true"
diff --git a/java/res/xml-sw768dp/kbd_phone_symbols.xml b/java/res/xml-sw768dp/kbd_phone_symbols.xml
index 120a149..22f78b6 100644
--- a/java/res/xml-sw768dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_phone_symbols.xml
@@ -35,10 +35,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="-"
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="13.829%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="+"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:code="44"
@@ -64,10 +66,12 @@
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel=","
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="13.829%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="."
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:code="59"
@@ -91,13 +95,16 @@
              the touch event on the area, "(" is intentionally not marked as a left edge key. -->
         <Key
             latin:keyLabel="("
+            latin:keyStyle="numLabelStyle"
             latin:keyXPos="13.829%p"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel=")"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyLabel="N"
+            latin:keyStyle="numLabelStyle"
             latin:keyWidth="8.047%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
@@ -128,7 +135,8 @@
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
-            latin:keyStyle="numPoundKeyStyle" />
+            latin:keyLabel="#"
+            latin:keyStyle="numLabelStyle" />
         <switch>
             <case
                 latin:voiceKeyEnabled="true"
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index 0c59fd8..e7d8d31 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -87,7 +87,6 @@
     <key-style
         latin:styleName="spaceKeyStyle"
         latin:code="@integer/key_space"
-        latin:keyIcon="iconSpaceKey"
         latin:keyIconPreview="iconPreviewSpaceKey"
         latin:parentStyle="functionalKeyStyle" />
     <key-style
diff --git a/java/res/xml/kbd_numkey_styles.xml b/java/res/xml/kbd_numkey_styles.xml
index f53046a..3a26a02 100644
--- a/java/res/xml/kbd_numkey_styles.xml
+++ b/java/res/xml/kbd_numkey_styles.xml
@@ -62,17 +62,31 @@
         latin:code="57"
         latin:keyIcon="iconNum9Key" />
     <key-style
+        latin:styleName="numLabelStyle"
+        latin:keyLabelOption="fontFixedWidth|followKeyLetterRatio" />
+    <key-style
+        latin:styleName="numLabelFunctionalStyle"
+        latin:keyLabelOption="fontFixedWidth|followKeyLetterRatio"
+        latin:parentStyle="functionalKeyStyle" />
+    <key-style
         latin:styleName="numStarKeyStyle"
         latin:code="42"
-        latin:keyIcon="iconNumStarKey" />
+        latin:keyLabel="\uff0a"
+        latin:parentStyle="numLabelStyle" />
     <key-style
         latin:styleName="numPoundKeyStyle"
-        latin:code="35"
-        latin:keyIcon="iconNumPoundKey" />
+        latin:keyLabel="#"
+        latin:parentStyle="numLabelStyle" />
     <key-style
-        latin:styleName="numAltKeyStyle"
+        latin:styleName="numSwitchToAltKeyStyle"
         latin:code="@integer/key_switch_alpha_symbol"
-        latin:keyIcon="iconNumAltKey" />
+        latin:keyLabel="@string/label_to_phone_symbols_key"
+        latin:parentStyle="numLabelStyle" />
+    <key-style
+        latin:styleName="numSwitchToNumericKeyStyle"
+        latin:code="@integer/key_switch_alpha_symbol"
+        latin:keyLabel="@string/label_to_phone_numeric_key"
+        latin:parentStyle="numLabelStyle" />
     <key-style
         latin:styleName="numSpaceKeyStyle"
         latin:code="@integer/key_space"
diff --git a/java/res/xml/kbd_phone.xml b/java/res/xml/kbd_phone.xml
index 211f7b7..794528c 100644
--- a/java/res/xml/kbd_phone.xml
+++ b/java/res/xml/kbd_phone.xml
@@ -38,7 +38,7 @@
             latin:keyStyle="num3KeyStyle" />
         <Key
             latin:keyLabel="-"
-            latin:keyStyle="functionalKeyStyle"
+            latin:keyStyle="numLabelFunctionalStyle"
             latin:keyWidth="fillRight"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -52,7 +52,7 @@
             latin:keyStyle="num6KeyStyle" />
         <Key
             latin:keyLabel="."
-            latin:keyStyle="functionalKeyStyle"
+            latin:keyStyle="numLabelFunctionalStyle"
             latin:keyWidth="fillRight"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -73,7 +73,7 @@
         latin:rowEdgeFlags="bottom"
     >
         <Key
-            latin:keyStyle="numAltKeyStyle"
+            latin:keyStyle="numSwitchToAltKeyStyle"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyStyle="num0KeyStyle" />
diff --git a/java/res/xml/kbd_phone_symbols.xml b/java/res/xml/kbd_phone_symbols.xml
index c651363..1405c3c 100644
--- a/java/res/xml/kbd_phone_symbols.xml
+++ b/java/res/xml/kbd_phone_symbols.xml
@@ -31,20 +31,24 @@
     >
         <Key
             latin:keyLabel="("
+            latin:keyStyle="numLabelStyle"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="/" />
+            latin:keyLabel="/"
+            latin:keyStyle="numLabelStyle" />
         <Key
-            latin:keyLabel=")" />
+            latin:keyLabel=")"
+            latin:keyStyle="numLabelStyle" />
         <Key
             latin:keyLabel="-"
-            latin:keyStyle="functionalKeyStyle"
+            latin:keyStyle="numLabelFunctionalStyle"
             latin:keyWidth="fillRight"
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
         <Key
             latin:keyLabel="N"
+            latin:keyStyle="numLabelStyle"
             latin:keyEdgeFlags="left" />
         <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this 
             has changed. -->
@@ -52,10 +56,11 @@
             latin:code="44"
             latin:keyLabel="Pause" />
         <Key
-            latin:keyLabel="," />
+            latin:keyLabel=","
+            latin:keyStyle="numLabelStyle" />
         <Key
             latin:keyLabel="."
-            latin:keyStyle="functionalKeyStyle"
+            latin:keyStyle="numLabelFunctionalStyle"
             latin:keyWidth="fillRight"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -68,7 +73,8 @@
             latin:code="59"
             latin:keyLabel="Wait" />
         <Key
-            latin:keyStyle="numPoundKeyStyle" />
+            latin:keyLabel="#"
+            latin:keyStyle="numLabelStyle" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
@@ -78,11 +84,11 @@
         latin:rowEdgeFlags="bottom"
     >
         <Key
-            latin:code="@integer/key_switch_alpha_symbol"
-            latin:keyLabel="@string/label_to_numeric_key"
+            latin:keyStyle="numSwitchToNumericKeyStyle"
             latin:keyEdgeFlags="left" />
         <Key
-            latin:keyLabel="+" />
+            latin:keyLabel="+"
+            latin:keyStyle="numLabelStyle" />
         <Key
             latin:keyStyle="numSpaceKeyStyle" />
         <Key
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 90cf3d8..1ad5b08 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -54,7 +54,7 @@
         R.style.KeyboardTheme_Stone,
         R.style.KeyboardTheme_Stone_Bold,
         R.style.KeyboardTheme_Gingerbread,
-        R.style.KeyboardTheme_Honeycomb,
+        R.style.KeyboardTheme_IceCreamSandwich,
     };
 
     private SubtypeSwitcher mSubtypeSwitcher;
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
index 6bb8064..a6aef27 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java
@@ -828,16 +828,18 @@
         // For characters, use large font. For labels like "Done", use small font.
         final int labelSize;
         final Typeface labelStyle;
+        if ((keyLabelOption & Key.LABEL_OPTION_FONT_NORMAL) != 0) {
+            labelStyle = Typeface.DEFAULT;
+        } else if ((keyLabelOption & Key.LABEL_OPTION_FONT_FIXED_WIDTH) != 0) {
+            labelStyle = Typeface.MONOSPACE;
+        } else {
+            labelStyle = mKeyTextStyle;
+        }
         if (label.length() > 1) {
-            labelSize = mKeyLabelSize;
-            if ((keyLabelOption & Key.LABEL_OPTION_FONT_NORMAL) != 0) {
-                labelStyle = Typeface.DEFAULT;
-            } else {
-                labelStyle = Typeface.DEFAULT_BOLD;
-            }
+            labelSize = (keyLabelOption & Key.LABEL_OPTION_FOLLOW_KEY_LETTER_RATIO) != 0
+                    ? mKeyLetterSize : mKeyLabelSize;
         } else {
             labelSize = mKeyLetterSize;
-            labelStyle = mKeyTextStyle;
         }
         paint.setTextSize(labelSize);
         paint.setTypeface(labelStyle);
@@ -971,7 +973,6 @@
         if (key.mLabel != null) {
             // TODO Should take care of temporaryShiftLabel here.
             previewText.setCompoundDrawables(null, null, null, null);
-            previewText.setText(adjustCase(tracker.getPreviewText(key)));
             if (key.mLabel.length() > 1) {
                 previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mKeyLetterSize);
                 previewText.setTypeface(Typeface.DEFAULT_BOLD);
@@ -979,6 +980,7 @@
                 previewText.setTextSize(TypedValue.COMPLEX_UNIT_PX, mPreviewTextSize);
                 previewText.setTypeface(mKeyTextStyle);
             }
+            previewText.setText(adjustCase(tracker.getPreviewText(key)));
         } else {
             final Drawable previewIcon = key.getPreviewIcon();
             previewText.setCompoundDrawables(null, null, null,
@@ -1120,7 +1122,7 @@
         miniKeyboardView.setKeyboard(keyboard);
 
         container.measure(MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.AT_MOST),
-                MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.AT_MOST));
+                MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
 
         return miniKeyboardView;
     }
diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
index e741625..0329ee2 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
@@ -60,6 +60,7 @@
     private final Drawable mSpaceIcon;
     private final Drawable mSpacePreviewIcon;
     private final int mSpaceKeyIndex;
+    private final boolean mAutoCorrectionSpacebarLedEnabled;
     private final Drawable mAutoCorrectionSpacebarLedIcon;
     private final Drawable mSpacebarArrowLeftIcon;
     private final Drawable mSpacebarArrowRightIcon;
@@ -123,6 +124,8 @@
 
         final TypedArray a = context.obtainStyledAttributes(
                 null, R.styleable.LatinKeyboard, R.attr.latinKeyboardStyle, R.style.LatinKeyboard);
+        mAutoCorrectionSpacebarLedEnabled = a.getBoolean(
+                R.styleable.LatinKeyboard_autoCorrectionSpacebarLedEnabled, false);
         mAutoCorrectionSpacebarLedIcon = a.getDrawable(
                 R.styleable.LatinKeyboard_autoCorrectionSpacebarLedIcon);
         mDisabledShortcutIcon = a.getDrawable(R.styleable.LatinKeyboard_disabledShortcutIcon);
@@ -179,7 +182,7 @@
     }
 
     public boolean needsAutoCorrectionSpacebarLed() {
-        return mAutoCorrectionSpacebarLedIcon != null;
+        return mAutoCorrectionSpacebarLedEnabled;
     }
 
     /**
@@ -212,7 +215,7 @@
     }
 
     // Layout local language name and left and right arrow on spacebar.
-    private static String layoutSpacebar(Paint paint, Locale locale, Drawable lArrow,
+    private static String layoutSpacebar(Paint paint, Locale locale, Drawable icon, Drawable lArrow,
             Drawable rArrow, int width, int height, float origTextSize) {
         final float arrowWidth = lArrow.getIntrinsicWidth();
         final float arrowHeight = lArrow.getIntrinsicHeight();
@@ -249,7 +252,9 @@
         paint.setTextSize(textSize);
 
         // Place left and right arrow just before and after language text.
-        final float baseline = height * SPACEBAR_LANGUAGE_BASELINE;
+        final float textHeight = -paint.ascent() + paint.descent();
+        final float baseline = (icon != null) ? height * SPACEBAR_LANGUAGE_BASELINE
+                : height / 2 + textHeight / 2;
         final int top = (int)(baseline - arrowHeight);
         final float remains = (width - textWidth) / 2;
         lArrow.setBounds((int)(remains - arrowWidth), top, (int)remains, (int)baseline);
@@ -300,7 +305,7 @@
                 defaultTextSize = 14;
             }
 
-            final String language = layoutSpacebar(paint, inputLocale,
+            final String language = layoutSpacebar(paint, inputLocale, mSpaceIcon,
                     mSpacebarArrowLeftIcon, mSpacebarArrowRightIcon, width, height,
                     getTextSizeFromTheme(mTheme, textStyle, defaultTextSize));
 
diff --git a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java b/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
index 2085404..6180f09 100644
--- a/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/PopupMiniKeyboardView.java
@@ -78,15 +78,12 @@
         final int pointY = parentKey.mY;
         final int miniKeyboardLeft = pointX - miniKeyboard.getDefaultCoordX()
                 + parentKeyboardView.getPaddingLeft();
-        final int miniKeyboardX = Math.max(0, Math.min(miniKeyboardLeft,
+        final int x = Math.max(0, Math.min(miniKeyboardLeft,
                 parentKeyboardView.getWidth() - miniKeyboard.getMinWidth()))
                 - container.getPaddingLeft() + mCoordinates[0];
-        final int miniKeyboardY = pointY - parentKeyboard.getVerticalGap()
+        final int y = pointY - parentKeyboard.getVerticalGap()
                 - (container.getMeasuredHeight() - container.getPaddingBottom())
                 + parentKeyboardView.getPaddingTop() + mCoordinates[1];
-        final int x = miniKeyboardX;
-        final int y = parentKeyboardView.isKeyPreviewPopupEnabled() &&
-                miniKeyboard.isOneRowKeyboard() && keyPreviewY >= 0 ? keyPreviewY : miniKeyboardY;
 
         if (miniKeyboard.setShifted(parentKeyboard.isShiftedOrShiftLocked())) {
             invalidateAllKeys();
diff --git a/java/src/com/android/inputmethod/keyboard/PopupPanel.java b/java/src/com/android/inputmethod/keyboard/PopupPanel.java
index 72fa740..4845467 100644
--- a/java/src/com/android/inputmethod/keyboard/PopupPanel.java
+++ b/java/src/com/android/inputmethod/keyboard/PopupPanel.java
@@ -30,6 +30,7 @@
      * @param keyPreviewY the Y-coordinate of key preview
      * @param window PopupWindow to be used to show this popup panel
      */
+    // TODO: Remove keyPreviewY from argument.
     public void showPanel(KeyboardView parentKeyboardView, Key parentKey,
             PointerTracker tracker, int keyPreviewY, PopupWindow window);
 
diff --git a/java/src/com/android/inputmethod/keyboard/internal/Key.java b/java/src/com/android/inputmethod/keyboard/internal/Key.java
index 5470067..ebd80be 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/Key.java
@@ -49,8 +49,10 @@
     public static final int LABEL_OPTION_ALIGN_RIGHT = 0x02;
     public static final int LABEL_OPTION_ALIGN_BOTTOM = 0x08;
     public static final int LABEL_OPTION_FONT_NORMAL = 0x10;
-    private static final int LABEL_OPTION_POPUP_HINT = 0x20;
-    private static final int LABEL_OPTION_HAS_UPPERCASE_LETTER = 0x40;
+    public static final int LABEL_OPTION_FONT_FIXED_WIDTH = 0x20;
+    public static final int LABEL_OPTION_FOLLOW_KEY_LETTER_RATIO = 0x40;
+    private static final int LABEL_OPTION_POPUP_HINT = 0x80;
+    private static final int LABEL_OPTION_HAS_UPPERCASE_LETTER = 0x100;
 
     /** Icon to display instead of a label. Icon takes precedence over a label */
     private Drawable mIcon;
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
index 9916af5..37b3682 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
@@ -50,18 +50,15 @@
     private static final int ICON_NUM8_KEY = 18;
     private static final int ICON_NUM9_KEY = 19;
     private static final int ICON_NUM0_KEY = 20;
-    private static final int ICON_NUM_STAR_KEY = 21;
-    private static final int ICON_NUM_POUND_KEY = 22;
-    private static final int ICON_NUM_ALT_KEY = 23;
     // This should be aligned with Keyboard.keyIconShifted enum.
-    private static final int ICON_SHIFTED_SHIFT_KEY = 24;
+    private static final int ICON_SHIFTED_SHIFT_KEY = 21;
     // This should be aligned with Keyboard.keyIconPreview enum.
-    private static final int ICON_PREVIEW_SPACE_KEY = 25;
-    private static final int ICON_PREVIEW_TAB_KEY = 26;
-    private static final int ICON_PREVIEW_SETTINGS_KEY = 27;
-    private static final int ICON_PREVIEW_SHORTCUT_KEY = 28;
+    private static final int ICON_PREVIEW_SPACE_KEY = 22;
+    private static final int ICON_PREVIEW_TAB_KEY = 23;
+    private static final int ICON_PREVIEW_SETTINGS_KEY = 24;
+    private static final int ICON_PREVIEW_SHORTCUT_KEY = 25;
 
-    private static final int ICON_LAST = 28;
+    private static final int ICON_LAST = 25;
 
     private final Drawable mIcons[] = new Drawable[ICON_LAST + 1];
 
@@ -107,12 +104,6 @@
             return ICON_NUM9_KEY;
         case R.styleable.Keyboard_iconNum0Key:
             return ICON_NUM0_KEY;
-        case R.styleable.Keyboard_iconNumStarKey:
-            return ICON_NUM_STAR_KEY;
-        case R.styleable.Keyboard_iconNumPoundKey:
-            return ICON_NUM_POUND_KEY;
-        case R.styleable.Keyboard_iconNumAltKey:
-            return ICON_NUM_ALT_KEY;
         case R.styleable.Keyboard_iconShiftedShiftKey:
             return ICON_SHIFTED_SHIFT_KEY;
         case R.styleable.Keyboard_iconPreviewSpaceKey:
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
index 78546f8..d5b3648 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardParser.java
@@ -126,6 +126,8 @@
     private final Context mContext;
     private final Resources mResources;
 
+    private int mKeyboardTopPadding;
+    private int mKeyboardBottomPadding;
     private int mHorizontalEdgesPadding;
     private int mCurrentX = 0;
     private int mCurrentY = 0;
@@ -234,6 +236,10 @@
                     R.styleable.Keyboard_Key_maxPopupKeyboardColumn, 5));
 
             mKeyboard.mIconsSet.loadIcons(keyboardAttr);
+            mKeyboardTopPadding = keyboardAttr.getDimensionPixelSize(
+                    R.styleable.Keyboard_keyboardTopPadding, 0);
+            mKeyboardBottomPadding = keyboardAttr.getDimensionPixelSize(
+                    R.styleable.Keyboard_keyboardBottomPadding, 0);
         } finally {
             keyAttr.recycle();
             keyboardAttr.recycle();
@@ -602,7 +608,7 @@
     }
 
     private void startKeyboard() {
-        mCurrentY += (int)mResources.getDimension(R.dimen.keyboard_top_padding);
+        mCurrentY += mKeyboardTopPadding;
     }
 
     private void startRow(Row row) {
@@ -626,7 +632,7 @@
     }
 
     private void endKeyboard(int defaultVerticalGap) {
-        mCurrentY += (int)mResources.getDimension(R.dimen.keyboard_bottom_padding);
+        mCurrentY += mKeyboardBottomPadding;
         mTotalHeight = mCurrentY - defaultVerticalGap;
     }