diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_black.9.png
new file mode 100644
index 000000000..b84cb4940
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_dark.9.png
new file mode 100644
index 000000000..b84cb4940
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_light.9.png
new file mode 100644
index 000000000..b84cb4940
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_black.9.png
new file mode 100644
index 000000000..7803cace8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_dark.9.png
new file mode 100644
index 000000000..7803cace8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_light.9.png
new file mode 100644
index 000000000..7803cace8
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_active_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png
index 9aa8db60e..a217d02a7 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png
index 5e6a9d6a4..a217d02a7 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_lock_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_lock_holo.9.png
index e5e3f0959..b03b1e484 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_lock_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_lock_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index 04beb7b9f..22e7796d7 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index 9f4587b4a..54263c557 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 7ec33dd20..e3fb1ae33 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 655bc01b1..edb9cc332 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index 138e915d9..1c3daf3fa 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png
index baff85873..a41515f10 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png
index e3a77d61b..e4dd1404f 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_normal.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png
index 431c44967..e997c743d 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_popup_selected.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png
index 5612c51a1..bf79aa495 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_black.9.png
new file mode 100644
index 000000000..4eb86bcaa
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_dark.9.png
new file mode 100644
index 000000000..5fc06c60e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_light.9.png
new file mode 100644
index 000000000..deff562bf
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_black.9.png
new file mode 100644
index 000000000..9297c0fd4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_dark.9.png
new file mode 100644
index 000000000..3b9c63a04
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_light.9.png
new file mode 100644
index 000000000..8a0d5d55c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_normal_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png
index c2e8b3779..e997c743d 100644
Binary files a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_black.9.png
new file mode 100644
index 000000000..60db04795
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_dark.9.png
new file mode 100644
index 000000000..60db04795
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_light.9.png
new file mode 100644
index 000000000..d8b6e44f4
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_popup_selected_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_black.9.png
new file mode 100644
index 000000000..d0cf5bdb5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_dark.9.png
new file mode 100644
index 000000000..d0cf5bdb5
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_light.9.png
new file mode 100644
index 000000000..15f37c30a
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_black.9.png
new file mode 100644
index 000000000..d6cf1b903
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_dark.9.png
new file mode 100644
index 000000000..d6cf1b903
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_light.9.png
new file mode 100644
index 000000000..37190081e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_key_pressed_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_black.9.png
new file mode 100644
index 000000000..3c5a47562
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_dark.9.png
new file mode 100644
index 000000000..814d0e2c1
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_light.9.png
new file mode 100644
index 000000000..3b4592a5f
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_normal_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_black.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_black.9.png
new file mode 100644
index 000000000..e1453cdfe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_dark.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_dark.9.png
new file mode 100644
index 000000000..e1453cdfe
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_light.9.png b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_light.9.png
new file mode 100644
index 000000000..53bb1150e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/btn_keyboard_spacebar_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/highlight_pressed.png b/app/src/main/res/drawable-hdpi/highlight_pressed.png
index 46efeade1..0f02a2b9f 100644
Binary files a/app/src/main/res/drawable-hdpi/highlight_pressed.png and b/app/src/main/res/drawable-hdpi/highlight_pressed.png differ
diff --git a/app/src/main/res/drawable-hdpi/hint_popup.9.png b/app/src/main/res/drawable-hdpi/hint_popup.9.png
index b5ec003e6..99fa84e77 100644
Binary files a/app/src/main/res/drawable-hdpi/hint_popup.9.png and b/app/src/main/res/drawable-hdpi/hint_popup.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_dialog_keyboard.png b/app/src/main/res/drawable-hdpi/ic_dialog_keyboard.png
index c8ada206c..1698d010d 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_dialog_keyboard.png and b/app/src/main/res/drawable-hdpi/ic_dialog_keyboard.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mic_dialog.png b/app/src/main/res/drawable-hdpi/ic_mic_dialog.png
index f55b7e325..340cd08d9 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_mic_dialog.png and b/app/src/main/res/drawable-hdpi/ic_mic_dialog.png differ
diff --git a/app/src/main/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
index 87d4d1ff9..edb4d096f 100644
Binary files a/app/src/main/res/drawable-hdpi/icon.png and b/app/src/main/res/drawable-hdpi/icon.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_dark_background.9.png b/app/src/main/res/drawable-hdpi/keyboard_dark_background.9.png
index 988b06e40..4efa72d84 100644
Binary files a/app/src/main/res/drawable-hdpi/keyboard_dark_background.9.png and b/app/src/main/res/drawable-hdpi/keyboard_dark_background.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background.9.png
index 3d1172dfe..501fb1ce0 100644
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background.9.png and b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_background.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png
index 32403e30c..1b65305ea 100644
Binary files a/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png and b/app/src/main/res/drawable-hdpi/keyboard_key_feedback_more_background.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background.9.png b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background.9.png
index d6b2c7936..329f8810f 100644
Binary files a/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background.9.png and b/app/src/main/res/drawable-hdpi/keyboard_popup_panel_background.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip.9.png b/app/src/main/res/drawable-hdpi/keyboard_suggest_strip.9.png
index 0ccdb6ab2..8ef25b4ca 100644
Binary files a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip.9.png and b/app/src/main/res/drawable-hdpi/keyboard_suggest_strip.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_divider.png b/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_divider.png
index fe2e41922..54f78b057 100644
Binary files a/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_divider.png and b/app/src/main/res/drawable-hdpi/keyboard_suggest_strip_divider.png differ
diff --git a/app/src/main/res/drawable-hdpi/list_selector_background_pressed.9.png b/app/src/main/res/drawable-hdpi/list_selector_background_pressed.9.png
index dc850a908..e997c743d 100644
Binary files a/app/src/main/res/drawable-hdpi/list_selector_background_pressed.9.png and b/app/src/main/res/drawable-hdpi/list_selector_background_pressed.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_123_mic.png b/app/src/main/res/drawable-hdpi/sym_keyboard_123_mic.png
index e38b05519..2c1db8603 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_123_mic.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_123_mic.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_delete.png b/app/src/main/res/drawable-hdpi/sym_keyboard_delete.png
index 459ebcff8..1f3161a2b 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_delete.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_delete.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png
index eb2868368..e8d3d55bd 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_123_mic.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_delete.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_delete.png
index 8322e8e1d..6f317a73a 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_delete.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_delete.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png
index 138e401dd..5d6dd5e91 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_left.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png
index 4e3d68601..5d6dd5e91 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_language_arrows_right.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_mic.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_mic.png
index b3c83f008..f86795439 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_mic.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_mic.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_return.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_return.png
index 786485ebd..7e1119eab 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_return.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_return.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_search.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_search.png
index 7b003e06f..0b39d9b52 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_search.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_search.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_settings.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_settings.png
index 091e30932..5fdc8954b 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_settings.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_settings.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift.png
index abf15f8f9..d9955c311 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png
index 1fd822ea6..d9955c311 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_shift_locked.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_space.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_space.png
index 25be8eb97..7e7e72a2c 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_space.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_space.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_tab.png b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_tab.png
index f841033ba..4cca4718c 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_tab.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_feedback_tab.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_left.png b/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_left.png
index 38c938416..d4c286e42 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_left.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_left.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_right.png b/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_right.png
index f6daa5b9a..d4c286e42 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_right.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_language_arrows_right.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_mic.png b/app/src/main/res/drawable-hdpi/sym_keyboard_mic.png
index 0d6db750d..340cd08d9 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_mic.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_mic.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_return.png b/app/src/main/res/drawable-hdpi/sym_keyboard_return.png
index 144867850..4d7d22096 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_return.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_return.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_search.png b/app/src/main/res/drawable-hdpi/sym_keyboard_search.png
index 7d94eb319..82d1e0ce0 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_search.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_search.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_settings.png b/app/src/main/res/drawable-hdpi/sym_keyboard_settings.png
index 1e70103ec..97ded33b5 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_settings.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_settings.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_shift.png b/app/src/main/res/drawable-hdpi/sym_keyboard_shift.png
index e7b61687d..fc3352ff0 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_shift.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_shift.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked.png b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked.png
index d11b39712..fc3352ff0 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_space.png b/app/src/main/res/drawable-hdpi/sym_keyboard_space.png
index fcd20de7d..0fe7d38ab 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_space.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_space.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_space_led.9.png b/app/src/main/res/drawable-hdpi/sym_keyboard_space_led.9.png
index c28137b41..e4c89f4b2 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_space_led.9.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_space_led.9.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_tab.png b/app/src/main/res/drawable-hdpi/sym_keyboard_tab.png
index 5ee6cf7eb..bd2e0c38e 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_tab.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_tab.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_black.9.png
new file mode 100644
index 000000000..a2be0f789
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_dark.9.png
new file mode 100644
index 000000000..a2be0f789
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_light.9.png
new file mode 100644
index 000000000..a2be0f789
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_black.9.png
new file mode 100644
index 000000000..6438746f6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_dark.9.png
new file mode 100644
index 000000000..6438746f6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_light.9.png
new file mode 100644
index 000000000..6438746f6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_active_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png
index e810c7789..2a10da052 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png
index d449d7600..2a10da052 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_lock_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_lock_holo.9.png
index 678ce1027..c76963710 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_lock_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_lock_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index fa24d5987..8afb5a949 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index f3fc64114..f946e817b 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 8f340d355..1e4106923 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 53ea5f894..8491d52b6 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index 69c84e7ec..d017672a8 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png
index 976083fdf..dd4cf712f 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png
index 02d0fcf93..7a00462b7 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_normal.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png
index 125ff1335..344eaabfe 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_popup_selected.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png
index c39dd4a94..7d323fe5c 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_black.9.png
new file mode 100644
index 000000000..85c6b1a46
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_dark.9.png
new file mode 100644
index 000000000..781d68989
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_light.9.png
new file mode 100644
index 000000000..ae053ad38
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_black.9.png
new file mode 100644
index 000000000..19b747e77
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_dark.9.png
new file mode 100644
index 000000000..bc0881b16
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_light.9.png
new file mode 100644
index 000000000..aa25bc416
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_normal_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png
index 93a6e7921..344eaabfe 100644
Binary files a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_black.9.png
new file mode 100644
index 000000000..9c7e13d42
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_dark.9.png
new file mode 100644
index 000000000..9c7e13d42
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_light.9.png
new file mode 100644
index 000000000..7b2710386
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_popup_selected_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_black.9.png
new file mode 100644
index 000000000..a0980e163
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_dark.9.png
new file mode 100644
index 000000000..a0980e163
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_light.9.png
new file mode 100644
index 000000000..71cb87768
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_black.9.png
new file mode 100644
index 000000000..00b40301c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_dark.9.png
new file mode 100644
index 000000000..00b40301c
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_light.9.png
new file mode 100644
index 000000000..6deec1f4d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_key_pressed_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_black.9.png
new file mode 100644
index 000000000..5dc5953c4
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_dark.9.png
new file mode 100644
index 000000000..e9ba4d48a
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_light.9.png
new file mode 100644
index 000000000..6166ce2b0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_normal_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_black.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_black.9.png
new file mode 100644
index 000000000..8de88f231
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_dark.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_dark.9.png
new file mode 100644
index 000000000..8de88f231
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_light.9.png b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_light.9.png
new file mode 100644
index 000000000..40f9f9128
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/btn_keyboard_spacebar_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/highlight_pressed.png b/app/src/main/res/drawable-mdpi/highlight_pressed.png
index d27f1061a..2c401677f 100644
Binary files a/app/src/main/res/drawable-mdpi/highlight_pressed.png and b/app/src/main/res/drawable-mdpi/highlight_pressed.png differ
diff --git a/app/src/main/res/drawable-mdpi/hint_popup.9.png b/app/src/main/res/drawable-mdpi/hint_popup.9.png
index 444cc26ee..80ecabe86 100644
Binary files a/app/src/main/res/drawable-mdpi/hint_popup.9.png and b/app/src/main/res/drawable-mdpi/hint_popup.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_dialog_keyboard.png b/app/src/main/res/drawable-mdpi/ic_dialog_keyboard.png
index 9a5aada8b..fcc99fd80 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_dialog_keyboard.png and b/app/src/main/res/drawable-mdpi/ic_dialog_keyboard.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mic_dialog.png b/app/src/main/res/drawable-mdpi/ic_mic_dialog.png
index 4e81a7679..8797eb18c 100644
Binary files a/app/src/main/res/drawable-mdpi/ic_mic_dialog.png and b/app/src/main/res/drawable-mdpi/ic_mic_dialog.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png
index 8967be823..df896cd07 100644
Binary files a/app/src/main/res/drawable-mdpi/icon.png and b/app/src/main/res/drawable-mdpi/icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_dark_background.9.png b/app/src/main/res/drawable-mdpi/keyboard_dark_background.9.png
index 4f81704c4..580d109fc 100644
Binary files a/app/src/main/res/drawable-mdpi/keyboard_dark_background.9.png and b/app/src/main/res/drawable-mdpi/keyboard_dark_background.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background.9.png
index a84c19c39..af25d8646 100644
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background.9.png and b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_background.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png
index 2da38de0b..be22e7a7d 100644
Binary files a/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png and b/app/src/main/res/drawable-mdpi/keyboard_key_feedback_more_background.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background.9.png b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background.9.png
index 69bf814c7..fa15148f5 100644
Binary files a/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background.9.png and b/app/src/main/res/drawable-mdpi/keyboard_popup_panel_background.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip.9.png b/app/src/main/res/drawable-mdpi/keyboard_suggest_strip.9.png
index fa6c0feff..559b5a744 100644
Binary files a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip.9.png and b/app/src/main/res/drawable-mdpi/keyboard_suggest_strip.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_divider.png b/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_divider.png
index 6346b42da..8fdca15b7 100644
Binary files a/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_divider.png and b/app/src/main/res/drawable-mdpi/keyboard_suggest_strip_divider.png differ
diff --git a/app/src/main/res/drawable-mdpi/list_selector_background_pressed.9.png b/app/src/main/res/drawable-mdpi/list_selector_background_pressed.9.png
index 199e95ea5..344eaabfe 100644
Binary files a/app/src/main/res/drawable-mdpi/list_selector_background_pressed.9.png and b/app/src/main/res/drawable-mdpi/list_selector_background_pressed.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_123_mic.png b/app/src/main/res/drawable-mdpi/sym_keyboard_123_mic.png
index a75db486d..c526798f3 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_123_mic.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_123_mic.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_delete.png b/app/src/main/res/drawable-mdpi/sym_keyboard_delete.png
index 93160f530..fc111c132 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_delete.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_delete.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png
index 0b12917ea..6b80d798d 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_123_mic.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_delete.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_delete.png
index 8fae8978b..4c6dc83f0 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_delete.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_delete.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png
index 18d951f7f..13d33dfd2 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_left.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png
index fb7a5aef3..13d33dfd2 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_language_arrows_right.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_mic.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_mic.png
index 6c0fdf8f9..f8c51c17e 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_mic.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_mic.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_return.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_return.png
index 56f84db54..4e20e5858 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_return.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_return.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_search.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_search.png
index 8b9c45601..2824b55d6 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_search.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_search.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_settings.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_settings.png
index 3477642cb..11afb17dd 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_settings.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift.png
index 3d836912c..40610cbee 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png
index a19047593..40610cbee 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_shift_locked.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_space.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_space.png
index cd86bc6a4..9def6c3e4 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_space.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_space.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_tab.png b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_tab.png
index 46e8f4fa2..2256bbef0 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_tab.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_feedback_tab.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_left.png b/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_left.png
index 0a2d23272..43c498ac9 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_left.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_left.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_right.png b/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_right.png
index d6e84df71..43c498ac9 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_right.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_language_arrows_right.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_mic.png b/app/src/main/res/drawable-mdpi/sym_keyboard_mic.png
index 0364dd0c5..8797eb18c 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_mic.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_mic.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_return.png b/app/src/main/res/drawable-mdpi/sym_keyboard_return.png
index e9dc982f6..6edf0c953 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_return.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_return.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_search.png b/app/src/main/res/drawable-mdpi/sym_keyboard_search.png
index 710fe79e9..3a6df41cf 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_search.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_search.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_settings.png b/app/src/main/res/drawable-mdpi/sym_keyboard_settings.png
index 0e3acc1ac..8909c3553 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_settings.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_settings.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_shift.png b/app/src/main/res/drawable-mdpi/sym_keyboard_shift.png
index 48818fd86..0b9e5c092 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_shift.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_shift.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked.png b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked.png
index d9bb80415..0b9e5c092 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_space.png b/app/src/main/res/drawable-mdpi/sym_keyboard_space.png
index ee94d3177..7f739f07d 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_space.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_space.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_space_led.9.png b/app/src/main/res/drawable-mdpi/sym_keyboard_space_led.9.png
index 1c1ca2cc7..9c106a22f 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_space_led.9.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_space_led.9.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_tab.png b/app/src/main/res/drawable-mdpi/sym_keyboard_tab.png
index 15965e2a8..cdf7e15c2 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_tab.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_tab.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_black.9.png
new file mode 100644
index 000000000..d259fb16c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_dark.9.png
new file mode 100644
index 000000000..d259fb16c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_light.9.png
new file mode 100644
index 000000000..d259fb16c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_black.9.png
new file mode 100644
index 000000000..d19291719
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_dark.9.png
new file mode 100644
index 000000000..d19291719
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_light.9.png
new file mode 100644
index 000000000..d19291719
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_active_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png
index d990c0258..9f4438139 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png
index 50bf05061..9f4438139 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png
index 6b4ec0bc8..88109631e 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png
index c2f674dcb..204d416a8 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png
index ab8fb2e86..117883304 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png
index 3871689ef..08ad9fdc7 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
index 912506368..58e896bff 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
index 35ce67fdc..ac917d83b 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png
index b26f1d27a..0affebf6f 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png
new file mode 100644
index 000000000..e1c632b02
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_popup_selected.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png
index c23a4b225..8ad4a71f9 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_black.9.png
new file mode 100644
index 000000000..a56352bcf
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_dark.9.png
new file mode 100644
index 000000000..b74091f4c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_light.9.png
new file mode 100644
index 000000000..434b26e11
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_black.9.png
new file mode 100644
index 000000000..5bba1b874
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_dark.9.png
new file mode 100644
index 000000000..e5ba818f2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_light.9.png
new file mode 100644
index 000000000..f49c341f4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_normal_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
index 0c7bfdace..e1c632b02 100644
Binary files a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_black.9.png
new file mode 100644
index 000000000..0ad24c7d7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_dark.9.png
new file mode 100644
index 000000000..0ad24c7d7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_light.9.png
new file mode 100644
index 000000000..53f4c9d98
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_popup_selected_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_black.9.png
new file mode 100644
index 000000000..4f253a99a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_dark.9.png
new file mode 100644
index 000000000..4f253a99a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_light.9.png
new file mode 100644
index 000000000..34d11bb23
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_black.9.png
new file mode 100644
index 000000000..c747e73f4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_dark.9.png
new file mode 100644
index 000000000..c747e73f4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_light.9.png
new file mode 100644
index 000000000..bdcd2cb76
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_key_pressed_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_black.9.png
new file mode 100644
index 000000000..fbc42dbc8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_dark.9.png
new file mode 100644
index 000000000..a5cd87a87
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_light.9.png
new file mode 100644
index 000000000..afdf9121c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_normal_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_black.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_black.9.png
new file mode 100644
index 000000000..36a05b491
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png
new file mode 100644
index 000000000..36a05b491
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_light.9.png b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_light.9.png
new file mode 100644
index 000000000..a36182581
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/btn_keyboard_spacebar_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/hint_popup.9.png b/app/src/main/res/drawable-xhdpi/hint_popup.9.png
new file mode 100644
index 000000000..bd2fc2461
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/hint_popup.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_dialog_keyboard.png b/app/src/main/res/drawable-xhdpi/ic_dialog_keyboard.png
new file mode 100644
index 000000000..59e8fb590
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_dialog_keyboard.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mic_dialog.png b/app/src/main/res/drawable-xhdpi/ic_mic_dialog.png
new file mode 100644
index 000000000..a2f270ef3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_mic_dialog.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png
new file mode 100644
index 000000000..fcfb4d8de
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_dark_background.9.png b/app/src/main/res/drawable-xhdpi/keyboard_dark_background.9.png
new file mode 100644
index 000000000..66c780ea7
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_dark_background.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background.9.png
new file mode 100644
index 000000000..cd52680e9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_background.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png
new file mode 100644
index 000000000..0bd46d9c9
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_key_feedback_more_background.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background.9.png b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background.9.png
new file mode 100644
index 000000000..df3665265
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_popup_panel_background.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip.9.png b/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip.9.png
new file mode 100644
index 000000000..e380fe13c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_divider.png b/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_divider.png
new file mode 100644
index 000000000..82f9cb263
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/keyboard_suggest_strip_divider.png differ
diff --git a/app/src/main/res/drawable-xhdpi/list_selector_background_pressed.9.png b/app/src/main/res/drawable-xhdpi/list_selector_background_pressed.9.png
new file mode 100644
index 000000000..e1c632b02
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/list_selector_background_pressed.9.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_123_mic.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_123_mic.png
new file mode 100644
index 000000000..003da161c
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_123_mic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_delete.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_delete.png
new file mode 100644
index 000000000..798f94ca1
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_delete.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_123_mic.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_123_mic.png
new file mode 100644
index 000000000..44b4b13dc
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_123_mic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_delete.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_delete.png
new file mode 100644
index 000000000..945cd2374
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_delete.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_mic.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_mic.png
new file mode 100644
index 000000000..e2f9219e3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_mic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_return.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_return.png
new file mode 100644
index 000000000..1f8581e8b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_return.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_search.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_search.png
new file mode 100644
index 000000000..392ae06c2
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_search.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_settings.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_settings.png
new file mode 100644
index 000000000..d0b4c3e25
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_shift.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_shift.png
new file mode 100644
index 000000000..0b619f267
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_shift.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_shift_locked.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_shift_locked.png
new file mode 100644
index 000000000..0b619f267
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_shift_locked.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_space.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_space.png
new file mode 100644
index 000000000..0fb768ec8
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_space.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_tab.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_tab.png
new file mode 100644
index 000000000..4ed6df84e
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_feedback_tab.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_mic.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_mic.png
new file mode 100644
index 000000000..a2f270ef3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_mic.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_return.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_return.png
new file mode 100644
index 000000000..d07a7635f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_return.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_search.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_search.png
new file mode 100644
index 000000000..4671e414f
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_search.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_settings.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_settings.png
new file mode 100644
index 000000000..5caedc8e5
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_settings.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift.png
new file mode 100644
index 000000000..3362c3a1b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked.png
new file mode 100644
index 000000000..3362c3a1b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_space.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_space.png
new file mode 100644
index 000000000..a07a47698
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_space.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_tab.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_tab.png
new file mode 100644
index 000000000..65bb3190d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/sym_keyboard_tab.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_black.9.png
index cd322abb3..b93af7d9f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_dark.9.png
index 112656f99..b93af7d9f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_light.9.png
index 0d60bac5d..b93af7d9f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_black.9.png
index e385d977d..f1f1bd48d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png
index c80a06d95..f1f1bd48d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_light.9.png
index 82710a062..f1f1bd48d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png
new file mode 100644
index 000000000..7d2516638
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_active_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png
new file mode 100644
index 000000000..7d2516638
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png
new file mode 100644
index 000000000..3d1dbbfdb
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_lock_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png
new file mode 100644
index 000000000..99fb43425
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png
new file mode 100644
index 000000000..fba88fa82
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png
new file mode 100644
index 000000000..b798791ab
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
new file mode 100644
index 000000000..2f8a4b1ff
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
new file mode 100644
index 000000000..71d0be67e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png
new file mode 100644
index 000000000..cd19940d8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_normal_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_popup_selected.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_popup_selected.9.png
new file mode 100644
index 000000000..ad0cbedef
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_popup_selected.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png
new file mode 100644
index 000000000..46792bcfa
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_black.9.png
index 5345d042c..f1308ab4b 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_dark.9.png
index f2b5e4c0a..eb4cb6c68 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_light.9.png
index 265109d33..9a0d91d7f 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_black.9.png
index 54248ba44..b0f5d9611 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_dark.9.png
index 2166f62ad..c7d1d54e0 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_light.9.png
index 70346218f..845d115e1 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_normal_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png
new file mode 100644
index 000000000..ad0cbedef
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_holo.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_black.9.png
index d1efb6e18..78bb64dde 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png
index d1efb6e18..78bb64dde 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_light.9.png
index 8a6583e7c..c2a396dcf 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_black.9.png
index b74d1ca83..4300aa309 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png
index b74d1ca83..4300aa309 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_light.9.png
index 48ae93f53..f47ddb801 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_black.9.png
index 0a6c2ea79..db4071748 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png
index 0a6c2ea79..db4071748 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_light.9.png
index 65dc814f6..4dcd955ae 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_key_pressed_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_black.9.png
index 064bf8c21..d98039778 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png
index 41e47355e..904e5a270 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_light.9.png
index 6592af209..f905c742d 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_normal_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png
index 43fd10059..07038e1a9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png
index 2f586ffa8..07038e1a9 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png
index 1ca1ae3e9..1ce7d365e 100644
Binary files a/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png and b/app/src/main/res/drawable-xxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/hint_popup.9.png b/app/src/main/res/drawable-xxhdpi/hint_popup.9.png
new file mode 100644
index 000000000..1d608c43e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/hint_popup.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_dialog_keyboard.png b/app/src/main/res/drawable-xxhdpi/ic_dialog_keyboard.png
new file mode 100644
index 000000000..03cbaeef0
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_dialog_keyboard.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mic_dialog.png b/app/src/main/res/drawable-xxhdpi/ic_mic_dialog.png
new file mode 100644
index 000000000..14a4e1d4a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_mic_dialog.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon.png b/app/src/main/res/drawable-xxhdpi/icon.png
new file mode 100644
index 000000000..41ab1d06a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_dark_background.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_dark_background.9.png
new file mode 100644
index 000000000..d896a2eb4
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_dark_background.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background.9.png
new file mode 100644
index 000000000..72b6e4894
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_background.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_more_background.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_more_background.9.png
new file mode 100644
index 000000000..55708afd2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_key_feedback_more_background.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background.9.png
new file mode 100644
index 000000000..8d0942f33
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_popup_panel_background.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip.9.png b/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip.9.png
new file mode 100644
index 000000000..a2eb862a7
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_divider.png b/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_divider.png
new file mode 100644
index 000000000..888a7c54c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/keyboard_suggest_strip_divider.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/list_selector_background_pressed.9.png b/app/src/main/res/drawable-xxhdpi/list_selector_background_pressed.9.png
new file mode 100644
index 000000000..ad0cbedef
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/list_selector_background_pressed.9.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_123_mic.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_123_mic.png
new file mode 100644
index 000000000..2027aaef6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_123_mic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_delete.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_delete.png
new file mode 100644
index 000000000..7e0a52920
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_delete.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_123_mic.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_123_mic.png
new file mode 100644
index 000000000..8fd46ee87
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_123_mic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_delete.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_delete.png
new file mode 100644
index 000000000..f1904bedd
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_delete.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_mic.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_mic.png
new file mode 100644
index 000000000..55f1ea4f2
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_mic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_return.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_return.png
new file mode 100644
index 000000000..de130679a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_return.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_search.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_search.png
new file mode 100644
index 000000000..f29f3673d
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_search.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_settings.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_settings.png
new file mode 100644
index 000000000..ab2b62964
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_settings.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_shift.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_shift.png
new file mode 100644
index 000000000..987c7540e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_shift.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_shift_locked.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_shift_locked.png
new file mode 100644
index 000000000..987c7540e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_shift_locked.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_space.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_space.png
new file mode 100644
index 000000000..5031a6e9f
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_space.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_tab.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_tab.png
new file mode 100644
index 000000000..aade89ab6
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_feedback_tab.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_mic.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_mic.png
new file mode 100644
index 000000000..14a4e1d4a
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_mic.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_return.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_return.png
new file mode 100644
index 000000000..3b8218e02
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_return.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_search.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_search.png
new file mode 100644
index 000000000..1431274e3
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_search.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_settings.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_settings.png
new file mode 100644
index 000000000..eabb0a2ba
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_settings.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift.png
new file mode 100644
index 000000000..49334d83e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked.png
new file mode 100644
index 000000000..49334d83e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_space.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_space.png
new file mode 100644
index 000000000..202d60c13
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_space.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_tab.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_tab.png
new file mode 100644
index 000000000..954a549aa
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_tab.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_black.9.png
new file mode 100644
index 000000000..3a18a9951
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_dark.9.png
new file mode 100644
index 000000000..3a18a9951
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_light.9.png
new file mode 100644
index 000000000..3a18a9951
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_black.9.png
new file mode 100644
index 000000000..6b80ed063
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png
new file mode 100644
index 000000000..6b80ed063
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_light.9.png
new file mode 100644
index 000000000..6b80ed063
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_black.9.png
new file mode 100644
index 000000000..4f75d8357
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_dark.9.png
new file mode 100644
index 000000000..9899d6b9c
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_light.9.png
new file mode 100644
index 000000000..1019f64d9
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_black.9.png
new file mode 100644
index 000000000..41ad40ebd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_dark.9.png
new file mode 100644
index 000000000..eb8f78906
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_light.9.png
new file mode 100644
index 000000000..601a5dbcc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_normal_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_black.9.png
new file mode 100644
index 000000000..4c1477da8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png
new file mode 100644
index 000000000..4c1477da8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_light.9.png
new file mode 100644
index 000000000..f30ebccb1
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_popup_selected_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_black.9.png
new file mode 100644
index 000000000..0e2fc8439
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png
new file mode 100644
index 000000000..0e2fc8439
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_light.9.png
new file mode 100644
index 000000000..c42700b6a
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_off_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_black.9.png
new file mode 100644
index 000000000..68b0dfc10
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png
new file mode 100644
index 000000000..68b0dfc10
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_light.9.png
new file mode 100644
index 000000000..3d710a3bc
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_key_pressed_on_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_black.9.png
new file mode 100644
index 000000000..c95bb4946
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png
new file mode 100644
index 000000000..6c02cfa41
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_light.9.png
new file mode 100644
index 000000000..ed809b42b
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_normal_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png
new file mode 100644
index 000000000..525ad5edd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_black.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png
new file mode 100644
index 000000000..525ad5edd
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_dark.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png
new file mode 100644
index 000000000..920c054ec
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/btn_keyboard_spacebar_pressed_material_light.9.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mic_dialog.png b/app/src/main/res/drawable-xxxhdpi/ic_mic_dialog.png
new file mode 100644
index 000000000..4bb2ecf21
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_mic_dialog.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon.png b/app/src/main/res/drawable-xxxhdpi/icon.png
new file mode 100644
index 000000000..d11a8c6cf
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_mic.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_mic.png
new file mode 100644
index 000000000..4bb2ecf21
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_mic.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_search.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_search.png
new file mode 100644
index 000000000..2d6f5ebf8
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_search.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_settings.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_settings.png
new file mode 100644
index 000000000..507c5edd4
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_settings.png differ
diff --git a/app/src/main/res/drawable/btn_keyboard_key_material_black.xml b/app/src/main/res/drawable/btn_keyboard_key_material_black.xml
index ad22b9afd..279768f5c 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_material_black.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_material_black.xml
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Action keys. -->
-    <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_material_black" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_material_black" />
-
-    <!-- Toggle keys. Use checkable/checked state. -->
-    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_material_black" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_material_black" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_material_black" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_material_black" />
-
-    <!-- Empty background keys. -->
-    <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_material_black" />
-    <item android:state_empty="true"
-          android:drawable="@android:color/transparent" />
-
-    <!-- Normal keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_material_black" />
-    <item android:drawable="@color/key_background_material_black" />
-</selector>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_single="true"
+        android:state_pressed="true"
+        android:drawable="@color/key_background_pressed_material_black" />
+    <item
+        android:state_single="true"
+        android:drawable="@color/key_background_material_black" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_pressed_on_material_black" />
+    <item
+        android:state_checkable="true"
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_pressed_off_material_black" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:state_active="true"
+        android:drawable="@drawable/btn_keyboard_key_active_material_black" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_keyboard_key_normal_on_material_black" />
+    <item
+        android:state_checkable="true"
+        android:drawable="@drawable/btn_keyboard_key_normal_off_material_black" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_spacebar_pressed_material_black" />
+    <item
+        android:drawable="@drawable/btn_keyboard_spacebar_normal_material_black" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_material_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_material_dark.xml
index dd6a2070b..9df749130 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_material_dark.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_material_dark.xml
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Action keys. -->
-    <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_material_dark" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_material_dark" />
-
-    <!-- Toggle keys. Use checkable/checked state. -->
-    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_material_dark" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_material_dark" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_material_dark" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_material_dark" />
-
-    <!-- Empty background keys. -->
-    <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_material_dark" />
-    <item android:state_empty="true"
-          android:drawable="@android:color/transparent" />
-
-    <!-- Normal keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_material_dark" />
-    <item android:drawable="@color/key_background_material_dark" />
-</selector>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_single="true"
+        android:state_pressed="true"
+        android:drawable="@color/key_background_pressed_material_dark" />
+    <item
+        android:state_single="true"
+        android:drawable="@color/key_background_material_dark" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_pressed_on_material_dark" />
+    <item
+        android:state_checkable="true"
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_pressed_off_material_dark" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:state_active="true"
+        android:drawable="@drawable/btn_keyboard_key_active_material_dark" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_keyboard_key_normal_on_material_dark" />
+    <item
+        android:state_checkable="true"
+        android:drawable="@drawable/btn_keyboard_key_normal_off_material_dark" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_spacebar_pressed_material_dark" />
+    <item
+        android:drawable="@drawable/btn_keyboard_spacebar_normal_material_dark" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_material_light.xml b/app/src/main/res/drawable/btn_keyboard_key_material_light.xml
index c2e9db167..2f5fea37f 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_material_light.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_material_light.xml
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- Action keys. -->
-    <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_material_light" />
-    <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_material_light" />
-
-    <!-- Toggle keys. Use checkable/checked state. -->
-    <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_on_material_light" />
-    <item android:state_checkable="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_pressed_off_material_light" />
-    <item android:state_checkable="true" android:state_checked="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_on_material_light" />
-    <item android:state_checkable="true"
-          android:drawable="@drawable/btn_keyboard_key_normal_off_material_light" />
-
-    <!-- Empty background keys. -->
-    <item android:state_empty="true" android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_material_light" />
-    <item android:state_empty="true"
-          android:drawable="@android:color/transparent" />
-
-    <!-- Normal keys. -->
-    <item android:state_pressed="true"
-          android:drawable="@color/key_background_pressed_material_light" />
-    <item android:drawable="@color/key_background_material_light" />
-</selector>
+<selector
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:state_single="true"
+        android:state_pressed="true"
+        android:drawable="@color/key_background_pressed_material_light" />
+    <item
+        android:state_single="true"
+        android:drawable="@color/key_background_material_light" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_pressed_on_material_light" />
+    <item
+        android:state_checkable="true"
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_pressed_off_material_light" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:state_active="true"
+        android:drawable="@drawable/btn_keyboard_key_active_material_light" />
+    <item
+        android:state_checkable="true"
+        android:state_checked="true"
+        android:drawable="@drawable/btn_keyboard_key_normal_on_material_light" />
+    <item
+        android:state_checkable="true"
+        android:drawable="@drawable/btn_keyboard_key_normal_off_material_light" />
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_spacebar_pressed_material_light" />
+    <item
+        android:drawable="@drawable/btn_keyboard_spacebar_normal_material_light" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_gingerbread.xml b/app/src/main/res/layout/input_gingerbread.xml
index 9804f9d89..5c0db67a7 100644
--- a/app/src/main/res/layout/input_gingerbread.xml
+++ b/app/src/main/res/layout/input_gingerbread.xml
@@ -1,34 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/keyboard_bottom_padding"
-        android:background="@drawable/keyboard_dark_background"
-        android:textStyle="bold"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
-        latin:keyTextStyle="bold"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="#ff000000"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:keyBackground="@drawable/btn_keyboard_key_gingerbread"
+    latin:keyTextStyle="bold"
+    latin:keyCursorColor="@color/latinkeyboard_key_color_white"
+    latin:keyHintColor="#ff222222"
+    latin:keyTextColor="@color/latinkeyboard_key_color_white"
+    latin:symbolColorScheme="white"
+    latin:invertSymbols="false"
+    latin:recolorSymbols="true"
+    latin:shadowColor="#bb000000"
+    latin:shadowRadius="2.75"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_ics.xml b/app/src/main/res/layout/input_ics.xml
index 37b50ba00..e1973f9b1 100644
--- a/app/src/main/res/layout/input_ics.xml
+++ b/app/src/main/res/layout/input_ics.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/keyboard_bottom_padding"
-        android:background="@drawable/keyboard_dark_background"
-        android:textStyle="bold"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_ics"
-        latin:keyTextStyle="bold"
-        latin:keyHintColor="#FFCCCCCC"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="@drawable/keyboard_dark_background"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:keyBackground="@drawable/btn_keyboard_key_ics"
+    latin:keyTextStyle="bold"
+    latin:keyCursorColor="@color/latinkeyboard_key_color_white"
+    latin:keyHintColor="#ffcccccc"
+    latin:keyTextColor="@color/latinkeyboard_key_color_white"
+    latin:symbolColorScheme="white"
+    latin:invertSymbols="false"
+    latin:recolorSymbols="false"
+    latin:shadowColor="#00000000"
+    latin:shadowRadius="0.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_ics_darker.xml b/app/src/main/res/layout/input_ics_darker.xml
index 7a0f49a43..489560e7d 100644
--- a/app/src/main/res/layout/input_ics_darker.xml
+++ b/app/src/main/res/layout/input_ics_darker.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/keyboard_bottom_padding"
-        android:background="@drawable/keyboard_dark_background"
-        android:textStyle="bold"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_ics"
-        latin:keyTextStyle="bold"
-        latin:keyHintColor="#FF000000"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="@drawable/keyboard_dark_background"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:keyBackground="@drawable/btn_keyboard_key_ics"
+    latin:keyTextStyle="bold"
+    latin:keyCursorColor="@color/latinkeyboard_key_color_white"
+    latin:keyHintColor="@color/latinkeyboard_key_color_black"
+    latin:keyTextColor="@color/latinkeyboard_key_color_white"
+    latin:symbolColorScheme="white"
+    latin:invertSymbols="false"
+    latin:recolorSymbols="false"
+    latin:shadowColor="#00000000"
+    latin:shadowRadius="0.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_material_black.xml b/app/src/main/res/layout/input_material_black.xml
index 9ac70cb72..52582e8a2 100644
--- a/app/src/main/res/layout/input_material_black.xml
+++ b/app/src/main/res/layout/input_material_black.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/keyboard_bottom_padding"
-        android:background="@drawable/keyboard_background_material_black"
-        latin:keyTextColor="@color/key_text_color_material_black"
-        latin:keyHintColor="@color/key_hint_letter_color_material_black"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_material_black"
-        latin:popupLayout="@layout/input_popup_material_black"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="#ff000000"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:invertSymbols="false"
+    latin:keyBackground="@drawable/btn_keyboard_key_material_black"
+    latin:keyCursorColor="@color/key_text_color_material_black"
+    latin:keyHintColor="@color/key_hint_letter_color_material_black"
+    latin:keyTextColor="@color/key_text_color_material_black"
+    latin:keyTextStyle="bold"
+    latin:recolorSymbols="true"
+    latin:shadowColor="#00000000"
+    latin:shadowRadius="0.0"
+    latin:symbolColorScheme="white"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_material_dark.xml b/app/src/main/res/layout/input_material_dark.xml
index 17d346ef0..28cbfe284 100644
--- a/app/src/main/res/layout/input_material_dark.xml
+++ b/app/src/main/res/layout/input_material_dark.xml
@@ -1,35 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/keyboard_bottom_padding"
-        android:background="@drawable/keyboard_background_material_dark"
-        latin:keyTextColor="@color/key_text_color_material_dark"
-        latin:keyHintColor="@color/key_hint_letter_color_material_dark"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_material_dark"
-        latin:popupLayout="@layout/input_popup_material_dark"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="#ff1f1f1f"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:invertSymbols="false"
+    latin:keyBackground="@drawable/btn_keyboard_key_material_dark"
+    latin:keyCursorColor="@color/key_text_color_material_dark"
+    latin:keyHintColor="@color/key_hint_letter_color_material_dark"
+    latin:keyTextColor="@color/key_text_color_material_dark"
+    latin:keyTextStyle="bold"
+    latin:recolorSymbols="true"
+    latin:shadowColor="#00000000"
+    latin:shadowRadius="0.0"
+    latin:symbolColorScheme="white"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_material_light.xml b/app/src/main/res/layout/input_material_light.xml
index ff5fa90a4..2c3fa1b87 100644
--- a/app/src/main/res/layout/input_material_light.xml
+++ b/app/src/main/res/layout/input_material_light.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="@dimen/keyboard_bottom_padding"
-        android:background="@drawable/keyboard_background_material_light"
-		latin:symbolColorScheme="black"
-        latin:invertSymbols="true"
-	    latin:shadowRadius="0"
-	    latin:shadowColor="#ff777777"
-        latin:keyTextColor="@color/key_text_color_material_light"
-        latin:keyHintColor="@color/key_hint_letter_color_material_light"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_material_light"
-        latin:popupLayout="@layout/input_popup_material_light"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="#fff2f2f2"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:keyBackground="@drawable/btn_keyboard_key_material_light"
+    latin:keyTextStyle="bold"
+    latin:keyCursorColor="@color/key_text_color_material_light"
+    latin:keyHintColor="@color/key_hint_letter_color_material_light"
+    latin:keyTextColor="@color/key_text_color_material_light"
+    latin:symbolColorScheme="black"
+    latin:invertSymbols="false"
+    latin:recolorSymbols="true"
+    latin:shadowColor="#00000000"
+    latin:shadowRadius="0.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_stone_bold.xml b/app/src/main/res/layout/input_stone_bold.xml
index a17679eca..603fa16fa 100644
--- a/app/src/main/res/layout/input_stone_bold.xml
+++ b/app/src/main/res/layout/input_stone_bold.xml
@@ -1,41 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@+id/LatinkeyboardBaseView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/keyboard_background"
-        android:textStyle="bold"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_stone"
-        latin:keyTextColor="@color/latinkeyboard_key_color_black"
-        latin:keyHintColor="#FF777777"
-        latin:keyCursorColor="@color/latinkeyboard_dim_color_black"
-        latin:shadowColor="@color/latinkeyboard_key_color_white"
-        latin:shadowRadius="0"
-        latin:keyTextStyle="bold"
-        latin:symbolColorScheme="black"
-        latin:invertSymbols="true"
-        latin:popupLayout="@layout/input_stone_popup"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="#ff272727"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:keyBackground="@drawable/btn_keyboard_key_stone"
+    latin:keyTextStyle="bold"
+    latin:keyCursorColor="@color/latinkeyboard_key_color_black"
+    latin:keyHintColor="#ff777777"
+    latin:keyTextColor="@color/latinkeyboard_key_color_black"
+    latin:symbolColorScheme="black"
+    latin:invertSymbols="true"
+    latin:recolorSymbols="false"
+    latin:shadowColor="#00000000"
+    latin:shadowRadius="0.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/input_trans_neon.xml b/app/src/main/res/layout/input_trans_neon.xml
index 5cc39635b..1892751fa 100755
--- a/app/src/main/res/layout/input_trans_neon.xml
+++ b/app/src/main/res/layout/input_trans_neon.xml
@@ -1,40 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** Copyright 2010, 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.
-*/
--->
-
 <org.pocketworkstation.pckeyboard.LatinKeyboardView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:latin="http://schemas.android.com/apk/res-auto"
