diff --git a/app/src/main/res/xml-sw600dp-land/rows_german.xml b/app/src/main/res/xml-sw600dp-land/rows_german.xml
index a46a0c1d0..c167ee01b 100644
--- a/app/src/main/res/xml-sw600dp-land/rows_german.xml
+++ b/app/src/main/res/xml-sw600dp-land/rows_german.xml
@@ -26,6 +26,18 @@
     <!-- TODO: Consolidate the layout specification between protrait and landscape.
          Ideally just the keyWidth should be different and the spacer should adjust to fill
          the available space. -->
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <!-- First row -->
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_arabic.xml b/app/src/main/res/xml-sw600dp/rows_arabic.xml
index df2b1891f..a4d0bbd82 100644
--- a/app/src/main/res/xml-sw600dp/rows_arabic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_arabic.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_arabic_pc.xml b/app/src/main/res/xml-sw600dp/rows_arabic_pc.xml
index 26d087a42..4cd10e6fb 100644
--- a/app/src/main/res/xml-sw600dp/rows_arabic_pc.xml
+++ b/app/src/main/res/xml-sw600dp/rows_arabic_pc.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml b/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
index 188c841a1..cd926f326 100644
--- a/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali.xml b/app/src/main/res/xml-sw600dp/rows_bengali.xml
index 9dfe32139..50f3e9f31 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml b/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
index 468cecda8..982d058b1 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyLabelFlags="fontNormal"
         latin:keyWidth="8.182%p" >
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
index da731cea0..5f4c94c23 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
@@ -19,20 +19,44 @@
 -->
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
-    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="9.0%p">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1" />
-        <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" />
+    <include latin:keyboardLayout="@xml/key_styles_common"/>
+    <switch>
+        <case latin:numberRowEnabled="true">
+            <Row latin:keyWidth="10%p">
+                <include latin:keyboardLayout="@xml/rowkeys_symbols1"/>
+            </Row>
+        </case>
+    </switch>
+    <Row
+        latin:keyLabelFlags="fontNormal"
+        latin:keyWidth="9.0%p">
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1"/>
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"/>
     </Row>
     <Row latin:keyLabelFlags="fontNormal">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2" latin:keyXPos="4.5%p" latin:keyWidth="9.0%p" />
-        <Key latin:keyStyle="enterKeyStyle" latin:keyWidth="fillRight" />
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2"
+            latin:keyXPos="4.5%p"
+            latin:keyWidth="9.0%p"/>
+        <Key
+            latin:keyStyle="enterKeyStyle"
+            latin:keyWidth="fillRight"/>
     </Row>
     <Row latin:keyLabelFlags="fontNormal">
-        <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="10.0%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3" latin:keyWidth="9.0%p" />
-        <include latin:keyboardLayout="@xml/keys_exclamation_question" latin:keyWidth="9.0%p" />
-        <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="fillRight" />
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="10.0%p"/>
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3"
+            latin:keyWidth="9.0%p"/>
+        <include
+            latin:keyboardLayout="@xml/keys_exclamation_question"
+            latin:keyWidth="9.0%p"/>
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="fillRight"/>
     </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4"/>
 </merge>
