diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png
deleted file mode 100644
index 25df0ef0b..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png
deleted file mode 100644
index 12df78ed3..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png
deleted file mode 100644
index 03fcd0731..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png
deleted file mode 100644
index 41c007b0a..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png
deleted file mode 100644
index 2e7d7b3ca..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png
deleted file mode 100644
index 28c470af2..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png
deleted file mode 100644
index 33b6535db..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png
deleted file mode 100644
index 6365e45b1..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png
deleted file mode 100644
index 59b4426f6..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png
deleted file mode 100644
index 426c4e502..000000000
Binary files a/java/res/drawable-sw600dp-hdpi/key_hint_num9_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png
deleted file mode 100644
index d9a162654..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png
deleted file mode 100644
index ac6c7294b..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png
deleted file mode 100644
index fc2877402..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png
deleted file mode 100644
index 890af2690..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png
deleted file mode 100644
index 72a57034f..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png
deleted file mode 100644
index 03c117df4..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png
deleted file mode 100644
index b07bef3b8..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png
deleted file mode 100644
index 3ae17e152..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png
deleted file mode 100644
index e2c6763d7..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png
deleted file mode 100644
index ec03b2c78..000000000
Binary files a/java/res/drawable-sw600dp-mdpi/key_hint_num9_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png
deleted file mode 100644
index 3a9232b00..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num0_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png
deleted file mode 100644
index 1b2d80eb6..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num1_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png
deleted file mode 100644
index b80d17348..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num2_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png
deleted file mode 100644
index 2d7214e42..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num3_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png
deleted file mode 100644
index 2abdb37c1..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num4_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png
deleted file mode 100644
index af9b842b9..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num5_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png
deleted file mode 100644
index 859483926..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num6_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png
deleted file mode 100644
index 5727b06c5..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num7_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png
deleted file mode 100644
index 2628c107f..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num8_holo.9.png and /dev/null differ
diff --git a/java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png b/java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png
deleted file mode 100644
index cd8476f27..000000000
Binary files a/java/res/drawable-sw600dp-xhdpi/key_hint_num9_holo.9.png and /dev/null differ
diff --git a/java/res/values-sw600dp/config.xml b/java/res/values-sw600dp/config.xml
index b6d8e33f9..c3d34456e 100644
--- a/java/res/values-sw600dp/config.xml
+++ b/java/res/values-sw600dp/config.xml
@@ -29,7 +29,7 @@
false
false
false
- true
+ false
false
true
diff --git a/java/res/xml-sw600dp/kbd_azerty_rows.xml b/java/res/xml-sw600dp/kbd_azerty_rows.xml
index 3d57ae715..140aec6f1 100644
--- a/java/res/xml-sw600dp/kbd_azerty_rows.xml
+++ b/java/res/xml-sw600dp/kbd_azerty_rows.xml
@@ -29,44 +29,34 @@
>
diff --git a/java/res/xml-sw600dp/kbd_qwertz_rows.xml b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
index 3490cc7fd..7adfc07f0 100644
--- a/java/res/xml-sw600dp/kbd_qwertz_rows.xml
+++ b/java/res/xml-sw600dp/kbd_qwertz_rows.xml
@@ -29,44 +29,34 @@
>
+ latin:keyLabel="ц" />
+ latin:keyLabel="у" />
+ latin:keyLabel="к" />
+ latin:keyLabel="н" />
+ latin:keyLabel="г" />
+ latin:keyLabel="ш" />
+ latin:keyLabel="щ" />
+ latin:keyLabel="з" />
+ latin:keyLabel="њ" />
+ latin:keyLabel="е" />
+ latin:keyLabel="р" />
+ latin:keyLabel="т" />
+ latin:keyLabel="з" />
+ latin:keyLabel="у" />
+ latin:keyLabel="и" />
+ latin:keyLabel="о" />
+ latin:keyLabel="п" />