-        android:id="@android:id/keyboardView"
-        android:layout_alignParentBottom="true"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#c0000000"
-        android:verticalCorrection="0dip"
-
-        latin:keyBackground="@drawable/btn_keyboard_key_ics"
-        latin:keyTextColor="#FFFFFFFF"
-        latin:keyHintColor="#FFAAAAAA"
-        latin:keyCursorColor="#FFFFFFFF"
-        latin:shadowColor="#FF33B5E5"
-        latin:shadowRadius="9"
-        latin:keyTextStyle="bold"
-        latin:recolorSymbols="true"
-        latin:backgroundAlpha="32"
-        />
+    android:textStyle="bold"
+    android:id="@id/LatinkeyboardBaseView"
+    android:background="#dd000000"
+    android:paddingBottom="@dimen/keyboard_bottom_padding"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    latin:keyBackground="@drawable/btn_keyboard_key_material_black"
+    latin:keyTextStyle="bold"
+    latin:keyCursorColor="@color/latinkeyboard_key_color_white"
+    latin:keyHintColor="@color/key_hint_letter_color_material_black"
+    latin:keyTextColor="@color/latinkeyboard_key_color_white"
+    latin:symbolColorScheme="white"
+    latin:invertSymbols="false"
+    latin:recolorSymbols="true"
+    latin:shadowColor="#ff33b5e5"
+    latin:shadowRadius="9.0"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:latin="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/keyboard_popup.xml b/app/src/main/res/layout/keyboard_popup.xml
index 65c8a7c55..388e5bf36 100644
--- a/app/src/main/res/layout/keyboard_popup.xml
+++ b/app/src/main/res/layout/keyboard_popup.xml
@@ -1,43 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, 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.
-*/
--->
 <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:background="@drawable/keyboard_popup_panel_background"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        >