diff --git a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml b/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
index e575ead56..64183301f 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml b/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
index e290a8c18..09c792ae0 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_bulgarian_bekl.xml b/app/src/main/res/xml-sw600dp/rows_bulgarian_bekl.xml
index 78669739e..9ee95d2e7 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian_bekl.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bulgarian_bekl.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_east_slavic.xml b/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
index 8c08bbff6..bf86153f6 100644
--- a/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_farsi.xml b/app/src/main/res/xml-sw600dp/rows_farsi.xml
index 2849df58a..849058cf7 100644
--- a/app/src/main/res/xml-sw600dp/rows_farsi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_farsi.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_georgian.xml b/app/src/main/res/xml-sw600dp/rows_georgian.xml
index 7874c7531..03ad31c70 100644
--- a/app/src/main/res/xml-sw600dp/rows_georgian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_georgian.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_german.xml b/app/src/main/res/xml-sw600dp/rows_german.xml
index fdee1cce7..c09520ad2 100644
--- a/app/src/main/res/xml-sw600dp/rows_german.xml
+++ b/app/src/main/res/xml-sw600dp/rows_german.xml
@@ -26,6 +26,18 @@
     <!-- TODO: Consolidate the layout specification between protrait and landscape.
          Ideally just the keyWidth should be different and the spacer should adjust to fill
          the available space. -->
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <!-- First row -->
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp/rows_greek.xml b/app/src/main/res/xml-sw600dp/rows_greek.xml
index b2ed3e3a2..0e0d83fbb 100644
--- a/app/src/main/res/xml-sw600dp/rows_greek.xml
+++ b/app/src/main/res/xml-sw600dp/rows_greek.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_hebrew.xml b/app/src/main/res/xml-sw600dp/rows_hebrew.xml
index fe582aff6..7ce5e1070 100644
--- a/app/src/main/res/xml-sw600dp/rows_hebrew.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hebrew.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_hindi.xml b/app/src/main/res/xml-sw600dp/rows_hindi.xml
index 7608acf7a..7c8883d77 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hindi.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml b/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
index d4a247e4e..ec0382366 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_kannada.xml b/app/src/main/res/xml-sw600dp/rows_kannada.xml
index dc755a14c..4e4df1a90 100644
--- a/app/src/main/res/xml-sw600dp/rows_kannada.xml
+++ b/app/src/main/res/xml-sw600dp/rows_kannada.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml-sw600dp/rows_khmer.xml b/app/src/main/res/xml-sw600dp/rows_khmer.xml
index 3af0b2077..8a84ac6de 100644
--- a/app/src/main/res/xml-sw600dp/rows_khmer.xml
+++ b/app/src/main/res/xml-sw600dp/rows_khmer.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="7.5%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml-sw600dp/rows_lao.xml b/app/src/main/res/xml-sw600dp/rows_lao.xml
index 77a12c264..2f655ac2b 100644
--- a/app/src/main/res/xml-sw600dp/rows_lao.xml
+++ b/app/src/main/res/xml-sw600dp/rows_lao.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="7.5%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_malayalam.xml b/app/src/main/res/xml-sw600dp/rows_malayalam.xml
index f7f425f20..dde29e0ed 100644
--- a/app/src/main/res/xml-sw600dp/rows_malayalam.xml
+++ b/app/src/main/res/xml-sw600dp/rows_malayalam.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml-sw600dp/rows_marathi.xml b/app/src/main/res/xml-sw600dp/rows_marathi.xml
index f127e1a86..c911e6a7e 100644
--- a/app/src/main/res/xml-sw600dp/rows_marathi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_marathi.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_mongolian.xml b/app/src/main/res/xml-sw600dp/rows_mongolian.xml
index 39e67eb0f..1fee60e10 100644
--- a/app/src/main/res/xml-sw600dp/rows_mongolian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_mongolian.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml b/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
index 1f4eb5a35..941228cd5 100644
--- a/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml b/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
index 7b0678bf2..8fe93a43a 100644
--- a/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_nordic.xml b/app/src/main/res/xml-sw600dp/rows_nordic.xml
index f2242dd95..e267f252d 100644
--- a/app/src/main/res/xml-sw600dp/rows_nordic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nordic.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_sinhala.xml b/app/src/main/res/xml-sw600dp/rows_sinhala.xml
index 2fe89792e..15d4797e3 100644
--- a/app/src/main/res/xml-sw600dp/rows_sinhala.xml
+++ b/app/src/main/res/xml-sw600dp/rows_sinhala.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml-sw600dp/rows_south_slavic.xml b/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
index cfe5c5757..820f90b3d 100644
--- a/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_spanish.xml b/app/src/main/res/xml-sw600dp/rows_spanish.xml
index 27be76c9d..6778a216f 100644
--- a/app/src/main/res/xml-sw600dp/rows_spanish.xml
+++ b/app/src/main/res/xml-sw600dp/rows_spanish.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_swiss.xml b/app/src/main/res/xml-sw600dp/rows_swiss.xml
index e057f5fba..3f7b662cf 100644
--- a/app/src/main/res/xml-sw600dp/rows_swiss.xml
+++ b/app/src/main/res/xml-sw600dp/rows_swiss.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_symbols.xml b/app/src/main/res/xml-sw600dp/rows_symbols.xml
index 664a87e91..d15b4f3c6 100644
--- a/app/src/main/res/xml-sw600dp/rows_symbols.xml
+++ b/app/src/main/res/xml-sw600dp/rows_symbols.xml
@@ -25,15 +25,38 @@
         latin:keyboardLayout="@xml/key_styles_common" />
     <include
         latin:keyboardLayout="@xml/key_styles_currency" />
