diff --git a/java/res/xml-sw600dp/kbd_rows_number.xml b/java/res/xml-sw600dp/kbd_rows_number.xml
deleted file mode 100644
index cfb24212b..000000000
--- a/java/res/xml-sw600dp/kbd_rows_number.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/res/xml-sw600dp/kbd_rows_number_normal.xml b/java/res/xml-sw600dp/kbd_rows_number_normal.xml
new file mode 100644
index 000000000..1e39f39f2
--- /dev/null
+++ b/java/res/xml-sw600dp/kbd_rows_number_normal.xml
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml-sw600dp/kbd_rows_number_password.xml b/java/res/xml-sw600dp/kbd_rows_number_password.xml
new file mode 100644
index 000000000..4d9633473
--- /dev/null
+++ b/java/res/xml-sw600dp/kbd_rows_number_password.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml-sw768dp/kbd_rows_number.xml b/java/res/xml-sw768dp/kbd_rows_number.xml
deleted file mode 100644
index 1268987b5..000000000
--- a/java/res/xml-sw768dp/kbd_rows_number.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/res/xml-sw768dp/kbd_rows_number_normal.xml b/java/res/xml-sw768dp/kbd_rows_number_normal.xml
new file mode 100644
index 000000000..0e80e8043
--- /dev/null
+++ b/java/res/xml-sw768dp/kbd_rows_number_normal.xml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml-sw768dp/kbd_rows_number_password.xml b/java/res/xml-sw768dp/kbd_rows_number_password.xml
new file mode 100644
index 000000000..77fb9caac
--- /dev/null
+++ b/java/res/xml-sw768dp/kbd_rows_number_password.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml/kbd_rows_number.xml b/java/res/xml/kbd_rows_number.xml
index 90ac5686b..b066e0a03 100644
--- a/java/res/xml/kbd_rows_number.xml
+++ b/java/res/xml/kbd_rows_number.xml
@@ -2,7 +2,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/java/res/xml/kbd_rows_number_normal.xml b/java/res/xml/kbd_rows_number_normal.xml
new file mode 100644
index 000000000..054b564b0
--- /dev/null
+++ b/java/res/xml/kbd_rows_number_normal.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml/kbd_rows_number_password.xml b/java/res/xml/kbd_rows_number_password.xml
new file mode 100644
index 000000000..ebc13c6a0
--- /dev/null
+++ b/java/res/xml/kbd_rows_number_password.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+