+    android:orientation="horizontal"
+    android:background="@drawable/keyboard_popup_panel_background"
+    android:paddingLeft="4.0dip"
+    android:paddingRight="4.0dip"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <org.pocketworkstation.pckeyboard.LatinKeyboardBaseView
-            xmlns:latin="http://schemas.android.com/apk/res-auto"
-            android:id="@+id/LatinKeyboardBaseView"
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/latinkeyboard_transparent"
-
-            latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
-            latin:keyHysteresisDistance="0dip"
-            latin:verticalCorrection="@dimen/mini_keyboard_vertical_correction"
-            latin:keyPreviewLayout="@layout/null_layout"
-            latin:popupLayout="@layout/null_layout"
-            />
-</LinearLayout>
+        android:id="@id/LatinKeyboardBaseView"
+        android:background="@color/latinkeyboard_transparent"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        latin:keyBackground="@drawable/btn_keyboard_key_gingerbread_popup"
+        latin:keyHysteresisDistance="0.0dip"
+        latin:keyPreviewLayout="@layout/null_layout"
+        latin:popupLayout="@layout/null_layout"
+        latin:verticalCorrection="@dimen/mini_keyboard_vertical_correction"
+        latin:keyCursorColor="@color/latinkeyboard_key_color_white"
+        latin:keyHintColor="@color/latinkeyboard_key_color_white"
+        latin:keyTextColor="@color/latinkeyboard_key_color_white"
+        latin:shadowColor="#00000000"
+        latin:shadowRadius="0.0"
+        xmlns:latin="http://schemas.android.com/apk/res-auto" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 27fc15351..250ceabfe 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,30 +21,30 @@
 //    android:color/holo_blue_light=#FF33B5E5
 -->
 <resources>
-    <color name="candidate_normal">#FFFFFFFF</color>
-    <color name="candidate_recommended">#FFFCAE00</color>
-    <color name="candidate_other">#FFFCAE00</color>
+	<color name="candidate_normal">#ffffffff</color>
+    <color name="candidate_other">#ffffffff</color>
+    <color name="candidate_recommended">#ffffffff</color>
     <color name="latinkeyboard_transparent">#00000000</color>
     <color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
-    <color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
-    <color name="latinkeyboard_dim_color_white">#FFDDDDDD</color>
-    <color name="latinkeyboard_dim_color_black">#FF222222</color>
-    <color name="latinkeyboard_extension_background">#A0000000</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>
+    <color name="latinkeyboard_bar_language_shadow_black">#80ffffff</color>
+    <color name="latinkeyboard_dim_color_black">@color/latinkeyboard_key_color_black</color>
+    <color name="latinkeyboard_dim_color_white">@color/latinkeyboard_key_color_white</color>
+    <color name="latinkeyboard_extension_background">#a0000000</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>
 
 <!--Material Keyboard Colors-->
-    <color name="key_background_material_black">#000000</color>
-    <color name="key_background_pressed_material_black">#19FFFFFF</color>
-    <color name="key_text_color_material_black">#CCFFFFFF</color>
-    <color name="key_hint_letter_color_material_black">#80FFFFFF</color>
-    <color name="key_background_material_dark">#263238</color>
-    <color name="key_background_pressed_material_dark">#19FFFFFF</color>
-    <color name="key_text_color_material_dark">#CCFFFFFF</color>
-    <color name="key_hint_letter_color_material_dark">#80FFFFFF</color>
-    <color name="key_background_material_light">#ECEFF1</color>
-    <color name="key_background_pressed_material_light">#2637474F</color>
-    <color name="key_text_color_material_light">#000000</color>
-    <color name="key_hint_letter_color_material_light">#B337474F</color>
+	<color name="key_background_material_black">#00000000</color>
+    <color name="key_background_pressed_material_black">#1affffff</color>
+    <color name="key_text_color_material_black">#ffe3e3e3</color>
+    <color name="key_hint_letter_color_material_black">#ffa8adaf</color>
+    <color name="key_background_material_dark">#00000000</color>
+    <color name="key_background_pressed_material_dark">#1affffff</color>
+    <color name="key_text_color_material_dark">#ffe3e3e3</color>
+    <color name="key_hint_letter_color_material_dark">#ffa8adaf</color>
+    <color name="key_background_material_light">#00000000</color>
+    <color name="key_background_pressed_material_light">#26364a51</color>
+    <color name="key_text_color_material_light">#ff1f1f1f</color>
+    <color name="key_hint_letter_color_material_light">#ff7f8a90</color>
 </resources>
diff --git a/app/src/main/res/xml-de-rNE/kbd_full.xml b/app/src/main/res/xml-de-rNE/kbd_full.xml
index 3cef1e420..2fd8919ad 100644
--- a/app/src/main/res/xml-de-rNE/kbd_full.xml
+++ b/app/src/main/res/xml-de-rNE/kbd_full.xml
@@ -1,408 +1,421 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-** 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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="7.1428571485%p"
-    android:horizontalGap="0px"
-    android:verticalGap="@dimen/key_bottom_gap"
-    android:layoutRows="5"
+    android:horizontalGap="0.0px"
+    android:keyWidth="7.1428537%p"
     android:layoutColumns="14"
->
-    <Row android:rowEdgeFlags="top" android:extension="true">
-        <Key android:keyLabel="F1" android:codes="@integer/key_fkey_f1" android:isModifier="true" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="F2" android:codes="@integer/key_fkey_f2" android:isModifier="true" />
-        <Key android:keyLabel="F3" android:codes="@integer/key_fkey_f3" android:isModifier="true" />
-        <Key android:keyLabel="F4" android:codes="@integer/key_fkey_f4" android:isModifier="true" />
-        <Key android:keyLabel="F5" android:codes="@integer/key_fkey_f5" android:isModifier="true" />
-        <Key android:keyLabel="F6" android:codes="@integer/key_fkey_f6" android:isModifier="true" />
-        <Key android:keyLabel="F7" android:codes="@integer/key_fkey_f7" android:isModifier="true" />
-        <Key android:keyLabel="F8" android:codes="@integer/key_fkey_f8" android:isModifier="true" />
-        <Key android:keyLabel="F9" android:codes="@integer/key_fkey_f9" android:isModifier="true" />
-        <Key android:keyLabel="F10" android:codes="@integer/key_fkey_f10" android:isModifier="true" />
-        <Key android:keyLabel="F11" android:codes="@integer/key_fkey_f11" android:isModifier="true" />
-        <Key android:keyLabel="F12" android:codes="@integer/key_fkey_f12" android:isModifier="true" />
-	<Key
+    android:layoutRows="5"
+    android:verticalGap="@dimen/key_bottom_gap"
+    xmlns:android="http://schemas.android.com/apk/res-auto">
+    <Row
+        android:extension="true"
+        android:rowEdgeFlags="top">
+        <Key
+            android:codes="@integer/key_fkey_f1"
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="F1" />
+        <Key
+            android:codes="@integer/key_fkey_f2"
+            android:isModifier="true"
+            android:keyLabel="F2" />
+        <Key
+            android:codes="@integer/key_fkey_f3"
+            android:isModifier="true"
+            android:keyLabel="F3" />
+        <Key
+            android:codes="@integer/key_fkey_f4"
+            android:isModifier="true"
+            android:keyLabel="F4" />
+        <Key
+            android:codes="@integer/key_fkey_f5"
+            android:isModifier="true"
+            android:keyLabel="F5" />
+        <Key
+            android:codes="@integer/key_fkey_f6"
+            android:isModifier="true"
+            android:keyLabel="F6" />
+        <Key
+            android:codes="@integer/key_fkey_f7"
+            android:isModifier="true"
+            android:keyLabel="F7" />
+        <Key
+            android:codes="@integer/key_fkey_f8"
+            android:isModifier="true"
+            android:keyLabel="F8" />
+        <Key
+            android:codes="@integer/key_fkey_f9"
+            android:isModifier="true"
+            android:keyLabel="F9" />
+        <Key
+            android:codes="@integer/key_fkey_f10"
+            android:isModifier="true"
+            android:keyLabel="F10" />
+        <Key
+            android:codes="@integer/key_fkey_f11"
+            android:isModifier="true"
+            android:keyLabel="F11" />
+        <Key
+            android:codes="@integer/key_fkey_f12"
+            android:isModifier="true"
+            android:keyLabel="F12" />
+        <Key
             android:codes="@integer/key_home"
-            android:isModifier="true"            
+            android:isModifier="true"
             android:keyLabel="Home" />
-	<Key
+        <Key
             android:codes="@integer/key_end"
-            android:isModifier="true"            
-            android:keyLabel="End"
-            android:keyEdgeFlags="right" />
-        />
-    </Row>
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="End" /> /> </Row>
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
         <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
             android:keyLabel="@string/key_tlde_main"
-            android:shiftLabel="@string/key_tlde_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
+            android:keyWidth="4.571426%p"
             android:popupCharacters="@string/key_tlde_alt"
-            android:keyWidth="4.5714285%p"
-            android:keyEdgeFlags="left" />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_tlde_shift" />
         <Key
             android:keyLabel="@string/key_ae01_main"
-            android:shiftLabel="@string/key_ae01_shift"
+            android:popupCharacters="@string/key_ae01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae01_alt" />
+            android:shiftLabel="@string/key_ae01_shift" />
         <Key
             android:keyLabel="@string/key_ae02_main"
-            android:shiftLabel="@string/key_ae02_shift"
+            android:popupCharacters="@string/key_ae02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae02_alt" />
+            android:shiftLabel="@string/key_ae02_shift" />
         <Key
             android:keyLabel="@string/key_ae03_main"
-            android:shiftLabel="@string/key_ae03_shift"
+            android:popupCharacters="@string/key_ae03_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae03_alt" />
+            android:shiftLabel="@string/key_ae03_shift" />
         <Key
             android:keyLabel="@string/key_ae04_main"
-            android:shiftLabel="@string/key_ae04_shift"
+            android:popupCharacters="@string/key_ae04_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae04_alt" />
+            android:shiftLabel="@string/key_ae04_shift" />
         <Key
             android:keyLabel="@string/key_ae05_main"
-            android:shiftLabel="@string/key_ae05_shift"
+            android:popupCharacters="@string/key_ae05_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae05_alt" />
+            android:shiftLabel="@string/key_ae05_shift" />
         <Key
             android:keyLabel="@string/key_ae06_main"
-            android:shiftLabel="@string/key_ae06_shift"
+            android:popupCharacters="@string/key_ae06_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae06_alt" />
+            android:shiftLabel="@string/key_ae06_shift" />
         <Key
             android:keyLabel="@string/key_ae07_main"
-            android:shiftLabel="@string/key_ae07_shift"
+            android:popupCharacters="@string/key_ae07_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae07_alt" />
+            android:shiftLabel="@string/key_ae07_shift" />
         <Key
             android:keyLabel="@string/key_ae08_main"
-            android:shiftLabel="@string/key_ae08_shift"
+            android:popupCharacters="@string/key_ae08_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae08_alt" />
+            android:shiftLabel="@string/key_ae08_shift" />
         <Key
             android:keyLabel="@string/key_ae09_main"
-            android:shiftLabel="@string/key_ae09_shift"
+            android:popupCharacters="@string/key_ae09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae09_alt" />
+            android:shiftLabel="@string/key_ae09_shift" />
         <Key
             android:keyLabel="@string/key_ae10_main"
-            android:shiftLabel="@string/key_ae10_shift"
+            android:popupCharacters="@string/key_ae10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae10_alt" />
+            android:shiftLabel="@string/key_ae10_shift" />
         <Key
             android:keyLabel="@string/key_ae11_main"
-            android:shiftLabel="@string/key_ae11_shift"
+            android:popupCharacters="@string/key_ae11_shift"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae11_shift" />
+            android:shiftLabel="@string/key_ae11_shift" />
         <Key
             android:keyLabel="@string/key_ae12_main"
-            android:shiftLabel="@string/key_ae12_shift"
+            android:popupCharacters="@string/key_ae12_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae12_alt" />
+            android:shiftLabel="@string/key_ae12_shift" />
         <Key
             android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:keyWidth="9.7142855%p"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:keyWidth="9.714281%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_tab"
-            android:keyIcon="@drawable/sym_keyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyLabel="↹" />
         <Key
             android:keyLabel="@string/key_ad01_main"
-            android:shiftLabel="@string/key_ad01_shift"
+            android:popupCharacters="@string/key_ad01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad01_alt" />
+            android:shiftLabel="@string/key_ad01_shift" />
         <Key
             android:keyLabel="@string/key_ad02_main"
-            android:shiftLabel="@string/key_ad02_shift"
+            android:popupCharacters="@string/key_ad02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad02_alt" />
+            android:shiftLabel="@string/key_ad02_shift" />
         <Key
             android:keyLabel="@string/key_ad03_main"