-    <Row
-        latin:keyWidth="9.0%p"
-    >
-        <include
-            latin:keyboardLayout="@xml/rowkeys_symbols1" />
-        <Key
-            latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight" />
-    </Row>
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+            <Row
+                latin:keyWidth="9.0%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+        </case>
+        <default>
+            <Row
+                latin:keyWidth="9.0%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+                <Key
+                    latin:keyStyle="deleteKeyStyle"
+                    latin:keyWidth="fillRight" />
+            </Row>
+        </default>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml b/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
index ac9ca2eec..6a2aa42f5 100644
--- a/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
@@ -25,6 +25,18 @@
         latin:keyboardLayout="@xml/key_styles_common" />
     <include
         latin:keyboardLayout="@xml/key_styles_currency" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_tamil.xml b/app/src/main/res/xml-sw600dp/rows_tamil.xml
index 569a634c3..44d09636a 100644
--- a/app/src/main/res/xml-sw600dp/rows_tamil.xml
+++ b/app/src/main/res/xml-sw600dp/rows_tamil.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml-sw600dp/rows_telugu.xml b/app/src/main/res/xml-sw600dp/rows_telugu.xml
index c782969f8..f663929ca 100644
--- a/app/src/main/res/xml-sw600dp/rows_telugu.xml
+++ b/app/src/main/res/xml-sw600dp/rows_telugu.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml-sw600dp/rows_thai.xml b/app/src/main/res/xml-sw600dp/rows_thai.xml
index df3cca7b0..fc2893aa1 100644
--- a/app/src/main/res/xml-sw600dp/rows_thai.xml
+++ b/app/src/main/res/xml-sw600dp/rows_thai.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="7.5%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_uzbek.xml b/app/src/main/res/xml-sw600dp/rows_uzbek.xml
index 06e51a00d..713ddff66 100644
--- a/app/src/main/res/xml-sw600dp/rows_uzbek.xml
+++ b/app/src/main/res/xml-sw600dp/rows_uzbek.xml
@@ -20,6 +20,18 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row latin:keyWidth="8.182%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
         <Key
diff --git a/app/src/main/res/xml-sw600dp/rows_workman.xml b/app/src/main/res/xml-sw600dp/rows_workman.xml
index 903893d69..8e911af85 100644
--- a/app/src/main/res/xml-sw600dp/rows_workman.xml
+++ b/app/src/main/res/xml-sw600dp/rows_workman.xml
@@ -25,6 +25,18 @@
         latin:keyboardLayout="@xml/key_styles_common" />
          Ideally just the keyWidth should be different and the spacer should adjust to fill
          the available space. -->
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <!-- First row -->
     <Row>
         <include
diff --git a/app/src/main/res/xml/rows_bengali_unijoy.xml b/app/src/main/res/xml/rows_bengali_unijoy.xml
index 81e97eea5..c27bf5fe8 100644
--- a/app/src/main/res/xml/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml/rows_bengali_unijoy.xml
@@ -19,24 +19,38 @@
 -->
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
-    <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include latin:keyboardLayout="@xml/key_styles_common"/>
     <switch>
         <case latin:numberRowEnabled="true">
             <Row latin:keyWidth="10%p">
-                <include latin:keyboardLayout="@xml/rowkeys_symbols1" />
+                <include latin:keyboardLayout="@xml/rowkeys_symbols1"/>
             </Row>
         </case>
     </switch>
-    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="10%p">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1" />
+    <Row
+        latin:keyLabelFlags="fontNormal"
+        latin:keyWidth="10%p">
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1"/>
     </Row>
-    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="10%p">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2" latin:keyXPos="5%p" />
+    <Row
+        latin:keyLabelFlags="fontNormal"
+        latin:keyWidth="10%p">
+        <include
+            latin:keyboardLayout="@xml/rowkeys_bengali_unijoy2"
+            latin:keyXPos="5%p"/>
     </Row>
-    <Row latin:keyLabelFlags="fontNormal" latin:keyWidth="10%p">
-        <Key latin:keyStyle="shiftKeyStyle" latin:keyWidth="15%p" latin:visualInsetsRight="1%p" />
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3" />
-        <Key latin:keyStyle="deleteKeyStyle" latin:keyWidth="fillRight" latin:visualInsetsLeft="1%p" />
+    <Row
+        latin:keyLabelFlags="fontNormal"
+        latin:keyWidth="10%p">
+        <Key
+            latin:keyStyle="shiftKeyStyle"
+            latin:keyWidth="15%p"
+            latin:visualInsetsRight="1%p"/>
+        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3"/>
+        <Key
+            latin:keyStyle="deleteKeyStyle"
+            latin:keyWidth="fillRight"
+            latin:visualInsetsLeft="1%p"/>
     </Row>
-    <include latin:keyboardLayout="@xml/row_qwerty4" />
+    <include latin:keyboardLayout="@xml/row_qwerty4"/>
 </merge>