diff --git a/java/res/xml/row_number_switch.xml b/java/res/xml/row_number_switch.xml
new file mode 100644
index 000000000..892e70c9c
--- /dev/null
+++ b/java/res/xml/row_number_switch.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml/rows_arabic.xml b/java/res/xml/rows_arabic.xml
index cff4a153b..62c2ea60d 100644
--- a/java/res/xml/rows_arabic.xml
+++ b/java/res/xml/rows_arabic.xml
@@ -20,6 +20,7 @@
+
+
+
diff --git a/java/res/xml/rows_bengali.xml b/java/res/xml/rows_bengali.xml
index e4a4b922b..e53ef735d 100644
--- a/java/res/xml/rows_bengali.xml
+++ b/java/res/xml/rows_bengali.xml
@@ -20,6 +20,7 @@
+
+
diff --git a/java/res/xml/rows_bulgarian.xml b/java/res/xml/rows_bulgarian.xml
index 9f892e077..99c5395a3 100644
--- a/java/res/xml/rows_bulgarian.xml
+++ b/java/res/xml/rows_bulgarian.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_bulgarian_bds.xml b/java/res/xml/rows_bulgarian_bds.xml
index 871e73ba6..2c4dba127 100644
--- a/java/res/xml/rows_bulgarian_bds.xml
+++ b/java/res/xml/rows_bulgarian_bds.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_colemak.xml b/java/res/xml/rows_colemak.xml
index 6b0365217..190566e4b 100644
--- a/java/res/xml/rows_colemak.xml
+++ b/java/res/xml/rows_colemak.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_dvorak.xml b/java/res/xml/rows_dvorak.xml
index 3a2be744b..10ed0ebbd 100644
--- a/java/res/xml/rows_dvorak.xml
+++ b/java/res/xml/rows_dvorak.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_east_slavic.xml b/java/res/xml/rows_east_slavic.xml
index deed06759..a12118e1d 100644
--- a/java/res/xml/rows_east_slavic.xml
+++ b/java/res/xml/rows_east_slavic.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_farsi.xml b/java/res/xml/rows_farsi.xml
index 4c24772ba..c4a00f947 100644
--- a/java/res/xml/rows_farsi.xml
+++ b/java/res/xml/rows_farsi.xml
@@ -20,6 +20,7 @@
+
+
diff --git a/java/res/xml/rows_greek.xml b/java/res/xml/rows_greek.xml
index 906219168..8026452f1 100644
--- a/java/res/xml/rows_greek.xml
+++ b/java/res/xml/rows_greek.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_hebrew.xml b/java/res/xml/rows_hebrew.xml
index aa2d2f145..770afe4f8 100644
--- a/java/res/xml/rows_hebrew.xml
+++ b/java/res/xml/rows_hebrew.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_hindi.xml b/java/res/xml/rows_hindi.xml
index c6b6135c9..e9b8df681 100644
--- a/java/res/xml/rows_hindi.xml
+++ b/java/res/xml/rows_hindi.xml
@@ -20,6 +20,7 @@
+
+
+
+
+
+
+
+
diff --git a/java/res/xml/rows_nepali_romanized.xml b/java/res/xml/rows_nepali_romanized.xml
index 3e0f9d2f7..fb31db4df 100644
--- a/java/res/xml/rows_nepali_romanized.xml
+++ b/java/res/xml/rows_nepali_romanized.xml
@@ -20,6 +20,7 @@
+
+
+
diff --git a/java/res/xml/rows_qwerty.xml b/java/res/xml/rows_qwerty.xml
index 29f902d17..a0803df29 100644
--- a/java/res/xml/rows_qwerty.xml
+++ b/java/res/xml/rows_qwerty.xml
@@ -23,19 +23,7 @@
>
-
-
-
-
-
-
-
-
-
-
+
diff --git a/java/res/xml/rows_qwertz.xml b/java/res/xml/rows_qwertz.xml
index 3762c328d..2f4b3375c 100644
--- a/java/res/xml/rows_qwertz.xml
+++ b/java/res/xml/rows_qwertz.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_serbian_qwertz.xml b/java/res/xml/rows_serbian_qwertz.xml
index 5dd2a92d6..5e6fdc34a 100644
--- a/java/res/xml/rows_serbian_qwertz.xml
+++ b/java/res/xml/rows_serbian_qwertz.xml
@@ -20,6 +20,7 @@
+
diff --git a/java/res/xml/rows_sinhala.xml b/java/res/xml/rows_sinhala.xml
index 13d583a39..ef7d333c5 100644
--- a/java/res/xml/rows_sinhala.xml
+++ b/java/res/xml/rows_sinhala.xml
@@ -20,6 +20,7 @@
+
+
diff --git a/java/res/xml/rows_spanish.xml b/java/res/xml/rows_spanish.xml
index 9234fddbc..7363f55bd 100644
--- a/java/res/xml/rows_spanish.xml
+++ b/java/res/xml/rows_spanish.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_swiss.xml b/java/res/xml/rows_swiss.xml
index 459c07f84..8ca135ed2 100644
--- a/java/res/xml/rows_swiss.xml
+++ b/java/res/xml/rows_swiss.xml
@@ -23,6 +23,7 @@
>
+
diff --git a/java/res/xml/rows_symbols.xml b/java/res/xml/rows_symbols.xml
index fcedf05b8..d56edb80e 100644
--- a/java/res/xml/rows_symbols.xml
+++ b/java/res/xml/rows_symbols.xml
@@ -31,6 +31,10 @@
+
+
+
+
diff --git a/java/res/xml/rows_symbols_shift.xml b/java/res/xml/rows_symbols_shift.xml
index 28646375d..b7fb338bd 100644
--- a/java/res/xml/rows_symbols_shift.xml
+++ b/java/res/xml/rows_symbols_shift.xml
@@ -25,6 +25,10 @@
latin:keyboardLayout="@xml/key_styles_common" />
+
+
+
+
diff --git a/java/res/xml/rows_tamil.xml b/java/res/xml/rows_tamil.xml
index e0dc48ccf..6afa283ae 100644
--- a/java/res/xml/rows_tamil.xml
+++ b/java/res/xml/rows_tamil.xml
@@ -20,6 +20,7 @@
+
+
+
+