-            android:shiftLabel="@string/key_ad03_shift"
+            android:popupCharacters="@string/key_ad03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad03_alt" />
+            android:shiftLabel="@string/key_ad03_shift" />
         <Key
             android:keyLabel="@string/key_ad04_main"
-            android:shiftLabel="@string/key_ad04_shift"
+            android:popupCharacters="@string/key_ad04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad04_alt" />
+            android:shiftLabel="@string/key_ad04_shift" />
         <Key
             android:keyLabel="@string/key_ad05_main"
-            android:shiftLabel="@string/key_ad05_shift"
+            android:popupCharacters="@string/key_ad05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad05_alt" />
+            android:shiftLabel="@string/key_ad05_shift" />
         <Key
             android:keyLabel="@string/key_ad06_main"
-            android:shiftLabel="@string/key_ad06_shift"
+            android:popupCharacters="@string/key_ad06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad06_alt" />
+            android:shiftLabel="@string/key_ad06_shift" />
         <Key
             android:keyLabel="@string/key_ad07_main"
-            android:shiftLabel="@string/key_ad07_shift"
+            android:popupCharacters="@string/key_ad07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad07_alt" />
+            android:shiftLabel="@string/key_ad07_shift" />
         <Key
             android:keyLabel="@string/key_ad08_main"
-            android:shiftLabel="@string/key_ad08_shift"
+            android:popupCharacters="@string/key_ad08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad08_alt" />
+            android:shiftLabel="@string/key_ad08_shift" />
         <Key
             android:keyLabel="@string/key_ad09_main"
-            android:shiftLabel="@string/key_ad09_shift"
+            android:popupCharacters="@string/key_ad09_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ad09_alt" />
-
+            android:shiftLabel="@string/key_ad09_shift" />
         <Key
             android:keyLabel="@string/key_ad10_main"
-            android:shiftLabel="@string/key_ad10_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="@string/key_ad10_alt"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_ad10_shift" />
         <Key
             android:keyLabel="@string/key_ad11_main"
-            android:shiftLabel="@string/key_ad11_shift"
+            android:popupCharacters="@string/key_ad11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad11_alt" />res/xml/kbd_full.xml
-        <Key
+            android:shiftLabel="@string/key_ad11_shift" />res/xml/kbd_full.xml <Key
             android:keyLabel="@string/key_ad12_main"
-            android:shiftLabel="@string/key_ad12_shift"
+            android:popupCharacters="@string/key_ad12_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad12_alt" />
+            android:shiftLabel="@string/key_ad12_shift" />
         <Key
             android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return" />
     </Row>
     <Row>
         <Key
-            android:keyLabel="Ctrl"
-            android:keyWidth="10.7142855%p"
             android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
             android:isSticky="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyLabel="⎈"
+            android:keyWidth="10.714281%p" />
         <Key
             android:keyLabel="@string/key_ac01_main"
-            android:shiftLabel="@string/key_ac01_shift"
+            android:popupCharacters="@string/key_ac01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac01_alt" />
+            android:shiftLabel="@string/key_ac01_shift" />
         <Key
             android:keyLabel="@string/key_ac02_main"
-            android:shiftLabel="@string/key_ac02_shift"
+            android:popupCharacters="@string/key_ac02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac02_alt" />
+            android:shiftLabel="@string/key_ac02_shift" />
         <Key
             android:keyLabel="@string/key_ac03_main"
-            android:shiftLabel="@string/key_ac03_shift"
+            android:popupCharacters="@string/key_ac03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac03_alt" />
+            android:shiftLabel="@string/key_ac03_shift" />
         <Key
             android:keyLabel="@string/key_ac04_main"
-            android:shiftLabel="@string/key_ac04_shift"
+            android:popupCharacters="@string/key_ac04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac04_alt" />
+            android:shiftLabel="@string/key_ac04_shift" />
         <Key
             android:keyLabel="@string/key_ac05_main"
-            android:shiftLabel="@string/key_ac05_shift"
+            android:popupCharacters="@string/key_ac05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac05_alt" />
+            android:shiftLabel="@string/key_ac05_shift" />
         <Key
             android:keyLabel="@string/key_ac06_main"
-            android:shiftLabel="@string/key_ac06_shift"
+            android:popupCharacters="@string/key_ac06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac06_alt" />
+            android:shiftLabel="@string/key_ac06_shift" />
         <Key
             android:keyLabel="@string/key_ac07_main"
-            android:shiftLabel="@string/key_ac07_shift"
+            android:popupCharacters="@string/key_ac07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac07_alt" />
+            android:shiftLabel="@string/key_ac07_shift" />
         <Key
             android:keyLabel="@string/key_ac08_main"
-            android:shiftLabel="@string/key_ac08_shift"
+            android:popupCharacters="@string/key_ac08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac08_alt" />
+            android:shiftLabel="@string/key_ac08_shift" />
         <Key
             android:keyLabel="@string/key_ac09_main"
-            android:shiftLabel="@string/key_ac09_shift"
+            android:popupCharacters="@string/key_ac09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac09_alt" />
+            android:shiftLabel="@string/key_ac09_shift" />
         <Key
             android:keyLabel="@string/key_ac10_main"
-            android:shiftLabel="@string/key_ac10_shift"
+            android:popupCharacters="@string/key_ac10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac10_alt" />
+            android:shiftLabel="@string/key_ac10_shift" />
         <Key
             android:keyLabel="@string/key_ac11_main"
-            android:shiftLabel="@string/key_ac11_shift"
+            android:popupCharacters="@string/key_ac11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac11_alt" />
+            android:shiftLabel="@string/key_ac11_shift" />
         <Key
             android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:keyWidth="10.714281%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
             android:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            android:keyWidth="14.28571429%p"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_shift"
+            android:keyWidth="14.285719%p" />
         <Key
             android:keyLabel="@string/key_ab01_main"
-            android:shiftLabel="@string/key_ab01_shift"
+            android:popupCharacters="@string/key_ab01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab01_alt" />
+            android:shiftLabel="@string/key_ab01_shift" />
         <Key
             android:keyLabel="@string/key_ab02_main"
-            android:shiftLabel="@string/key_ab02_shift"
+            android:popupCharacters="@string/key_ab02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab02_alt" />
+            android:shiftLabel="@string/key_ab02_shift" />
         <Key
             android:keyLabel="@string/key_ab03_main"
-            android:shiftLabel="@string/key_ab03_shift"
+            android:popupCharacters="@string/key_ab03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab03_alt" />
+            android:shiftLabel="@string/key_ab03_shift" />
         <Key
             android:keyLabel="@string/key_ab04_main"
-            android:shiftLabel="@string/key_ab04_shift"
+            android:popupCharacters="@string/key_ab04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab04_alt" />
+            android:shiftLabel="@string/key_ab04_shift" />
         <Key
             android:keyLabel="@string/key_ab05_main"
-            android:shiftLabel="@string/key_ab05_shift"
+            android:popupCharacters="@string/key_ab05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab05_alt" />
+            android:shiftLabel="@string/key_ab05_shift" />
         <Key
             android:keyLabel="@string/key_ab06_main"
-            android:shiftLabel="@string/key_ab06_shift"
+            android:popupCharacters="@string/key_ab06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab06_alt" />
+            android:shiftLabel="@string/key_ab06_shift" />
         <Key
             android:keyLabel="@string/key_ab07_main"
-            android:shiftLabel="@string/key_ab07_shift"
+            android:popupCharacters="@string/key_ab07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab07_alt" />
+            android:shiftLabel="@string/key_ab07_shift" />
         <Key
             android:keyLabel="@string/key_ab08_main"
-            android:shiftLabel="@string/key_ab08_shift"
+            android:popupCharacters="@string/key_ab08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab08_alt" />
+            android:shiftLabel="@string/key_ab08_shift" />
         <Key
             android:keyLabel="@string/key_ab09_main"
-            android:shiftLabel="@string/key_ab09_shift"
+            android:popupCharacters="@string/key_ab09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab09_alt" />
+            android:shiftLabel="@string/key_ab09_shift" />
         <Key
             android:keyLabel="@string/key_ab10_main"
-            android:shiftLabel="@string/key_ab10_shift"
+            android:popupCharacters="@string/key_ab10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab10_alt" />
+            android:shiftLabel="@string/key_ab10_shift" />
         <Key
             android:codes="@integer/key_dpad_up"
-            android:isRepeatable="true"
-            android:keyLabel="&#x25b3;"
             android:isCursor="true"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="△" />
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
+            android:isModifier="true"
             android:keyEdgeFlags="right"
-            android:isModifier="true" />
+            android:keyIcon="@drawable/sym_keyboard_shift" />
     </Row>
     <Row
-        android:rowEdgeFlags="bottom"
-    >
+        android:rowEdgeFlags="bottom">
         <Key
-            android:keyLabel="Esc"
             android:codes="@integer/key_escape"
-            android:keyWidth="10.7142855%p"
+            android:isModifier="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
-        <Key
-            android:codes="@integer/key_f1"
-            android:isModifier="true" />
+            android:keyLabel="⎋"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_alt_left"
-            android:keyLabel="Alt"
+            android:isModifier="true"
             android:isSticky="true"
-            android:isModifier="true" />
+            android:keyLabel="⎇" />
         <Key
             android:codes="@integer/key_meta_left"
-            android:keyLabel="&#x2756;"
+            android:isModifier="true"
             android:isSticky="true"
+            android:keyLabel="⊞" />
+        <Key
+            android:codes="@integer/key_f1"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_space"
-            android:shiftLabel="@string/key_space_shift"
-            android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
-            android:keyWidth="32.1428571372%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="32.142853%p"
+            android:shiftLabel="@string/key_space_shift" />
         <Key
             android:codes="@integer/key_fn"
-            android:keyLabel="Fn"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyLabel="ƒ" />
         <Key
             android:codes="@integer/key_dpad_center"
-            android:isModifier="true"
             android:isCursor="true"
-            android:keyLabel="&#x25cb;" />
+            android:isModifier="true"
+            android:keyLabel="○" />
         <Key
             android:codes="@integer/key_dpad_left"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25c1;" />
+            android:keyLabel="◁" />
         <Key
             android:codes="@integer/key_dpad_down"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25bd;" />
+            android:keyLabel="▽" />
         <Key
             android:codes="@integer/key_dpad_right"
+            android:isCursor="true"
             android:isModifier="true"
-            android:keyLabel="&#x25b7;"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="▷" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml-de/kbd_full.xml b/app/src/main/res/xml-de/kbd_full.xml
index 858e2b75b..4714fc6bb 100644
--- a/app/src/main/res/xml-de/kbd_full.xml
+++ b/app/src/main/res/xml-de/kbd_full.xml
@@ -1,412 +1,427 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-** 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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="7.1428571485%p"
-    android:horizontalGap="0px"
-    android:verticalGap="@dimen/key_bottom_gap"
-    android:layoutRows="5"
+    android:horizontalGap="0.0px"
+    android:keyWidth="7.1428537%p"
     android:layoutColumns="14"
->
-    <Row android:rowEdgeFlags="top" android:extension="true">
-        <Key android:keyLabel="F1" android:codes="@integer/key_fkey_f1" android:isModifier="true" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="F2" android:codes="@integer/key_fkey_f2" android:isModifier="true" />
-        <Key android:keyLabel="F3" android:codes="@integer/key_fkey_f3" android:isModifier="true" />
-        <Key android:keyLabel="F4" android:codes="@integer/key_fkey_f4" android:isModifier="true" />
-        <Key android:keyLabel="F5" android:codes="@integer/key_fkey_f5" android:isModifier="true" />
-        <Key android:keyLabel="F6" android:codes="@integer/key_fkey_f6" android:isModifier="true" />
-        <Key android:keyLabel="F7" android:codes="@integer/key_fkey_f7" android:isModifier="true" />
-        <Key android:keyLabel="F8" android:codes="@integer/key_fkey_f8" android:isModifier="true" />
-        <Key android:keyLabel="F9" android:codes="@integer/key_fkey_f9" android:isModifier="true" />
-        <Key android:keyLabel="F10" android:codes="@integer/key_fkey_f10" android:isModifier="true" />
-        <Key android:keyLabel="F11" android:codes="@integer/key_fkey_f11" android:isModifier="true" />
-        <Key android:keyLabel="F12" android:codes="@integer/key_fkey_f12" android:isModifier="true" />
-	<Key
+    android:layoutRows="5"
+    android:verticalGap="@dimen/key_bottom_gap"
+    xmlns:android="http://schemas.android.com/apk/res-auto">
+    <Row
+        android:extension="true"
+        android:rowEdgeFlags="top">
+        <Key
+            android:codes="@integer/key_fkey_f1"
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="F1" />
+        <Key
+            android:codes="@integer/key_fkey_f2"
+            android:isModifier="true"
+            android:keyLabel="F2" />
+        <Key
+            android:codes="@integer/key_fkey_f3"
+            android:isModifier="true"
+            android:keyLabel="F3" />
+        <Key
+            android:codes="@integer/key_fkey_f4"
+            android:isModifier="true"
+            android:keyLabel="F4" />
+        <Key
+            android:codes="@integer/key_fkey_f5"
+            android:isModifier="true"
+            android:keyLabel="F5" />
+        <Key
+            android:codes="@integer/key_fkey_f6"
+            android:isModifier="true"
+            android:keyLabel="F6" />
+        <Key
+            android:codes="@integer/key_fkey_f7"
+            android:isModifier="true"
+            android:keyLabel="F7" />
+        <Key
+            android:codes="@integer/key_fkey_f8"
+            android:isModifier="true"
+            android:keyLabel="F8" />
+        <Key
+            android:codes="@integer/key_fkey_f9"
+            android:isModifier="true"
+            android:keyLabel="F9" />
+        <Key
+            android:codes="@integer/key_fkey_f10"
+            android:isModifier="true"
+            android:keyLabel="F10" />
+        <Key
+            android:codes="@integer/key_fkey_f11"
+            android:isModifier="true"
+            android:keyLabel="F11" />
+        <Key
+            android:codes="@integer/key_fkey_f12"
+            android:isModifier="true"
+            android:keyLabel="F12" />
+        <Key
             android:codes="@integer/key_home"
-            android:isModifier="true"            
+            android:isModifier="true"
             android:keyLabel="Home" />
-	<Key
+        <Key
             android:codes="@integer/key_end"
-            android:isModifier="true"            
-            android:keyLabel="End"
-            android:keyEdgeFlags="right" />
-        />
-    </Row>
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="End" /> /> </Row>
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
         <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
             android:keyLabel="@string/key_tlde_main"
-            android:shiftLabel="@string/key_tlde_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
+            android:keyWidth="4.571426%p"
             android:popupCharacters="@string/key_tlde_alt"
-            android:keyWidth="4.5714285%p"
-            android:keyEdgeFlags="left" />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_tlde_shift" />
         <Key
             android:keyLabel="@string/key_ae01_main"
-            android:shiftLabel="@string/key_ae01_shift"
+            android:popupCharacters="@string/key_ae01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae01_alt" />
+            android:shiftLabel="@string/key_ae01_shift" />
         <Key
             android:keyLabel="@string/key_ae02_main"
-            android:shiftLabel="@string/key_ae02_shift"
+            android:popupCharacters="@string/key_ae02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae02_alt" />
+            android:shiftLabel="@string/key_ae02_shift" />
         <Key
             android:keyLabel="@string/key_ae03_main"
-            android:shiftLabel="@string/key_ae03_shift"
+            android:popupCharacters="@string/key_ae03_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae03_alt" />
+            android:shiftLabel="@string/key_ae03_shift" />
         <Key
             android:keyLabel="@string/key_ae04_main"
-            android:shiftLabel="@string/key_ae04_shift"
+            android:popupCharacters="@string/key_ae04_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae04_alt" />
+            android:shiftLabel="@string/key_ae04_shift" />
         <Key
             android:keyLabel="@string/key_ae05_main"
-            android:shiftLabel="@string/key_ae05_shift"
+            android:popupCharacters="@string/key_ae05_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae05_alt" />
+            android:shiftLabel="@string/key_ae05_shift" />
         <Key
             android:keyLabel="@string/key_ae06_main"
-            android:shiftLabel="@string/key_ae06_shift"
+            android:popupCharacters="@string/key_ae06_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae06_alt" />
+            android:shiftLabel="@string/key_ae06_shift" />
         <Key
             android:keyLabel="@string/key_ae07_main"
-            android:shiftLabel="@string/key_ae07_shift"
+            android:popupCharacters="@string/key_ae07_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae07_alt" />
+            android:shiftLabel="@string/key_ae07_shift" />
         <Key
             android:keyLabel="@string/key_ae08_main"
-            android:shiftLabel="@string/key_ae08_shift"
+            android:popupCharacters="@string/key_ae08_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae08_alt" />
+            android:shiftLabel="@string/key_ae08_shift" />
         <Key
             android:keyLabel="@string/key_ae09_main"
-            android:shiftLabel="@string/key_ae09_shift"
+            android:popupCharacters="@string/key_ae09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae09_alt" />
+            android:shiftLabel="@string/key_ae09_shift" />
         <Key
             android:keyLabel="@string/key_ae10_main"
-            android:shiftLabel="@string/key_ae10_shift"
+            android:popupCharacters="@string/key_ae10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae10_alt" />
+            android:shiftLabel="@string/key_ae10_shift" />
         <Key
             android:keyLabel="@string/key_ae11_main"
-            android:shiftLabel="@string/key_ae11_shift"
+            android:popupCharacters="@string/key_ae11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae11_alt" />
+            android:shiftLabel="@string/key_ae11_shift" />
         <Key
             android:keyLabel="@string/key_ae12_main"
-            android:shiftLabel="@string/key_ae12_shift"
+            android:popupCharacters="@string/key_ae12_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae12_alt" />
+            android:shiftLabel="@string/key_ae12_shift" />
         <Key
             android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:keyWidth="9.7142855%p"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:keyWidth="9.714281%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_tab"
-            android:keyIcon="@drawable/sym_keyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyLabel="↹" />
         <Key
             android:keyLabel="@string/key_ad01_main"
-            android:shiftLabel="@string/key_ad01_shift"
+            android:popupCharacters="@string/key_ad01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad01_alt" />
+            android:shiftLabel="@string/key_ad01_shift" />
         <Key
             android:keyLabel="@string/key_ad02_main"
-            android:shiftLabel="@string/key_ad02_shift"
+            android:popupCharacters="@string/key_ad02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad02_alt" />
+            android:shiftLabel="@string/key_ad02_shift" />
         <Key
             android:keyLabel="@string/key_ad03_main"
-            android:shiftLabel="@string/key_ad03_shift"
+            android:popupCharacters="@string/key_ad03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad03_alt" />
+            android:shiftLabel="@string/key_ad03_shift" />
         <Key
             android:keyLabel="@string/key_ad04_main"
-            android:shiftLabel="@string/key_ad04_shift"
+            android:popupCharacters="@string/key_ad04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad04_alt" />
+            android:shiftLabel="@string/key_ad04_shift" />
         <Key
             android:keyLabel="@string/key_ad05_main"
-            android:shiftLabel="@string/key_ad05_shift"
+            android:popupCharacters="@string/key_ad05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad05_alt" />
+            android:shiftLabel="@string/key_ad05_shift" />
         <Key
             android:keyLabel="@string/key_ad06_main"
-            android:shiftLabel="@string/key_ad06_shift"
+            android:popupCharacters="@string/key_ad06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad06_alt" />
+            android:shiftLabel="@string/key_ad06_shift" />
         <Key
             android:keyLabel="@string/key_ad07_main"
