diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 223fcfb3a32d105714b5797cc480291223931ce9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index c9d3d749bb5e773217b18cae6f71662c7cce2391..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index 5ed614a5988ac0271fc05ae8d4b4818516ca617b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 00168b272d3f348f750278e55db913777a8a73ca..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index 980547e37da6676f83325b2dfbd3cf9b92ebf71b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index 868eec332d9defbac3a427a69c00268ed99e4f80..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index 27d2b7d1b0ea6db9ca2ee6bcaac0fb550f01efa9..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index d89bddae95b59846e5df5f69ff8fac167fcfdb7a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index e11d854e470df1b2bd96247a59a34650a209591a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index 0eb4aa244ed0c748c8731c9cca14b2bbfc94f8d7..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png
deleted file mode 100644
index b53456a997c80d9bced024354c4f16f35ef01bbd..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-hdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index 66111eefa61a05c6c8b695e73cd489e2c6180987..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index 5420161b7fcf1ef9bab6ec5783745daedfb33c92..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index 1821337270fe080910c60636259636a3f08b251c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 3c81666821fba1a8ff73ee2e8c018c9c647d3296..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index 6e3d718b2076693fbcc4bbd5dc5d139fefc7ce16..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index ea2f0e967632060a5515ccad352b26a4cc82da6b..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index 9c08b5a1767bd89c0427ddf94e4695aaf9be885f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index dac90bb87c36a5e26fa4607c72e017dd14203bcc..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index 79f3735ef46bb3312c55a908687f5a0692720b8d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index b1678f03e060b2e4618ecf69cd5f0fc9717bdf1d..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png
deleted file mode 100644
index 58142fa6d2025e60f0e7f17ef2d144e1c8019282..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-mdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png
deleted file mode 100644
index df64bbe9b34e2b06cb91d96e28cdcd5256190355..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_delete_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png
deleted file mode 100644
index 13f78c4801a4714891910d0af75b8310dc5e5839..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_return_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png
deleted file mode 100644
index 7e0f1ae079601f1409737c8950f16bf1e48e5d44..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_search_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png
deleted file mode 100644
index 8c1395edfafadb31c5be20dfdfcd5c1b4daa2f3a..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_settings_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png
deleted file mode 100644
index a4068eae4abe16cc1fc9da9f10eb541dcb969b13..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png
deleted file mode 100644
index 4cb37cdfcb20a4b3dbea26e776cfc9d448e11489..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_shift_locked_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png
deleted file mode 100644
index 481d889aba8fb369ba1c0403b726c53916d42dee..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_smiley_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png
deleted file mode 100644
index 4bfbf6651514d2f33dc1921e6d7c317f0ceeb18c..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_space_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png
deleted file mode 100644
index 1ea57c5cb264c4513410a2114da1fe0130907eeb..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_tab_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png
deleted file mode 100644
index 597be7d92e878325978e65a41ccdd638e1b18c7f..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_holo.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png b/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png
deleted file mode 100644
index 58fd48b4af445ca6b3cf4534b4f117061e6d4156..0000000000000000000000000000000000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/sym_keyboard_voice_off_holo.png and /dev/null differ
diff --git a/java/res/values-sw600dp-land/dimens.xml b/java/res/values-sw600dp-land/dimens.xml
index c75fcc0d1697f7bb2033a1da4b99e92a25702798..1d26338c5eafca265951fd038b51cc22dbde300e 100644
--- a/java/res/values-sw600dp-land/dimens.xml
+++ b/java/res/values-sw600dp-land/dimens.xml
@@ -44,7 +44,7 @@
<dimen name="key_label_horizontal_padding">18dip</dimen>
<fraction name="key_letter_ratio">45%</fraction>
- <fraction name="key_large_letter_ratio">45%</fraction>
+ <fraction name="key_large_letter_ratio">48%</fraction>
<fraction name="key_label_ratio">32%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
<fraction name="key_hint_label_ratio">34%</fraction>
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index 20876a2028cb5ddb21e8ae5d0ad227702d63da8c..942bc726f4f9761142294f5bd5580d7030093362 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -53,12 +53,12 @@
<dimen name="key_hint_letter_padding">3dp</dimen>
<dimen name="key_uppercase_letter_padding">3dp</dimen>
- <fraction name="key_letter_ratio">37%</fraction>
- <fraction name="key_large_letter_ratio">37%</fraction>
- <fraction name="key_label_ratio">22%</fraction>
+ <fraction name="key_letter_ratio">42%</fraction>
+ <fraction name="key_large_letter_ratio">45%</fraction>
+ <fraction name="key_label_ratio">25%</fraction>
<fraction name="key_hint_letter_ratio">23%</fraction>
- <fraction name="key_hint_label_ratio">26%</fraction>
- <fraction name="key_uppercase_letter_ratio">25%</fraction>
+ <fraction name="key_hint_label_ratio">28%</fraction>
+ <fraction name="key_uppercase_letter_ratio">26%</fraction>
<fraction name="key_preview_text_ratio">50%</fraction>
<dimen name="key_preview_height">15.0mm</dimen>
<dimen name="key_preview_offset">0.1in</dimen>
diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml
index 05b683707aa2675f39967daf52cc2146e19ff2b7..15a3d1df5a8013d7c73716d317d8b23db7b1bfa1 100644
--- a/java/res/xml-sw600dp/kbd_key_styles.xml
+++ b/java/res/xml-sw600dp/kbd_key_styles.xml
@@ -96,25 +96,21 @@
latin:styleName="toSymbolKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_symbol_key"
- latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="toAlphaKeyStyle"
latin:code="@integer/key_switch_alpha_symbol"
latin:keyLabel="@string/label_to_alpha_key"
- latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="toMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_more_symbol_for_tablet_key"
- latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="backFromMoreSymbolKeyStyle"
latin:code="@integer/key_shift"
latin:keyLabel="@string/label_to_symbol_key"
- latin:keyLabelOption="fontNormal"
latin:parentStyle="functionalKeyStyle" />
<key-style
latin:styleName="comKeyStyle"
diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index f22b69f731be7bbeded1916b2ab01ebf0477e7dd..4c978cb2c1514a392d524cd67f03796876cae9af 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -26,7 +26,6 @@
>
<Key
latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabelOption="alignLeft"
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml
index 4f6a9bc3138ba8fd115ba7a23909968cc4059019..420e46cce6776ee91ffd4a56cbc1d17615772aa9 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml
@@ -147,7 +147,6 @@
>
<Key
latin:keyStyle="toAlphaKeyStyle"
- latin:keyLabelOption="alignLeft"
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
index 1dca8c47eeedc3f2f0555a652fa84abb87639e0a..2909acb6f4d6b96c06592813c55a8ec6788a4dcb 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml
@@ -133,7 +133,6 @@
>
<Key
latin:keyStyle="toAlphaKeyStyle"
- latin:keyLabelOption="alignLeft"
latin:keyWidth="13.0%p" />
<Key
latin:keyStyle="tabKeyStyle" />