-            android:shiftLabel="@string/key_ad07_shift"
+            android:popupCharacters="@string/key_ad07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad07_alt" />
+            android:shiftLabel="@string/key_ad07_shift" />
         <Key
             android:keyLabel="@string/key_ad08_main"
-            android:shiftLabel="@string/key_ad08_shift"
+            android:popupCharacters="@string/key_ad08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad08_alt" />
+            android:shiftLabel="@string/key_ad08_shift" />
         <Key
             android:keyLabel="@string/key_ad09_main"
-            android:shiftLabel="@string/key_ad09_shift"
+            android:popupCharacters="@string/key_ad09_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ad09_alt" />
-
+            android:shiftLabel="@string/key_ad09_shift" />
         <Key
             android:keyLabel="@string/key_ad10_main"
-            android:shiftLabel="@string/key_ad10_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="@string/key_ad10_alt"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_ad10_shift" />
         <Key
             android:keyLabel="@string/key_ad11_main"
-            android:shiftLabel="@string/key_ad11_shift"
+            android:popupCharacters="@string/key_ad11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad11_alt" />res/xml/kbd_full.xml
-        <Key
+            android:shiftLabel="@string/key_ad11_shift" />res/xml/kbd_full.xml <Key
             android:keyLabel="@string/key_ad12_main"
-            android:shiftLabel="@string/key_ad12_shift"
+            android:popupCharacters="@string/key_ad12_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad12_alt" />
+            android:shiftLabel="@string/key_ad12_shift" />
         <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
             android:keyLabel="@string/key_bksl_main"
-            android:shiftLabel="@string/key_bksl_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="@string/key_bksl_alt"
-            android:keyEdgeFlags="right" />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_bksl_shift" />
     </Row>
     <Row>
         <Key
-            android:keyLabel="Ctrl"
-            android:keyWidth="10.7142855%p"
             android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
             android:isSticky="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyLabel="⎈"
+            android:keyWidth="10.714281%p" />
         <Key
             android:keyLabel="@string/key_ac01_main"
-            android:shiftLabel="@string/key_ac01_shift"
+            android:popupCharacters="@string/key_ac01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac01_alt" />
+            android:shiftLabel="@string/key_ac01_shift" />
         <Key
             android:keyLabel="@string/key_ac02_main"
-            android:shiftLabel="@string/key_ac02_shift"
+            android:popupCharacters="@string/key_ac02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac02_alt" />
+            android:shiftLabel="@string/key_ac02_shift" />
         <Key
             android:keyLabel="@string/key_ac03_main"
-            android:shiftLabel="@string/key_ac03_shift"
+            android:popupCharacters="@string/key_ac03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac03_alt" />
+            android:shiftLabel="@string/key_ac03_shift" />
         <Key
             android:keyLabel="@string/key_ac04_main"
-            android:shiftLabel="@string/key_ac04_shift"
+            android:popupCharacters="@string/key_ac04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac04_alt" />
+            android:shiftLabel="@string/key_ac04_shift" />
         <Key
             android:keyLabel="@string/key_ac05_main"
-            android:shiftLabel="@string/key_ac05_shift"
+            android:popupCharacters="@string/key_ac05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac05_alt" />
+            android:shiftLabel="@string/key_ac05_shift" />
         <Key
             android:keyLabel="@string/key_ac06_main"
-            android:shiftLabel="@string/key_ac06_shift"
+            android:popupCharacters="@string/key_ac06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac06_alt" />
+            android:shiftLabel="@string/key_ac06_shift" />
         <Key
             android:keyLabel="@string/key_ac07_main"
-            android:shiftLabel="@string/key_ac07_shift"
+            android:popupCharacters="@string/key_ac07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac07_alt" />
+            android:shiftLabel="@string/key_ac07_shift" />
         <Key
             android:keyLabel="@string/key_ac08_main"
-            android:shiftLabel="@string/key_ac08_shift"
+            android:popupCharacters="@string/key_ac08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac08_alt" />
+            android:shiftLabel="@string/key_ac08_shift" />
         <Key
             android:keyLabel="@string/key_ac09_main"
-            android:shiftLabel="@string/key_ac09_shift"
+            android:popupCharacters="@string/key_ac09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac09_alt" />
+            android:shiftLabel="@string/key_ac09_shift" />
         <Key
             android:keyLabel="@string/key_ac10_main"
-            android:shiftLabel="@string/key_ac10_shift"
+            android:popupCharacters="@string/key_ac10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac10_alt" />
+            android:shiftLabel="@string/key_ac10_shift" />
         <Key
             android:keyLabel="@string/key_ac11_main"
-            android:shiftLabel="@string/key_ac11_shift"
+            android:popupCharacters="@string/key_ac11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac11_alt" />
+            android:shiftLabel="@string/key_ac11_shift" />
         <Key
             android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:keyWidth="10.714281%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
             android:iconPreview="@drawable/sym_keyboard_feedback_shift"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_shift" />
         <Key
+            android:isModifier="true"
             android:keyLabel="@string/key_lsgt_main"
-            android:shiftLabel="@string/key_lsgt_shift"
+            android:popupCharacters="@string/key_lsgt_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_lsgt_alt" />
+            android:shiftLabel="@string/key_lsgt_shift" />
         <Key
             android:keyLabel="@string/key_ab01_main"
-            android:shiftLabel="@string/key_ab01_shift"
+            android:popupCharacters="@string/key_ab01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab01_alt" />
+            android:shiftLabel="@string/key_ab01_shift" />
         <Key
             android:keyLabel="@string/key_ab02_main"
-            android:shiftLabel="@string/key_ab02_shift"
+            android:popupCharacters="@string/key_ab02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab02_alt" />
+            android:shiftLabel="@string/key_ab02_shift" />
         <Key
             android:keyLabel="@string/key_ab03_main"
-            android:shiftLabel="@string/key_ab03_shift"
+            android:popupCharacters="@string/key_ab03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab03_alt" />
+            android:shiftLabel="@string/key_ab03_shift" />
         <Key
             android:keyLabel="@string/key_ab04_main"
-            android:shiftLabel="@string/key_ab04_shift"
+            android:popupCharacters="@string/key_ab04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab04_alt" />
+            android:shiftLabel="@string/key_ab04_shift" />
         <Key
             android:keyLabel="@string/key_ab05_main"
-            android:shiftLabel="@string/key_ab05_shift"
+            android:popupCharacters="@string/key_ab05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab05_alt" />
+            android:shiftLabel="@string/key_ab05_shift" />
         <Key
             android:keyLabel="@string/key_ab06_main"
-            android:shiftLabel="@string/key_ab06_shift"
+            android:popupCharacters="@string/key_ab06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab06_alt" />
+            android:shiftLabel="@string/key_ab06_shift" />
         <Key
             android:keyLabel="@string/key_ab07_main"
-            android:shiftLabel="@string/key_ab07_shift"
+            android:popupCharacters="@string/key_ab07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab07_alt" />
+            android:shiftLabel="@string/key_ab07_shift" />
         <Key
             android:keyLabel="@string/key_ab08_main"
-            android:shiftLabel="@string/key_ab08_shift"
+            android:popupCharacters="@string/key_ab08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab08_alt" />
+            android:shiftLabel="@string/key_ab08_shift" />
         <Key
             android:keyLabel="@string/key_ab09_main"
-            android:shiftLabel="@string/key_ab09_shift"
+            android:popupCharacters="@string/key_ab09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab09_alt" />
+            android:shiftLabel="@string/key_ab09_shift" />
         <Key
             android:keyLabel="@string/key_ab10_main"
-            android:shiftLabel="@string/key_ab10_shift"
+            android:popupCharacters="@string/key_ab10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab10_alt" />
+            android:shiftLabel="@string/key_ab10_shift" />
         <Key
             android:codes="@integer/key_dpad_up"
-            android:isRepeatable="true"
-            android:keyLabel="&#x25b3;"
             android:isCursor="true"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="△" />
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
+            android:isModifier="true"
             android:keyEdgeFlags="right"
-            android:isModifier="true" />
+            android:keyIcon="@drawable/sym_keyboard_shift" />
     </Row>
     <Row
-        android:rowEdgeFlags="bottom"
-    >
+        android:rowEdgeFlags="bottom">
         <Key
-            android:keyLabel="Esc"
             android:codes="@integer/key_escape"
-            android:keyWidth="10.7142855%p"
+            android:isModifier="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
-        <Key
-            android:codes="@integer/key_f1"
-            android:isModifier="true" />
+            android:keyLabel="⎋"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_alt_left"
-            android:keyLabel="Alt"
+            android:isModifier="true"
             android:isSticky="true"
-            android:isModifier="true" />
+            android:keyLabel="⎇" />
         <Key
             android:codes="@integer/key_meta_left"
-            android:keyLabel="&#x2756;"
+            android:isModifier="true"
             android:isSticky="true"
+            android:keyLabel="⊞" />
+        <Key
+            android:codes="@integer/key_f1"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_space"
-            android:shiftLabel="@string/key_space_shift"
-            android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
-            android:keyWidth="32.1428571372%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="32.142853%p"
+            android:shiftLabel="@string/key_space_shift" />
         <Key
             android:codes="@integer/key_fn"
-            android:keyLabel="Fn"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyLabel="ƒ" />
         <Key
             android:codes="@integer/key_dpad_center"
-            android:isModifier="true"
             android:isCursor="true"
-            android:keyLabel="&#x25cb;" />
+            android:isModifier="true"
+            android:keyLabel="○" />
         <Key
             android:codes="@integer/key_dpad_left"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25c1;" />
+            android:keyLabel="◁" />
         <Key
             android:codes="@integer/key_dpad_down"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25bd;" />
+            android:keyLabel="▽" />
         <Key
             android:codes="@integer/key_dpad_right"
+            android:isCursor="true"
             android:isModifier="true"
-            android:keyLabel="&#x25b7;"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="▷" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml-ru/kbd_compact.xml b/app/src/main/res/xml-ru/kbd_compact.xml
new file mode 100644
index 000000000..b030eef10
--- /dev/null
+++ b/app/src/main/res/xml-ru/kbd_compact.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard
+    android:horizontalGap="0.0px"
+    android:keyWidth="9.090912%p"
+    android:layoutColumns="11"
+    android:layoutRows="5"
+    android:verticalGap="0.0px"
+    android:verticalPad="@dimen/key_vertical_pad_compact"
+    xmlns:android="http://schemas.android.com/apk/res/org.pocketworkstation.pckeyboard">
+    <Row
+        android:extension="true">
+        <Key
+            android:codes="@integer/key_escape"
+            android:isModifier="true"
+            android:keyLabel="Esc" />
+        <Key
+            android:keyLabel="`"
+            android:shiftLabel="~" />
+        <Key
+            android:keyLabel="-"
+            android:shiftLabel="_" />
+        <Key
+            android:keyLabel="\\"
+            android:shiftLabel="|" />
+        <Key
+            android:keyLabel=";"
+            android:shiftLabel=":" />
+        <Key
+            android:keyLabel="="
+            android:shiftLabel="+" />
+        <Key
+            android:keyLabel="["
+            android:shiftLabel="{" />
+        <Key
+            android:keyLabel="]"
+            android:shiftLabel="}" />
+        <Key
+            android:codes="@integer/key_home"
+            android:isModifier="true"
+            android:keyLabel="Home" />
+        <Key
+            android:codes="@integer/key_end"
+            android:isModifier="true"
+            android:keyLabel="End" />
+        <Key
+            android:codes="@integer/key_forward_del"
+            android:isModifier="true"
+            android:keyLabel="Del" />
+    </Row>
+    <Row>
+        <Key
+            android:keyEdgeFlags="left"
+            android:keyLabel="1"
+            android:popupCharacters="`"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="!" />
+        <Key
+            android:keyLabel="2"
+            android:popupCharacters="~"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="&quot;" />
+        <Key
+            android:keyLabel="3"
+            android:popupCharacters="-"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="№" />
+        <Key
+            android:keyLabel="4"
+            android:popupCharacters="_"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=";" />
+        <Key
+            android:keyLabel="5"
+            android:popupCharacters="="
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="%" />
+        <Key
+            android:keyLabel="6"
+            android:popupCharacters="+"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=":" />
+        <Key
+            android:keyLabel="7"
+            android:popupCharacters="{"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="\?" />
+        <Key
+            android:keyLabel="8"
+            android:popupCharacters="}"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="*" />
+        <Key
+            android:keyLabel="9"
+            android:popupCharacters="["
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="(" />
+        <Key
+            android:keyLabel="0"
+            android:popupCharacters="]"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=")" />
+        <Key
+            android:codes="@integer/key_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete" />
+    </Row>
+    <Row>
+        <Key
+            android:keyEdgeFlags="left"
+            android:keyLabel="й"
+            android:popupCharacters="q"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ц"
+            android:popupCharacters="w"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="у"
+            android:popupCharacters="e"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="к"
+            android:popupCharacters="r"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="е"
+            android:popupCharacters="tёЁ"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="н"
+            android:popupCharacters="y"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="г"
+            android:popupCharacters="u"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ш"
+            android:popupCharacters="i"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="щ"
+            android:popupCharacters="o"
+            android:popupKeyboard="@xml/kbd_popup_narrow_template" />
+        <Key
+            android:keyLabel="з"
+            android:popupCharacters="p"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyEdgeFlags="right"
+            android:keyLabel="х"
+            android:popupCharacters="/\\|"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+    </Row>
+    <Row>
+        <Key
+            android:keyEdgeFlags="left"
+            android:keyLabel="ф"
+            android:popupCharacters="a"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ы"
+            android:popupCharacters="s"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="в"
+            android:popupCharacters="d"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="а"
+            android:popupCharacters="f"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="п"
+            android:popupCharacters="g"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="р"
+            android:popupCharacters="h₽"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="о"
+            android:popupCharacters="j"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="л"
+            android:popupCharacters="k"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="д"
+            android:popupCharacters="l"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ж"
+            android:popupCharacters=";:"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyEdgeFlags="right"
+            android:keyLabel="э"
+            android:popupCharacters="'"
+            android:popupKeyboard="@xml/kbd_popup_template" /> />
+</Row>
+    <Row>
+        <Key
+            android:codes="@integer/key_shift"
+            android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_shift" />
+        <Key
+            android:keyLabel="я"
+            android:popupCharacters="z"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ч"
+            android:popupCharacters="x"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="с"
+            android:popupCharacters="c"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="м"
+            android:popupCharacters="v"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="и"
+            android:popupCharacters="b"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="т"
+            android:popupCharacters="n"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ь"
+            android:popupCharacters="mъ"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="б"
+            android:popupCharacters=",&lt;"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyIcon="@drawable/hint_popup"
+            android:keyLabel="ю"
+            android:popupCharacters=".>"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:codes="@integer/key_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return" />
+    </Row>
+    <Row
+        android:rowEdgeFlags="bottom">
+        <Key
+            android:codes="@integer/key_fn"
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="ƒ" />
+        <Key
+            android:codes="@integer/key_alt_left"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyLabel="⎇" />
+        <Key
+            android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyLabel="⎈" />
+        <Key
+            android:codes="@integer/key_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true"
+            android:keyLabel="↹"
+            android:popupKeyboard="@xml/popup_tab" />
+        <Key
+            android:codes="@integer/key_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="27.272738%p" />
+        <Key
+            android:codes="@integer/key_dpad_left"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="◁" />
+        <Key
+            android:codes="@integer/key_dpad_right"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="▷" />
+        <Key
+            android:codes="@integer/key_dpad_up"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="△" />
+        <Key
+            android:codes="@integer/key_dpad_down"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="▽" />
+    </Row>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml-uk/kbd_compact.xml b/app/src/main/res/xml-uk/kbd_compact.xml
new file mode 100644
index 000000000..dc02b6957
--- /dev/null
+++ b/app/src/main/res/xml-uk/kbd_compact.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Keyboard
+    android:horizontalGap="0.0px"
+    android:keyWidth="9.090912%p"
+    android:layoutColumns="11"
+    android:layoutRows="5"
+    android:verticalGap="0.0px"
+    android:verticalPad="@dimen/key_vertical_pad_compact"
+    xmlns:android="http://schemas.android.com/apk/res/org.pocketworkstation.pckeyboard">
+    <Row
+        android:extension="true">
+        <Key
+            android:codes="@integer/key_escape"
+            android:isModifier="true"
+            android:keyLabel="Esc" />
+        <Key
+            android:keyLabel="`"
+            android:shiftLabel="~" />
+        <Key
+            android:keyLabel="-"
+            android:shiftLabel="_" />
+        <Key
+            android:keyLabel="\\"
+            android:shiftLabel="|" />
+        <Key
+            android:keyLabel=";"
+            android:shiftLabel=":" />
+        <Key
+            android:keyLabel="="
+            android:shiftLabel="+" />
+        <Key
+            android:keyLabel="["
+            android:shiftLabel="{" />
+        <Key
+            android:keyLabel="]"
+            android:shiftLabel="}" />
+        <Key
+            android:codes="@integer/key_home"
+            android:isModifier="true"
+            android:keyLabel="Home" />
+        <Key
+            android:codes="@integer/key_end"
+            android:isModifier="true"
+            android:keyLabel="End" />
+        <Key
+            android:codes="@integer/key_forward_del"
+            android:isModifier="true"
+            android:keyLabel="Del" />
+    </Row>
+    <Row>
+        <Key
+            android:keyEdgeFlags="left"
+            android:keyLabel="1"
+            android:popupCharacters="`"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="!" />
+        <Key
+            android:keyLabel="2"
+            android:popupCharacters="~"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="&quot;" />
+        <Key
+            android:keyLabel="3"
+            android:popupCharacters="-—"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="№" />
+        <Key
+            android:keyLabel="4"
+            android:popupCharacters="_"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=";" />
+        <Key
+            android:keyLabel="5"
+            android:popupCharacters="="
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="%" />
+        <Key
+            android:keyLabel="6"
+            android:popupCharacters="+"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=":" />
+        <Key
+            android:keyLabel="7"
+            android:popupCharacters="{"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="\?" />
+        <Key
+            android:keyLabel="8"
+            android:popupCharacters="}"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="*" />
+        <Key
+            android:keyLabel="9"
+            android:popupCharacters="["
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="(" />
+        <Key
+            android:keyLabel="0"
+            android:popupCharacters="]"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=")" />
+        <Key
+            android:codes="@integer/key_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete" />
+    </Row>
+    <Row>
+        <Key
+            android:keyEdgeFlags="left"
+            android:keyLabel="й"
+            android:popupCharacters="q"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ц"
+            android:popupCharacters="w"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="у"
+            android:popupCharacters="e"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="к"
+            android:popupCharacters="r"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="е"
+            android:popupCharacters="tёЁ"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="н"
+            android:popupCharacters="y"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="г"
+            android:popupCharacters="uґҐ₴"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ш"
+            android:popupCharacters="i"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="щ"
+            android:popupCharacters="o"
+            android:popupKeyboard="@xml/kbd_popup_narrow_template" />
+        <Key
+            android:keyLabel="з"
+            android:popupCharacters="p"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyEdgeFlags="right"
+            android:keyLabel="х"
+            android:popupCharacters="/\\|"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+    </Row>
+    <Row>
+        <Key
+            android:keyEdgeFlags="left"
+            android:keyLabel="ф"
+            android:popupCharacters="a"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="і"
+            android:popupCharacters="sы"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="в"
+            android:popupCharacters="d"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="а"
+            android:popupCharacters="f"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="п"
+            android:popupCharacters="g"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="р"
+            android:popupCharacters="h"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="о"
+            android:popupCharacters="j"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="л"
+            android:popupCharacters="k"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="д"
+            android:popupCharacters="l"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ж"
+            android:popupCharacters=";:"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyEdgeFlags="right"
+            android:keyLabel="є"
+            android:popupCharacters="'э"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+    </Row>
+    <Row>
+        <Key
+            android:codes="@integer/key_shift"
+            android:iconPreview="@drawable/sym_keyboard_feedback_shift"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_shift" />
+        <Key
+            android:keyLabel="я"
+            android:popupCharacters="z"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ч"
+            android:popupCharacters="x"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="с"
+            android:popupCharacters="c"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="м"
+            android:popupCharacters="v"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="и"
+            android:popupCharacters="b"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="т"
+            android:popupCharacters="n"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="ь"
+            android:popupCharacters="mї"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel="б"
+            android:popupCharacters=",&lt;"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyIcon="@drawable/hint_popup"
+            android:keyLabel="ю"
+            android:popupCharacters=".>"
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:codes="@integer/key_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return" />
+    </Row>
+    <Row
+        android:rowEdgeFlags="bottom">
+        <Key
+            android:codes="@integer/key_fn"
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="ƒ" />
+        <Key
+            android:codes="@integer/key_alt_left"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyLabel="⎇" />
+        <Key
+            android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
+            android:isSticky="true"
+            android:keyLabel="⎈" />
+        <Key
+            android:codes="@integer/key_tab"
+            android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true"
+            android:keyLabel="↹"
+            android:popupKeyboard="@xml/popup_tab" />
+        <Key
+            android:codes="@integer/key_space"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="27.272738%p" />
+        <Key
+            android:codes="@integer/key_dpad_left"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="◁" />
+        <Key
+            android:codes="@integer/key_dpad_right"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="▷" />
+        <Key
+            android:codes="@integer/key_dpad_up"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="△" />
+        <Key
+            android:codes="@integer/key_dpad_down"
+            android:isCursor="true"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="▽" />
+    </Row>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_compact.xml b/app/src/main/res/xml/kbd_compact.xml
index 628638c29..57e2a4cda 100644
--- a/app/src/main/res/xml/kbd_compact.xml
+++ b/app/src/main/res/xml/kbd_compact.xml
@@ -1,331 +1,318 @@
 <?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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="9.09090909%p"
-    android:horizontalGap="0px"
-    android:verticalGap="0px"
-    android:verticalPad="@dimen/key_vertical_pad_compact"
-    android:layoutRows="5"
+    android:horizontalGap="0.0px"
+    android:keyWidth="9.090912%p"
     android:layoutColumns="11"
- >
-    <Row android:extension="true">
-        <Key android:codes="@integer/key_escape" android:keyLabel="Esc" android:isModifier="true" />
-        <Key android:keyLabel="`" android:shiftLabel="~" />
-        <Key android:keyLabel="-" android:shiftLabel="_" />
-        <Key android:keyLabel="\\" android:shiftLabel="|" />
-        <Key android:keyLabel=";" android:shiftLabel=":" />
-        <Key android:keyLabel="=" android:shiftLabel="+" />        
-        <Key android:keyLabel="[" android:shiftLabel="{" />
-        <Key android:keyLabel="]" android:shiftLabel="}" />
-	<Key android:codes="@integer/key_home" android:isModifier="true" android:keyLabel="Home" />
-	<Key android:codes="@integer/key_end" android:isModifier="true" android:keyLabel="End" />
-	<Key android:codes="@integer/key_forward_del" android:isModifier="true" android:keyLabel="Del" />
+    android:layoutRows="5"
+    android:verticalGap="0.0px"
+    android:verticalPad="@dimen/key_vertical_pad_compact"
+    xmlns:android="http://schemas.android.com/apk/res-auto">
+    <Row
+        android:extension="true">
+        <Key
+            android:codes="@integer/key_escape"
+            android:isModifier="true"
+            android:keyLabel="Esc" />
+        <Key
+            android:keyLabel="`"
+            android:shiftLabel="~" />
+        <Key
+            android:keyLabel="-"
+            android:shiftLabel="_" />
+        <Key
+            android:keyLabel="\\"
+            android:shiftLabel="|" />
+        <Key
+            android:keyLabel=";"
+            android:shiftLabel=":" />
+        <Key
+            android:keyLabel="="
+            android:shiftLabel="+" />
+        <Key
+            android:keyLabel="["
+            android:shiftLabel="{" />
+        <Key
+            android:keyLabel="]"
+            android:shiftLabel="}" />
+        <Key
+            android:codes="@integer/key_home"
+            android:isModifier="true"
+            android:keyLabel="Home" />
+        <Key
+            android:codes="@integer/key_end"
+            android:isModifier="true"
+            android:keyLabel="End" />
+        <Key
+            android:codes="@integer/key_forward_del"
+            android:isModifier="true"
+            android:keyLabel="Del" />
     </Row>
-
     <Row>
         <Key
-            android:keyLabel="1"
-            android:shiftLabel="!"
             android:keyEdgeFlags="left"
-            android:popupKeyboard="@xml/kbd_popup_template"
+            android:keyLabel="1"
             android:popupCharacters="`"
-            android:keyWidth="7.09090909%p"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="!" />
         <Key
             android:keyLabel="2"
-            android:shiftLabel="\@"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="~"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="\@" />
         <Key
             android:keyLabel="3"
-            android:shiftLabel="#"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="-"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="\#" />
         <Key
             android:keyLabel="4"
-            android:shiftLabel="$"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="_"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="$" />
         <Key
             android:keyLabel="5"
-            android:shiftLabel="%"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="="
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="%" />
         <Key
             android:keyLabel="6"
-            android:shiftLabel="^"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="+"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="^" />
         <Key
             android:keyLabel="7"
-            android:shiftLabel="&amp;"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="{"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="&amp;" />
         <Key
             android:keyLabel="8"
-            android:shiftLabel="*"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="}"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="*" />
         <Key
             android:keyLabel="9"
-            android:shiftLabel="("
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="["
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="(" />
         <Key
             android:keyLabel="0"
-            android:shiftLabel=")"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="]"
-            /> 
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel=")" />
         <Key
             android:codes="@integer/key_delete"
-            android:keyWidth="11.09090909%p"
-            android:keyIcon="@drawable/sym_keyboard_delete"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:isModifier="true"
             android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
-    </Row>    
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete" />
+    </Row>
     <Row>
         <Key
+            android:keyEdgeFlags="left"
             android:keyLabel="q"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_q"
-            android:keyEdgeFlags="left" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="w"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_w" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="e"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_e" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="r"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_r" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="t"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_t" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="y"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_y" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="u"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_u" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="i"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_i" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="o"
-            android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/alternates_for_o" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_narrow_template" />
         <Key
             android:keyLabel="p"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_p" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
+            android:keyEdgeFlags="right"
             android:keyLabel="'"
-            android:shiftLabel="&quot;"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="|"
-            android:keyEdgeFlags="right" />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="&quot;" />
     </Row>
     <Row>
         <Key
+            android:keyEdgeFlags="left"
             android:keyLabel="a"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_a"
-            android:horizontalGap="4.54545454%p"
-            android:keyEdgeFlags="left" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="s"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_s" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="d"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_d" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="f"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_f" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="g"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_g" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="h"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_h" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="j"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_j" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="k"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_k" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="l"
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
+        <Key
+            android:keyLabel=";"
+            android:popupCharacters=":"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_l" />
+            android:shiftLabel=":" />
         <Key
-            android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
-            android:iconPreview="@drawable/sym_keyboard_feedback_return"
-            android:isModifier="true"
-            android:keyWidth="13.6363636%p"
-            android:keyEdgeFlags="right" />
+            android:codes="@integer/key_f1"
+            android:keyEdgeFlags="right"
+            android:keyLabel="/"
+            android:popupCharacters="\\"
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="\?" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_shift"
-            android:keyWidth="11.09090909%p"
-            android:keyIcon="@drawable/sym_keyboard_shift"
             android:iconPreview="@drawable/sym_keyboard_feedback_shift"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_shift" />
         <Key
             android:keyLabel="z"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_z" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="x"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_x" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="c"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_c" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="v"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_v" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="b"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_b" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="n"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_n" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel="m"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/alternates_for_m" />
+            android:popupCharacters=""
+            android:popupKeyboard="@xml/kbd_popup_template" />
         <Key
             android:keyLabel=","
+            android:popupCharacters="&lt;"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters=";"
             android:shiftLabel="&lt;" />
         <Key
+            android:keyIcon="@drawable/hint_popup"
             android:keyLabel="."
-            android:shiftLabel="&gt;"
+            android:popupCharacters=">"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters=":"
-            android:keyIcon="@drawable/hint_popup" />
+            android:shiftLabel=">" />
         <Key
-            android:codes="@integer/key_f1"
-            android:keyLabel="/"
-            android:shiftLabel="\?"
-            android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="\\"
-            android:keyWidth="7.09090909%p"
-            android:keyEdgeFlags="right" />
+            android:codes="@integer/key_return"
+            android:iconPreview="@drawable/sym_keyboard_feedback_return"
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return" />
     </Row>
-    <Row android:rowEdgeFlags="bottom">
+    <Row
+        android:rowEdgeFlags="bottom">
         <Key
             android:codes="@integer/key_fn"
-            android:keyLabel="Fn"
             android:isModifier="true"
-            android:keyWidth="8.29090909%p"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyLabel="ƒ" />
         <Key
-            android:keyLabel="Ctrl"
-            android:codes="@integer/key_ctrl_left"
+            android:codes="@integer/key_alt_left"
+            android:isModifier="true"
             android:isSticky="true"
-            android:keyWidth="8.29090909%p"
-            android:isModifier="true" />
+            android:keyLabel="⎇" />
         <Key
-            android:codes="@integer/key_alt_left"
-            android:keyLabel="Alt"
+            android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
             android:isSticky="true"
-            android:keyWidth="8.29090909%p"
-            android:isModifier="true" />
+            android:keyLabel="⎈" />
         <Key
             android:codes="@integer/key_tab"
-            android:keyIcon="@drawable/sym_keyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
-            android:keyWidth="8.29090909%p"
-            android:popupKeyboard="@xml/popup_tab"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyLabel="↹"
+            android:popupKeyboard="@xml/popup_tab" />
         <Key
             android:codes="@integer/key_space"
-            android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
-            android:keyWidth="36.87272727%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="27.272738%p" />
         <Key
             android:codes="@integer/key_dpad_left"
-            android:isModifier="true"
-            android:isRepeatable="true"            
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:keyLabel="&#x25c1;" />
-        <Key
-            android:codes="@integer/key_dpad_down"
             android:isModifier="true"
             android:isRepeatable="true"
+            android:keyLabel="◁" />
+        <Key
+            android:codes="@integer/key_dpad_right"
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:keyLabel="&#x25bd;" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="▷" />
         <Key
             android:codes="@integer/key_dpad_up"
-            android:isRepeatable="true"            
-            android:keyLabel="&#x25b3;" 
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="△" />
         <Key
-            android:codes="@integer/key_dpad_right"
-            android:isModifier="true"            
-            android:keyLabel="&#x25b7;"
-            android:isRepeatable="true"            
+            android:codes="@integer/key_dpad_down"
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:keyEdgeFlags="right" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="▽" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_compact_fn.xml b/app/src/main/res/xml/kbd_compact_fn.xml
index ee7e58d44..51d3b7544 100644
--- a/app/src/main/res/xml/kbd_compact_fn.xml
+++ b/app/src/main/res/xml/kbd_compact_fn.xml
@@ -1,288 +1,260 @@
 <?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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="10%p"
-    android:horizontalGap="0px"
-    android:verticalGap="0px"
-    android:verticalPad="@dimen/key_vertical_pad_compact"
-    android:layoutRows="5"
+    android:horizontalGap="0.0px"
+    android:keyWidth="9.090909%p"
     android:layoutColumns="11"
->
+    android:layoutRows="5"
+    android:verticalGap="0.0px"
+    android:verticalPad="@dimen/key_vertical_pad_compact"
+    xmlns:android="http://schemas.android.com/apk/res-auto">
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
         <Key
-            android:keyLabel="Esc"
-            android:codes="@integer/key_escape"
-            android:keyWidth="12%p"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_sysrq"
+            android:isModifier="true"
+            android:keyLabel="SyRq" />
         <Key
-            android:codes="@integer/key_f1"
-            android:keyWidth="9%p"
-            android:isModifier="true" />
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_scroll_lock"
+            android:isModifier="true"
+            android:keyLabel="ScrL" />
         <Key
             android:codes="@integer/key_fkey_f1"
             android:isModifier="true"
-            android:keyWidth="9%p"
-            android:keyLabel="F1" />            
+            android:keyLabel="F1" />
         <Key
             android:codes="@integer/key_fkey_f2"
             android:isModifier="true"
-            android:keyWidth="9%p"
-            android:keyLabel="F2" />         
+            android:keyLabel="F2" />
         <Key
             android:codes="@integer/key_fkey_f3"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F3" />
         <Key
             android:codes="@integer/key_fkey_f4"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F4" />
         <Key
             android:codes="@integer/key_fkey_f5"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F5" />
         <Key
             android:codes="@integer/key_fkey_f6"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F6" />
-
         <Key
-            android:codes="@integer/key_break"
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_home"
             android:isModifier="true"
-            android:keyWidth="12%p"
-            android:keyLabel="Brk" />
-
+            android:keyLabel="Home" />
         <Key
             android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyWidth="13%p"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="BkSp"
+            android:keyWidth="11.363636%p" />
     </Row>
     <Row>
         <Key
-            android:codes="@integer/key_sysrq"
-            android:isModifier="true"
-            android:keyWidth="12%p"
+            android:keyWidth="11.363636%p"
             android:keyEdgeFlags="left"
-            android:keyLabel="SyRq" />
+            android:codes="@integer/key_break"
+            android:isModifier="true"
+            android:keyLabel="Brk" />
         <Key
-            android:codes="@integer/key_settings"
-            android:keyIcon="@drawable/sym_keyboard_settings"
-            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-            android:keyWidth="9%p"
-            android:isModifier="true" />
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_num_lock"
+            android:isModifier="true"
+            android:keyLabel="NumL" />
         <Key
             android:codes="@integer/key_fkey_f7"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F7" />
         <Key
             android:codes="@integer/key_fkey_f8"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F8" />
         <Key
             android:codes="@integer/key_fkey_f9"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F9" />
         <Key
             android:codes="@integer/key_fkey_f10"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F10" />
         <Key
             android:codes="@integer/key_fkey_f11"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F11" />
         <Key
             android:codes="@integer/key_fkey_f12"
             android:isModifier="true"
-            android:keyWidth="9%p"
             android:keyLabel="F12" />
-
         <Key
-            android:codes="@integer/key_insert"
-            android:keyLabel="Ins"
-            android:isRepeatable="true"            
-            android:keyWidth="12%p"
-            android:isModifier="true" />
-
-        <Key
-            android:codes="@integer/key_page_up"
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_end"
             android:isModifier="true"
-            android:isRepeatable="true"            
-            android:keyWidth="13%p"
+            android:keyLabel="End" />
+        <Key
+            android:keyWidth="11.363636%p"
             android:keyEdgeFlags="right"
-            android:keyLabel="PgUp" />
+            android:codes="@integer/key_forward_del"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Del" />
     </Row>
     <Row>
         <Key
-            android:codes="@integer/key_scroll_lock"
-            android:isModifier="true"
-            android:keyWidth="12%p"
+            android:keyWidth="11.363636%p"
             android:keyEdgeFlags="left"
-            android:keyLabel="ScrL" />
-        <Key android:keyLabel="~" android:keyWidth="9%p" />            
-        <Key android:keyLabel="_" android:keyWidth="9%p" />            
-        <Key android:keyLabel="+" android:keyWidth="9%p" />            
-        <Key android:keyLabel="{" android:keyWidth="9%p" />            
-        <Key android:keyLabel="}" android:keyWidth="9%p" />            
-        <Key android:keyLabel="|" android:keyWidth="9%p" />            
-        <Key android:keyLabel=":" android:keyWidth="9%p" />            
-
+            android:codes="@integer/key_escape"
+            android:isModifier="true"
+            android:keyLabel="Esc" />
         <Key
-            android:codes="@integer/key_forward_del"
-            android:keyLabel="Del"
-            android:isRepeatable="true"            
-            android:isModifier="true"            
-            android:keyWidth="12%p" />
+            android:keyWidth="11.363636%p"
+            android:isModifier="true"
+            android:keyLabel="~" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="_" />
         <Key
-            android:codes="@integer/key_page_down"
+            android:isModifier="true"
+            android:keyLabel="+" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="{" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="}" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="|" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel=":" />
+        <Key
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_page_up"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyWidth="13%p"
-            android:keyLabel="PgDn"
-            android:keyEdgeFlags="right" />
+            android:keyLabel="PgUp" />
+        <Key
+            android:keyEdgeFlags="right"
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_f1"
+            android:isModifier="true" />
     </Row>
     <Row>
         <Key
-            android:codes="@integer/key_num_lock"
-            android:keyWidth="12%p"
+            android:codes="@integer/key_shift"
+            android:iconPreview="@drawable/sym_keyboard_feedback_shift"
             android:isModifier="true"
+            android:isSticky="true"
             android:keyEdgeFlags="left"
-            android:keyLabel="NumL" />
-
-        <Key android:keyLabel="`" android:keyWidth="9%p" />            
-        <Key android:keyLabel="-" android:keyWidth="9%p" />            
-        <Key android:keyLabel="=" android:keyWidth="9%p" />            
-        <Key android:keyLabel="[" android:keyWidth="9%p" />            
-        <Key android:keyLabel="]" android:keyWidth="9%p" />            
-        <Key android:keyLabel="\\" android:keyWidth="9%p" />            
-        <Key android:keyLabel=";" android:keyWidth="9%p" />            
-
+            android:keyLabel="Shift"
+            android:keyWidth="11.363636%p" />
+        <Key
+            android:keyWidth="11.363636%p"
+            android:isModifier="true"
+            android:keyLabel="`" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="-" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="=" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="[" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="]" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel="\\" />
+        <Key
+            android:isModifier="true"
+            android:keyLabel=";" />
+        <Key
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_page_down"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="PgDn" />
         <Key
-            android:codes="@integer/key_home"
-            android:keyWidth="12%p"
-            android:keyLabel="Home"
-            android:isModifier="true" />
-         <Key
-            android:codes="@integer/key_end"
-            android:keyLabel="End"
-            android:keyWidth="13%p"
             android:keyEdgeFlags="right"
-            android:isModifier="true" />
+            android:keyWidth="11.363636%p"
+            android:codes="@integer/key_insert"
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Ins" />
     </Row>
-    
-    <Row android:rowEdgeFlags="bottom"
-         android:keyWidth="9.09090909%p"
-    >
+    <Row
+        android:rowEdgeFlags="bottom">
         <Key
             android:codes="@integer/key_fn"
-            android:keyLabel="Fn"
             android:isModifier="true"
-            android:keyWidth="8.29090909%p"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyLabel="Fn" />
         <Key
-            android:keyLabel="Ctrl"
-            android:codes="@integer/key_ctrl_left"
+            android:codes="@integer/key_alt_left"
+            android:isModifier="true"
             android:isSticky="true"
-            android:keyWidth="8.29090909%p"
-            android:isModifier="true" />
+            android:keyLabel="Alt" />
         <Key
-            android:codes="@integer/key_alt_left"
-            android:keyLabel="Alt"
+            android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
             android:isSticky="true"
-            android:keyWidth="8.29090909%p"
-            android:isModifier="true" />
+            android:keyLabel="Ctrl" />
         <Key
             android:codes="@integer/key_meta_left"
-            android:keyLabel="&#x2756;"
+            android:isModifier="true"
             android:isSticky="true"
-            android:keyWidth="8.29090909%p"
-            android:isModifier="true" />
+            android:keyLabel="Meta" />
         <Key
-            android:codes="@integer/key_shift"
-            android:keyWidth="8.29090909%p"
-            android:keyIcon="@drawable/sym_keyboard_shift"
-            android:iconPreview="@drawable/sym_keyboard_feedback_shift"
             android:isModifier="true"
-            android:isSticky="true" />
-        <Key
-            android:keyLabel=".com"
-            android:keyOutputText=".com"
-            android:popupKeyboard="@xml/popup_domains"
-            android:keyWidth="10.145454545%p"
-            android:keyIcon="@drawable/hint_popup" />
-        <Key
+            android:keyIcon="@drawable/hint_popup"
             android:keyLabel=":-)"
             android:keyOutputText=":-) "
-            android:popupKeyboard="@xml/popup_smileys"
-            android:keyWidth="10.145454545%p"
-            android:keyIcon="@drawable/hint_popup" />
+            android:popupKeyboard="@xml/popup_smileys" />
         <Key
-            android:codes="@integer/key_dpad_center"
+            android:codes="@integer/key_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
             android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_settings" />
+        <Key
+            android:codes="@integer/key_dpad_center"
             android:isCursor="true"
-            android:keyWidth="8.29090909%p"
-            android:keyLabel="&#x25cb;" />
+            android:isModifier="true"
+            android:keyLabel="Cs" />
         <Key
             android:codes="@integer/key_dpad_left"
-            android:isModifier="true"
-            android:isRepeatable="true"            
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:keyLabel="&#x25c1;" />
-        <Key
-            android:codes="@integer/key_dpad_down"
             android:isModifier="true"
             android:isRepeatable="true"
+            android:keyLabel="Lt" />
+        <Key
+            android:codes="@integer/key_dpad_right"
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:keyLabel="&#x25bd;" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Rt" />
         <Key
             android:codes="@integer/key_dpad_up"
-            android:isRepeatable="true"            
-            android:keyLabel="&#x25b3;" 
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Up" />
         <Key
-            android:codes="@integer/key_dpad_right"
-            android:isModifier="true"            
-            android:keyLabel="&#x25b7;"
-            android:isRepeatable="true"            
+            android:codes="@integer/key_dpad_down"
             android:isCursor="true"
-            android:keyWidth="7.49090909%p"
-            android:keyEdgeFlags="right" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="Dn" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_full.xml b/app/src/main/res/xml/kbd_full.xml
index 858e2b75b..4714fc6bb 100644
--- a/app/src/main/res/xml/kbd_full.xml
+++ b/app/src/main/res/xml/kbd_full.xml
@@ -1,412 +1,427 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** 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.
-** 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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="7.1428571485%p"
-    android:horizontalGap="0px"
-    android:verticalGap="@dimen/key_bottom_gap"
-    android:layoutRows="5"
+    android:horizontalGap="0.0px"
+    android:keyWidth="7.1428537%p"
     android:layoutColumns="14"
->
-    <Row android:rowEdgeFlags="top" android:extension="true">
-        <Key android:keyLabel="F1" android:codes="@integer/key_fkey_f1" android:isModifier="true" android:keyEdgeFlags="left"/>
-        <Key android:keyLabel="F2" android:codes="@integer/key_fkey_f2" android:isModifier="true" />
-        <Key android:keyLabel="F3" android:codes="@integer/key_fkey_f3" android:isModifier="true" />
-        <Key android:keyLabel="F4" android:codes="@integer/key_fkey_f4" android:isModifier="true" />
-        <Key android:keyLabel="F5" android:codes="@integer/key_fkey_f5" android:isModifier="true" />
-        <Key android:keyLabel="F6" android:codes="@integer/key_fkey_f6" android:isModifier="true" />
-        <Key android:keyLabel="F7" android:codes="@integer/key_fkey_f7" android:isModifier="true" />
-        <Key android:keyLabel="F8" android:codes="@integer/key_fkey_f8" android:isModifier="true" />
-        <Key android:keyLabel="F9" android:codes="@integer/key_fkey_f9" android:isModifier="true" />
-        <Key android:keyLabel="F10" android:codes="@integer/key_fkey_f10" android:isModifier="true" />
-        <Key android:keyLabel="F11" android:codes="@integer/key_fkey_f11" android:isModifier="true" />
-        <Key android:keyLabel="F12" android:codes="@integer/key_fkey_f12" android:isModifier="true" />
-	<Key
+    android:layoutRows="5"
+    android:verticalGap="@dimen/key_bottom_gap"
+    xmlns:android="http://schemas.android.com/apk/res-auto">
+    <Row
+        android:extension="true"
+        android:rowEdgeFlags="top">
+        <Key
+            android:codes="@integer/key_fkey_f1"
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="F1" />
+        <Key
+            android:codes="@integer/key_fkey_f2"
+            android:isModifier="true"
+            android:keyLabel="F2" />
+        <Key
+            android:codes="@integer/key_fkey_f3"
+            android:isModifier="true"
+            android:keyLabel="F3" />
+        <Key
+            android:codes="@integer/key_fkey_f4"
+            android:isModifier="true"
+            android:keyLabel="F4" />
+        <Key
+            android:codes="@integer/key_fkey_f5"
+            android:isModifier="true"
+            android:keyLabel="F5" />
+        <Key
+            android:codes="@integer/key_fkey_f6"
+            android:isModifier="true"
+            android:keyLabel="F6" />
+        <Key
+            android:codes="@integer/key_fkey_f7"
+            android:isModifier="true"
+            android:keyLabel="F7" />
+        <Key
+            android:codes="@integer/key_fkey_f8"
+            android:isModifier="true"
+            android:keyLabel="F8" />
+        <Key
+            android:codes="@integer/key_fkey_f9"
+            android:isModifier="true"
+            android:keyLabel="F9" />
+        <Key
+            android:codes="@integer/key_fkey_f10"
+            android:isModifier="true"
+            android:keyLabel="F10" />
+        <Key
+            android:codes="@integer/key_fkey_f11"
+            android:isModifier="true"
+            android:keyLabel="F11" />
+        <Key
+            android:codes="@integer/key_fkey_f12"
+            android:isModifier="true"
+            android:keyLabel="F12" />
+        <Key
             android:codes="@integer/key_home"
-            android:isModifier="true"            
+            android:isModifier="true"
             android:keyLabel="Home" />
-	<Key
+        <Key
             android:codes="@integer/key_end"
-            android:isModifier="true"            
-            android:keyLabel="End"
-            android:keyEdgeFlags="right" />
-        />
-    </Row>
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="End" /> /> </Row>
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
         <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
             android:keyLabel="@string/key_tlde_main"
-            android:shiftLabel="@string/key_tlde_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
+            android:keyWidth="4.571426%p"
             android:popupCharacters="@string/key_tlde_alt"
-            android:keyWidth="4.5714285%p"
-            android:keyEdgeFlags="left" />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_tlde_shift" />
         <Key
             android:keyLabel="@string/key_ae01_main"
-            android:shiftLabel="@string/key_ae01_shift"
+            android:popupCharacters="@string/key_ae01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae01_alt" />
+            android:shiftLabel="@string/key_ae01_shift" />
         <Key
             android:keyLabel="@string/key_ae02_main"
-            android:shiftLabel="@string/key_ae02_shift"
+            android:popupCharacters="@string/key_ae02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae02_alt" />
+            android:shiftLabel="@string/key_ae02_shift" />
         <Key
             android:keyLabel="@string/key_ae03_main"
-            android:shiftLabel="@string/key_ae03_shift"
+            android:popupCharacters="@string/key_ae03_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae03_alt" />
+            android:shiftLabel="@string/key_ae03_shift" />
         <Key
             android:keyLabel="@string/key_ae04_main"
-            android:shiftLabel="@string/key_ae04_shift"
+            android:popupCharacters="@string/key_ae04_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae04_alt" />
+            android:shiftLabel="@string/key_ae04_shift" />
         <Key
             android:keyLabel="@string/key_ae05_main"
-            android:shiftLabel="@string/key_ae05_shift"
+            android:popupCharacters="@string/key_ae05_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae05_alt" />
+            android:shiftLabel="@string/key_ae05_shift" />
         <Key
             android:keyLabel="@string/key_ae06_main"
-            android:shiftLabel="@string/key_ae06_shift"
+            android:popupCharacters="@string/key_ae06_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae06_alt" />
+            android:shiftLabel="@string/key_ae06_shift" />
         <Key
             android:keyLabel="@string/key_ae07_main"
-            android:shiftLabel="@string/key_ae07_shift"
+            android:popupCharacters="@string/key_ae07_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae07_alt" />
+            android:shiftLabel="@string/key_ae07_shift" />
         <Key
             android:keyLabel="@string/key_ae08_main"
-            android:shiftLabel="@string/key_ae08_shift"
+            android:popupCharacters="@string/key_ae08_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ae08_alt" />
+            android:shiftLabel="@string/key_ae08_shift" />
         <Key
             android:keyLabel="@string/key_ae09_main"
-            android:shiftLabel="@string/key_ae09_shift"
+            android:popupCharacters="@string/key_ae09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae09_alt" />
+            android:shiftLabel="@string/key_ae09_shift" />
         <Key
             android:keyLabel="@string/key_ae10_main"
-            android:shiftLabel="@string/key_ae10_shift"
+            android:popupCharacters="@string/key_ae10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae10_alt" />
+            android:shiftLabel="@string/key_ae10_shift" />
         <Key
             android:keyLabel="@string/key_ae11_main"
-            android:shiftLabel="@string/key_ae11_shift"
+            android:popupCharacters="@string/key_ae11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae11_alt" />
+            android:shiftLabel="@string/key_ae11_shift" />
         <Key
             android:keyLabel="@string/key_ae12_main"
-            android:shiftLabel="@string/key_ae12_shift"
+            android:popupCharacters="@string/key_ae12_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ae12_alt" />
+            android:shiftLabel="@string/key_ae12_shift" />
         <Key
             android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:keyWidth="9.7142855%p"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:keyWidth="9.714281%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_tab"
-            android:keyIcon="@drawable/sym_keyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
+            android:isModifier="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyLabel="↹" />
         <Key
             android:keyLabel="@string/key_ad01_main"
-            android:shiftLabel="@string/key_ad01_shift"
+            android:popupCharacters="@string/key_ad01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad01_alt" />
+            android:shiftLabel="@string/key_ad01_shift" />
         <Key
             android:keyLabel="@string/key_ad02_main"
-            android:shiftLabel="@string/key_ad02_shift"
+            android:popupCharacters="@string/key_ad02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad02_alt" />
+            android:shiftLabel="@string/key_ad02_shift" />
         <Key
             android:keyLabel="@string/key_ad03_main"
-            android:shiftLabel="@string/key_ad03_shift"
+            android:popupCharacters="@string/key_ad03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad03_alt" />
+            android:shiftLabel="@string/key_ad03_shift" />
         <Key
             android:keyLabel="@string/key_ad04_main"
-            android:shiftLabel="@string/key_ad04_shift"
+            android:popupCharacters="@string/key_ad04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad04_alt" />
+            android:shiftLabel="@string/key_ad04_shift" />
         <Key
             android:keyLabel="@string/key_ad05_main"
-            android:shiftLabel="@string/key_ad05_shift"
+            android:popupCharacters="@string/key_ad05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad05_alt" />
+            android:shiftLabel="@string/key_ad05_shift" />
         <Key
             android:keyLabel="@string/key_ad06_main"
-            android:shiftLabel="@string/key_ad06_shift"
+            android:popupCharacters="@string/key_ad06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad06_alt" />
+            android:shiftLabel="@string/key_ad06_shift" />
         <Key
             android:keyLabel="@string/key_ad07_main"
-            android:shiftLabel="@string/key_ad07_shift"
+            android:popupCharacters="@string/key_ad07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad07_alt" />
+            android:shiftLabel="@string/key_ad07_shift" />
         <Key
             android:keyLabel="@string/key_ad08_main"
-            android:shiftLabel="@string/key_ad08_shift"
+            android:popupCharacters="@string/key_ad08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad08_alt" />
+            android:shiftLabel="@string/key_ad08_shift" />
         <Key
             android:keyLabel="@string/key_ad09_main"
-            android:shiftLabel="@string/key_ad09_shift"
+            android:popupCharacters="@string/key_ad09_alt"
             android:popupKeyboard="@xml/kbd_popup_narrow_template"
-            android:popupCharacters="@string/key_ad09_alt" />
-
+            android:shiftLabel="@string/key_ad09_shift" />
         <Key
             android:keyLabel="@string/key_ad10_main"
-            android:shiftLabel="@string/key_ad10_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="@string/key_ad10_alt"
-            />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_ad10_shift" />
         <Key
             android:keyLabel="@string/key_ad11_main"
-            android:shiftLabel="@string/key_ad11_shift"
+            android:popupCharacters="@string/key_ad11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad11_alt" />res/xml/kbd_full.xml
-        <Key
+            android:shiftLabel="@string/key_ad11_shift" />res/xml/kbd_full.xml <Key
             android:keyLabel="@string/key_ad12_main"
-            android:shiftLabel="@string/key_ad12_shift"
+            android:popupCharacters="@string/key_ad12_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ad12_alt" />
+            android:shiftLabel="@string/key_ad12_shift" />
         <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
             android:keyLabel="@string/key_bksl_main"
-            android:shiftLabel="@string/key_bksl_shift"
-            android:popupKeyboard="@xml/kbd_popup_template"
             android:popupCharacters="@string/key_bksl_alt"
-            android:keyEdgeFlags="right" />
+            android:popupKeyboard="@xml/kbd_popup_template"
+            android:shiftLabel="@string/key_bksl_shift" />
     </Row>
     <Row>
         <Key
-            android:keyLabel="Ctrl"
-            android:keyWidth="10.7142855%p"
             android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
             android:isSticky="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
+            android:keyLabel="⎈"
+            android:keyWidth="10.714281%p" />
         <Key
             android:keyLabel="@string/key_ac01_main"
-            android:shiftLabel="@string/key_ac01_shift"
+            android:popupCharacters="@string/key_ac01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac01_alt" />
+            android:shiftLabel="@string/key_ac01_shift" />
         <Key
             android:keyLabel="@string/key_ac02_main"
-            android:shiftLabel="@string/key_ac02_shift"
+            android:popupCharacters="@string/key_ac02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac02_alt" />
+            android:shiftLabel="@string/key_ac02_shift" />
         <Key
             android:keyLabel="@string/key_ac03_main"
-            android:shiftLabel="@string/key_ac03_shift"
+            android:popupCharacters="@string/key_ac03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac03_alt" />
+            android:shiftLabel="@string/key_ac03_shift" />
         <Key
             android:keyLabel="@string/key_ac04_main"
-            android:shiftLabel="@string/key_ac04_shift"
+            android:popupCharacters="@string/key_ac04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac04_alt" />
+            android:shiftLabel="@string/key_ac04_shift" />
         <Key
             android:keyLabel="@string/key_ac05_main"
-            android:shiftLabel="@string/key_ac05_shift"
+            android:popupCharacters="@string/key_ac05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac05_alt" />
+            android:shiftLabel="@string/key_ac05_shift" />
         <Key
             android:keyLabel="@string/key_ac06_main"
-            android:shiftLabel="@string/key_ac06_shift"
+            android:popupCharacters="@string/key_ac06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac06_alt" />
+            android:shiftLabel="@string/key_ac06_shift" />
         <Key
             android:keyLabel="@string/key_ac07_main"
-            android:shiftLabel="@string/key_ac07_shift"
+            android:popupCharacters="@string/key_ac07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac07_alt" />
+            android:shiftLabel="@string/key_ac07_shift" />
         <Key
             android:keyLabel="@string/key_ac08_main"
-            android:shiftLabel="@string/key_ac08_shift"
+            android:popupCharacters="@string/key_ac08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac08_alt" />
+            android:shiftLabel="@string/key_ac08_shift" />
         <Key
             android:keyLabel="@string/key_ac09_main"
-            android:shiftLabel="@string/key_ac09_shift"
+            android:popupCharacters="@string/key_ac09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac09_alt" />
+            android:shiftLabel="@string/key_ac09_shift" />
         <Key
             android:keyLabel="@string/key_ac10_main"
-            android:shiftLabel="@string/key_ac10_shift"
+            android:popupCharacters="@string/key_ac10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac10_alt" />
+            android:shiftLabel="@string/key_ac10_shift" />
         <Key
             android:keyLabel="@string/key_ac11_main"
-            android:shiftLabel="@string/key_ac11_shift"
+            android:popupCharacters="@string/key_ac11_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ac11_alt" />
+            android:shiftLabel="@string/key_ac11_shift" />
         <Key
             android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:keyWidth="10.714281%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
             android:iconPreview="@drawable/sym_keyboard_feedback_shift"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyIcon="@drawable/sym_keyboard_shift" />
         <Key
+            android:isModifier="true"
             android:keyLabel="@string/key_lsgt_main"
-            android:shiftLabel="@string/key_lsgt_shift"
+            android:popupCharacters="@string/key_lsgt_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_lsgt_alt" />
+            android:shiftLabel="@string/key_lsgt_shift" />
         <Key
             android:keyLabel="@string/key_ab01_main"
-            android:shiftLabel="@string/key_ab01_shift"
+            android:popupCharacters="@string/key_ab01_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab01_alt" />
+            android:shiftLabel="@string/key_ab01_shift" />
         <Key
             android:keyLabel="@string/key_ab02_main"
-            android:shiftLabel="@string/key_ab02_shift"
+            android:popupCharacters="@string/key_ab02_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab02_alt" />
+            android:shiftLabel="@string/key_ab02_shift" />
         <Key
             android:keyLabel="@string/key_ab03_main"
-            android:shiftLabel="@string/key_ab03_shift"
+            android:popupCharacters="@string/key_ab03_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab03_alt" />
+            android:shiftLabel="@string/key_ab03_shift" />
         <Key
             android:keyLabel="@string/key_ab04_main"
-            android:shiftLabel="@string/key_ab04_shift"
+            android:popupCharacters="@string/key_ab04_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab04_alt" />
+            android:shiftLabel="@string/key_ab04_shift" />
         <Key
             android:keyLabel="@string/key_ab05_main"
-            android:shiftLabel="@string/key_ab05_shift"
+            android:popupCharacters="@string/key_ab05_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab05_alt" />
+            android:shiftLabel="@string/key_ab05_shift" />
         <Key
             android:keyLabel="@string/key_ab06_main"
-            android:shiftLabel="@string/key_ab06_shift"
+            android:popupCharacters="@string/key_ab06_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab06_alt" />
+            android:shiftLabel="@string/key_ab06_shift" />
         <Key
             android:keyLabel="@string/key_ab07_main"
-            android:shiftLabel="@string/key_ab07_shift"
+            android:popupCharacters="@string/key_ab07_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab07_alt" />
+            android:shiftLabel="@string/key_ab07_shift" />
         <Key
             android:keyLabel="@string/key_ab08_main"
-            android:shiftLabel="@string/key_ab08_shift"
+            android:popupCharacters="@string/key_ab08_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab08_alt" />
+            android:shiftLabel="@string/key_ab08_shift" />
         <Key
             android:keyLabel="@string/key_ab09_main"
-            android:shiftLabel="@string/key_ab09_shift"
+            android:popupCharacters="@string/key_ab09_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab09_alt" />
+            android:shiftLabel="@string/key_ab09_shift" />
         <Key
             android:keyLabel="@string/key_ab10_main"
-            android:shiftLabel="@string/key_ab10_shift"
+            android:popupCharacters="@string/key_ab10_alt"
             android:popupKeyboard="@xml/kbd_popup_template"
-            android:popupCharacters="@string/key_ab10_alt" />
+            android:shiftLabel="@string/key_ab10_shift" />
         <Key
             android:codes="@integer/key_dpad_up"
-            android:isRepeatable="true"
-            android:keyLabel="&#x25b3;"
             android:isCursor="true"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="△" />
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
+            android:isModifier="true"
             android:keyEdgeFlags="right"
-            android:isModifier="true" />
+            android:keyIcon="@drawable/sym_keyboard_shift" />
     </Row>
     <Row
-        android:rowEdgeFlags="bottom"
-    >
+        android:rowEdgeFlags="bottom">
         <Key
-            android:keyLabel="Esc"
             android:codes="@integer/key_escape"
-            android:keyWidth="10.7142855%p"
+            android:isModifier="true"
             android:keyEdgeFlags="left"
-            android:isModifier="true" />
-        <Key
-            android:codes="@integer/key_f1"
-            android:isModifier="true" />
+            android:keyLabel="⎋"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_alt_left"
-            android:keyLabel="Alt"
+            android:isModifier="true"
             android:isSticky="true"
-            android:isModifier="true" />
+            android:keyLabel="⎇" />
         <Key
             android:codes="@integer/key_meta_left"
-            android:keyLabel="&#x2756;"
+            android:isModifier="true"
             android:isSticky="true"
+            android:keyLabel="⊞" />
+        <Key
+            android:codes="@integer/key_f1"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_space"
-            android:shiftLabel="@string/key_space_shift"
-            android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
-            android:keyWidth="32.1428571372%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="32.142853%p"
+            android:shiftLabel="@string/key_space_shift" />
         <Key
             android:codes="@integer/key_fn"
-            android:keyLabel="Fn"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyLabel="ƒ" />
         <Key
             android:codes="@integer/key_dpad_center"
-            android:isModifier="true"
             android:isCursor="true"
-            android:keyLabel="&#x25cb;" />
+            android:isModifier="true"
+            android:keyLabel="○" />
         <Key
             android:codes="@integer/key_dpad_left"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25c1;" />
+            android:keyLabel="◁" />
         <Key
             android:codes="@integer/key_dpad_down"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25bd;" />
+            android:keyLabel="▽" />
         <Key
             android:codes="@integer/key_dpad_right"
+            android:isCursor="true"
             android:isModifier="true"
-            android:keyLabel="&#x25b7;"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="▷" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_full_fn.xml b/app/src/main/res/xml/kbd_full_fn.xml
index b1259cec2..abb60a509 100644
--- a/app/src/main/res/xml/kbd_full_fn.xml
+++ b/app/src/main/res/xml/kbd_full_fn.xml
@@ -1,326 +1,309 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-/* 
-**
-** 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. 
-** 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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="7.1428571485%p"
-    android:horizontalGap="0px"
-    android:verticalGap="@dimen/key_bottom_gap"
-    android:layoutRows="5"
+    android:horizontalGap="0.0px"
+    android:keyWidth="7.1428537%p"
     android:layoutColumns="14"
->
+    android:layoutRows="5"
+    android:verticalGap="@dimen/key_bottom_gap"
+    xmlns:android="http://schemas.android.com/apk/res-auto">
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
         <Key
             android:codes="@integer/key_f1"
-            android:keyWidth="10.7142855%p"
-            android:keyEdgeFlags="left" 
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_fkey_f1"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F1" />            
+            android:keyLabel="F1"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f2"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F2" />         
+            android:keyLabel="F2"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f3"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F3" />
+            android:keyLabel="F3"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f4"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F4" />
+            android:keyLabel="F4"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"            
-            android:keyLabel="7" />
+            android:isModifier="true"
+            android:keyLabel="7"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"            
-            android:keyLabel="8" />
+            android:isModifier="true"
+            android:keyLabel="8"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"            
-            android:keyLabel="9" />
+            android:isModifier="true"
+            android:keyLabel="9"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"            
-            android:keyLabel="/" />
+            android:isModifier="true"
+            android:keyLabel="/"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_home"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
-            android:isRepeatable="true"            
-            android:keyLabel="Home" />
+            android:isRepeatable="true"
+            android:keyLabel="Home"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
             android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:keyWidth="14.2857142%p"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="BkSp"
+            android:keyWidth="14.285719%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_tab"
-            android:keyIcon="@drawable/sym_keyboard_tab"
             android:iconPreview="@drawable/sym_keyboard_feedback_tab"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
-            android:keyEdgeFlags="left" />
+            android:keyEdgeFlags="left"
+            android:keyLabel="Tab"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_fkey_f5"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F5" />
+            android:keyLabel="F5"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f6"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F6" />
+            android:keyLabel="F6"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f7"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F7" />
+            android:keyLabel="F7"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f8"
-            android:keyWidth="8.035714%p"            
             android:isModifier="true"
-            android:keyLabel="F8" />
-
+            android:keyLabel="F8"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="4" />
+            android:isModifier="true"
+            android:keyLabel="4"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="5" />
+            android:isModifier="true"
+            android:keyLabel="5"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="6" />
+            android:isModifier="true"
+            android:keyLabel="6"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="*" />
-
+            android:isModifier="true"
+            android:keyLabel="*"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_end"
-            android:keyWidth="10.7142855%p"
-            android:isModifier="true"            
+            android:isModifier="true"
+            android:isRepeatable="true"
             android:keyLabel="End"
-            android:isRepeatable="true" />
-
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_insert"
-            android:keyLabel="Ins"
-            android:isRepeatable="true"            
-            android:isModifier="true" />
-
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Ins" />
         <Key
             android:codes="@integer/key_forward_del"
-            android:keyLabel="Del"
-            android:isRepeatable="true"            
-            android:isModifier="true"            
-            android:keyEdgeFlags="right" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="Del" />
     </Row>
     <Row>
         <Key
-            android:keyLabel="Ctrl"
-            android:keyWidth="10.7142855%p"
             android:codes="@integer/key_ctrl_left"
+            android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" 
-            android:isModifier="true" />
+            android:keyEdgeFlags="left"
+            android:keyLabel="Ctrl"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_fkey_f9"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="F9" />
+            android:keyLabel="F9"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f10"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="F10" />
+            android:keyLabel="F10"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f11"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="F11" />
+            android:keyLabel="F11"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_fkey_f12"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="F12" />
-
+            android:keyLabel="F12"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="1" />
+            android:isModifier="true"
+            android:keyLabel="1"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="2" />
+            android:isModifier="true"
+            android:keyLabel="2"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="3" />
+            android:isModifier="true"
+            android:keyLabel="3"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="-" />
-
+            android:isModifier="true"
+            android:keyLabel="-"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_page_up"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
-            android:isRepeatable="true"            
-            android:keyLabel="PgUp" />
-
+            android:isRepeatable="true"
+            android:keyLabel="PgUp"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
             android:iconPreview="@drawable/sym_keyboard_feedback_return"
-            android:keyWidth="14.2857142%p"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="Enter"
+            android:keyWidth="14.285719%p" />
     </Row>
     <Row>
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
             android:iconPreview="@drawable/sym_keyboard_feedback_shift"
-            android:keyWidth="10.7142855%p"
             android:isModifier="true"
             android:isSticky="true"
-            android:keyEdgeFlags="left" />
-
+            android:keyEdgeFlags="left"
+            android:keyLabel="Shift"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_sysrq"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="SyRq" />
+            android:keyLabel="SyRq"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_scroll_lock"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="ScrL" />
+            android:keyLabel="ScrL"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_break"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="Brk" />
+            android:keyLabel="Brk"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_num_lock"
-            android:keyWidth="8.035714%p"
             android:isModifier="true"
-            android:keyLabel="NumL" />
-
+            android:keyLabel="NumL"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="0" />
+            android:isModifier="true"
+            android:keyLabel="0"
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="," />
+            android:isModifier="true"
+            android:keyLabel=","
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="." />
+            android:isModifier="true"
+            android:keyLabel="."
+            android:keyWidth="8.035719%p" />
         <Key
-            android:keyWidth="8.035714%p"
-            android:keyLabel="+" />
-
+            android:isModifier="true"
+            android:keyLabel="+"
+            android:keyWidth="8.035719%p" />
         <Key
             android:codes="@integer/key_page_down"
-            android:keyWidth="10.7142857143%p"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:keyLabel="PgDn" />
-
+            android:keyLabel="PgDn"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_dpad_up"
-            android:isRepeatable="true"            
-            android:keyLabel="&#x25b3;" 
             android:isCursor="true"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Up" />
         <Key
             android:codes="@integer/key_shift"
-            android:keyIcon="@drawable/sym_keyboard_shift"
-            android:keyEdgeFlags="right" 
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="Shift" />
     </Row>
     <Row
-        android:rowEdgeFlags="bottom"
-    >
+        android:rowEdgeFlags="bottom">
         <Key
-            android:keyLabel="Esc"
             android:codes="@integer/key_escape"
-            android:keyWidth="10.7142855%p"
-            android:keyEdgeFlags="left" 
-            android:isModifier="true" />
-        <Key
-            android:codes="@integer/key_settings"
-            android:keyIcon="@drawable/sym_keyboard_settings"
-            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="Esc"
+            android:keyWidth="10.714281%p" />
         <Key
             android:codes="@integer/key_alt_left"
-            android:keyLabel="Alt"
+            android:isModifier="true"
             android:isSticky="true"
-            android:isModifier="true" />
+            android:keyLabel="Alt" />
         <Key
             android:codes="@integer/key_meta_left"
-            android:keyLabel="&#x2756;"
+            android:isModifier="true"
             android:isSticky="true"
-            android:isModifier="true" />
+            android:keyLabel="Meta" />
+        <Key
+            android:codes="@integer/key_settings"
+            android:iconPreview="@drawable/sym_keyboard_feedback_settings"
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_settings" />
         <Key
             android:codes="@integer/key_space"
-            android:shiftLabel="@string/key_space_shift"
-            android:keyIcon="@drawable/sym_keyboard_space"
             android:iconPreview="@drawable/sym_keyboard_feedback_space"
-            android:keyWidth="32.1428571372%p"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="32.142853%p"
+            android:shiftLabel="@string/key_space_shift" />
         <Key
             android:codes="@integer/key_fn"
-            android:keyLabel="Fn"
-            android:isModifier="true" />
+            android:isModifier="true"
+            android:keyLabel="Fn" />
         <Key
             android:codes="@integer/key_dpad_center"
-            android:isModifier="true"
             android:isCursor="true"
-            android:keyLabel="&#x25cb;" />
+            android:isModifier="true"
+            android:keyLabel="Cs" />
         <Key
             android:codes="@integer/key_dpad_left"
-            android:isModifier="true"
-            android:isRepeatable="true"            
             android:isCursor="true"
-            android:keyLabel="&#x25c1;" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyLabel="Lt" />
         <Key
             android:codes="@integer/key_dpad_down"
+            android:isCursor="true"
             android:isModifier="true"
             android:isRepeatable="true"
-            android:isCursor="true"
-            android:keyLabel="&#x25bd;" />
+            android:keyLabel="Dn" />
         <Key
             android:codes="@integer/key_dpad_right"
-            android:isModifier="true"            
-            android:keyLabel="&#x25b7;"
-            android:isRepeatable="true"            
             android:isCursor="true"
-            android:keyEdgeFlags="right" />
+            android:isModifier="true"
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyLabel="Rt" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_phone.xml b/app/src/main/res/xml/kbd_phone.xml
index 1e16a5a20..041acab1a 100644
--- a/app/src/main/res/xml/kbd_phone.xml
+++ b/app/src/main/res/xml/kbd_phone.xml
@@ -1,105 +1,95 @@
 <?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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="26.67%p"
-    android:horizontalGap="0px"
+    android:horizontalGap="0.0px"
+    android:keyWidth="16.666662%p"
     android:verticalGap="@dimen/key_bottom_gap"
->
+    xmlns:android="http://schemas.android.com/apk/res-auto">
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
+        <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="/"
+            android:keyWidth="25.0%p" />
         <Key
             android:codes="49"
-            android:keyIcon="@drawable/sym_keyboard_num1"
-            android:keyEdgeFlags="left" />
+            android:keyLabel="1" />
         <Key
             android:codes="50"
-            android:keyIcon="@drawable/sym_keyboard_num2" />
+            android:keyLabel="2" />
         <Key
             android:codes="51"
-            android:keyIcon="@drawable/sym_keyboard_num3" />
+            android:keyLabel="3" />
         <Key
-            android:keyLabel="-"
-            android:keyWidth="20%p"
+            android:codes="@integer/key_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:keyWidth="25.0%p" />
     </Row>
     <Row>
+        <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="-"
+            android:keyWidth="25.0%p" />
         <Key
             android:codes="52"
-            android:keyIcon="@drawable/sym_keyboard_num4"
-            android:keyEdgeFlags="left" />
+            android:keyLabel="4" />
         <Key
             android:codes="53"
-            android:keyIcon="@drawable/sym_keyboard_num5" />
+            android:keyLabel="5" />
         <Key
             android:codes="54"
-            android:keyIcon="@drawable/sym_keyboard_num6" />
+            android:keyLabel="6" />
         <Key
-            android:keyLabel="."
-            android:keyWidth="20%p"
+            android:codes="@integer/key_return"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:keyWidth="25.0%p" />
     </Row>
     <Row>
+        <Key
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel=","
+            android:keyWidth="25.0%p" />
         <Key
             android:codes="55"
-            android:keyIcon="@drawable/sym_keyboard_num7"
-            android:keyEdgeFlags="left" />
+            android:keyLabel="7" />
         <Key
             android:codes="56"
-            android:keyIcon="@drawable/sym_keyboard_num8" />
+            android:keyLabel="8" />
         <Key
             android:codes="57"
-            android:keyIcon="@drawable/sym_keyboard_num9" />
+            android:keyLabel="9" />
         <Key
-            android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
-            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:keyWidth="20%p"
             android:isModifier="true"
-            android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="."
+            android:keyWidth="25.0%p" />
     </Row>
     <Row
-        android:rowEdgeFlags="bottom"
-    >
+        android:rowEdgeFlags="bottom">
         <Key
             android:codes="@integer/key_symbol"
-            android:keyIcon="@drawable/sym_keyboard_numalt"
             android:iconPreview="@drawable/sym_keyboard_feedback_numalt"
-            android:keyEdgeFlags="left" />
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="* # ("
+            android:keyWidth="41.666664%p" />
         <Key
             android:codes="48"
-            android:keyIcon="@drawable/sym_keyboard_num0" />
+            android:keyLabel="0" />
         <Key
             android:codes="@integer/key_space"
-            android:keyIcon="@drawable/sym_keyboard_space"
-            android:iconPreview="@drawable/sym_keyboard_feedback_space" />
-        <Key
-            android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
-            android:keyWidth="20%p"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="41.666664%p" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file
diff --git a/app/src/main/res/xml/kbd_phone_symbols.xml b/app/src/main/res/xml/kbd_phone_symbols.xml
index 88bce7ed5..fe53159fd 100644
--- a/app/src/main/res/xml/kbd_phone_symbols.xml
+++ b/app/src/main/res/xml/kbd_phone_symbols.xml
@@ -1,101 +1,88 @@
 <?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.
-*/
--->
-
 <Keyboard
-    xmlns:android="http://schemas.android.com/apk/res-auto"
-    android:keyWidth="26.67%p"
-    android:horizontalGap="0px"
+    android:horizontalGap="0.0px"
+    android:keyWidth="16.666662%p"
     android:verticalGap="@dimen/key_bottom_gap"
->
+    xmlns:android="http://schemas.android.com/apk/res-auto">
     <Row
-        android:rowEdgeFlags="top"
-    >
+        android:rowEdgeFlags="top">
         <Key
-            android:keyLabel="("
-            android:keyEdgeFlags="left" />
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="/"
+            android:keyWidth="25.0%p" />
+        <Key
+            android:keyLabel="(" />
         <Key
-            android:keyLabel="/" />
+            android:keyLabel="N" />
         <Key
             android:keyLabel=")" />
         <Key
-            android:keyLabel="-"
-            android:keyWidth="20%p"
+            android:codes="@integer/key_delete"
+            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:isRepeatable="true"
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_delete"
+            android:keyWidth="25.0%p" />
     </Row>
     <Row>
         <Key
-            android:keyLabel="N"
-            android:keyEdgeFlags="left" />
-        <!-- Pause is a comma. Check PhoneNumberUtils.java to see if this 
-            has changed. -->
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel="-"
+            android:keyWidth="25.0%p" />
         <Key
             android:codes="44"
-            android:keyLabel="Pause" />
+            android:keyLabel="Pause"
+            android:keyWidth="25.0%p" />
         <Key
-            android:keyLabel="," />
+            android:codes="59"
+            android:keyLabel="Wait"
+            android:keyWidth="25.0%p" />
         <Key
-            android:keyLabel="."
-            android:keyWidth="20%p"
+            android:codes="@integer/key_return"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_return"
+            android:keyWidth="25.0%p" />
     </Row>
     <Row>
         <Key
-            android:codes="42"
-            android:keyIcon="@drawable/sym_keyboard_numstar"
-            android:keyEdgeFlags="left" />
-        <!-- Wait is a semicolon. -->
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
+            android:keyLabel=","
+            android:keyWidth="25.0%p" />
         <Key
-            android:codes="59"
-            android:keyLabel="Wait" />
+            android:codes="42"
+            android:keyLabel="*"
+            android:keyWidth="25.0%p" />
         <Key
             android:codes="35"
-            android:keyIcon="@drawable/sym_keyboard_numpound" />
+            android:keyLabel="\#"
+            android:keyWidth="25.0%p" />
         <Key
-            android:codes="@integer/key_delete"
-            android:keyIcon="@drawable/sym_keyboard_delete"
-            android:iconPreview="@drawable/sym_keyboard_feedback_delete"
-            android:keyWidth="20%p"
             android:isModifier="true"
-            android:isRepeatable="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyLabel="."
+            android:keyWidth="25.0%p" />
     </Row>
     <Row
-        android:rowEdgeFlags="bottom"
-    >
+        android:rowEdgeFlags="bottom">
         <Key
             android:codes="@integer/key_symbol"
+            android:isModifier="true"
+            android:keyEdgeFlags="left"
             android:keyLabel="@string/label_phone_key"
-            android:keyEdgeFlags="left" />
+            android:keyWidth="41.666664%p" />
         <Key
             android:keyLabel="+" />
         <Key
             android:codes="@integer/key_space"
-            android:keyIcon="@drawable/sym_keyboard_space"
-            android:iconPreview="@drawable/sym_keyboard_feedback_space" />
-        <Key
-            android:codes="@integer/key_return"
-            android:keyIcon="@drawable/sym_keyboard_return"
-            android:keyWidth="20%p"
+            android:iconPreview="@drawable/sym_keyboard_feedback_space"
             android:isModifier="true"
-            android:keyEdgeFlags="right" />
+            android:keyEdgeFlags="right"
+            android:keyIcon="@drawable/sym_keyboard_space"
+            android:keyWidth="41.666664%p" />
     </Row>
-</Keyboard>
+</Keyboard>
\ No newline at end of file