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..7f4274d01 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,8 @@
     <!-- 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. -->
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- First row -->
     <Row
         latin:keyWidth="8.182%p"
diff --git a/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml b/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml
index dcbff2a72..9223d8d94 100644
--- a/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml
+++ b/app/src/main/res/xml-sw600dp-land/rows_qwerty.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- First row -->
     <Row>
         <switch>
diff --git a/app/src/main/res/xml-sw600dp-land/rows_qwertz.xml b/app/src/main/res/xml-sw600dp-land/rows_qwertz.xml
index 0817a95e6..5dbd4e642 100644
--- a/app/src/main/res/xml-sw600dp-land/rows_qwertz.xml
+++ b/app/src/main/res/xml-sw600dp-land/rows_qwertz.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- First row -->
     <Row>
         <switch>
diff --git a/app/src/main/res/xml-sw600dp/rows_arabic.xml b/app/src/main/res/xml-sw600dp/rows_arabic.xml
index df2b1891f..c5ca605ae 100644
--- a/app/src/main/res/xml-sw600dp/rows_arabic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_arabic.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..358e11fa8 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,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..6fff3f5bb 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,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.0%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml-sw600dp/rows_azerty.xml b/app/src/main/res/xml-sw600dp/rows_azerty.xml
index 404796b05..7da537556 100644
--- a/app/src/main/res/xml-sw600dp/rows_azerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_azerty.xml
@@ -25,18 +25,8 @@
         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" />
-            </Row>
-        </case>
-    </switch>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_bengali.xml b/app/src/main/res/xml-sw600dp/rows_bengali.xml
index 9dfe32139..df7f334f2 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..a4225ba3d 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,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..762b449dc 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,38 @@
 -->
 
 <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"/>
+    <include latin:keyboardLayout="@xml/row_optional_number_row" />
+    <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_bepo.xml b/app/src/main/res/xml-sw600dp/rows_bepo.xml
index 937dcada5..6de124b37 100644
--- a/app/src/main/res/xml-sw600dp/rows_bepo.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bepo.xml
@@ -18,18 +18,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml b/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
index e575ead56..cad3b3941 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..0dcc13326 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,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..b898950c6 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,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_colemak.xml b/app/src/main/res/xml-sw600dp/rows_colemak.xml
index fc07064c2..e940470b4 100644
--- a/app/src/main/res/xml-sw600dp/rows_colemak.xml
+++ b/app/src/main/res/xml-sw600dp/rows_colemak.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml b/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
index 50b6821ab..208c9b9b8 100644
--- a/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
+++ b/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
@@ -23,18 +23,8 @@
     >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.0%p"
         >
diff --git a/app/src/main/res/xml-sw600dp/rows_dvorak.xml b/app/src/main/res/xml-sw600dp/rows_dvorak.xml
index 28368b896..3be0577bf 100644
--- a/app/src/main/res/xml-sw600dp/rows_dvorak.xml
+++ b/app/src/main/res/xml-sw600dp/rows_dvorak.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.0%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..1fb7693fd 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,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..84507af63 100644
--- a/app/src/main/res/xml-sw600dp/rows_farsi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_farsi.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..ba7ff6d63 100644
--- a/app/src/main/res/xml-sw600dp/rows_georgian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_georgian.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..3dbeb7351 100644
--- a/app/src/main/res/xml-sw600dp/rows_german.xml
+++ b/app/src/main/res/xml-sw600dp/rows_german.xml
@@ -26,6 +26,8 @@
     <!-- 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. -->
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- 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..4fbf38fcc 100644
--- a/app/src/main/res/xml-sw600dp/rows_greek.xml
+++ b/app/src/main/res/xml-sw600dp/rows_greek.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..488183c61 100644
--- a/app/src/main/res/xml-sw600dp/rows_hebrew.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hebrew.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..c405adc16 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_hindi.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..2a449401b 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,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..44fd05393 100644
--- a/app/src/main/res/xml-sw600dp/rows_kannada.xml
+++ b/app/src/main/res/xml-sw600dp/rows_kannada.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..1f0619feb 100644
--- a/app/src/main/res/xml-sw600dp/rows_khmer.xml
+++ b/app/src/main/res/xml-sw600dp/rows_khmer.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..cb958248f 100644
--- a/app/src/main/res/xml-sw600dp/rows_lao.xml
+++ b/app/src/main/res/xml-sw600dp/rows_lao.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..e6e83e2ea 100644
--- a/app/src/main/res/xml-sw600dp/rows_malayalam.xml
+++ b/app/src/main/res/xml-sw600dp/rows_malayalam.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..39f67658b 100644
--- a/app/src/main/res/xml-sw600dp/rows_marathi.xml
+++ b/app/src/main/res/xml-sw600dp/rows_marathi.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..cacdcb83e 100644
--- a/app/src/main/res/xml-sw600dp/rows_mongolian.xml
+++ b/app/src/main/res/xml-sw600dp/rows_mongolian.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..dbddc2052 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,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..7f43bf880 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,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..4729a7207 100644
--- a/app/src/main/res/xml-sw600dp/rows_nordic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nordic.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="8.182%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml b/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
index ecb9af282..b88952f87 100644
--- a/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="7.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_qwerty.xml b/app/src/main/res/xml-sw600dp/rows_qwerty.xml
index db3cb53f3..166156bd2 100644
--- a/app/src/main/res/xml-sw600dp/rows_qwerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_qwerty.xml
@@ -26,18 +26,8 @@
     <!-- 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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- First row -->
     <Row>
         <switch>
diff --git a/app/src/main/res/xml-sw600dp/rows_qwertz.xml b/app/src/main/res/xml-sw600dp/rows_qwertz.xml
index 1b40b11b2..cfd867c9d 100644
--- a/app/src/main/res/xml-sw600dp/rows_qwertz.xml
+++ b/app/src/main/res/xml-sw600dp/rows_qwertz.xml
@@ -26,18 +26,8 @@
     <!-- 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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- First row -->
     <Row>
         <switch>
diff --git a/app/src/main/res/xml-sw600dp/rows_sinhala.xml b/app/src/main/res/xml-sw600dp/rows_sinhala.xml
index 2fe89792e..7fb6afd63 100644
--- a/app/src/main/res/xml-sw600dp/rows_sinhala.xml
+++ b/app/src/main/res/xml-sw600dp/rows_sinhala.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..add4eace7 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,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..0f6727dcc 100644
--- a/app/src/main/res/xml-sw600dp/rows_spanish.xml
+++ b/app/src/main/res/xml-sw600dp/rows_spanish.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..13c73e573 100644
--- a/app/src/main/res/xml-sw600dp/rows_swiss.xml
+++ b/app/src/main/res/xml-sw600dp/rows_swiss.xml
@@ -23,6 +23,8 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..4c61b0b58 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,8 @@
         latin:keyboardLayout="@xml/key_styles_common" />
     <include
         latin:keyboardLayout="@xml/key_styles_currency" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..dd97aab9f 100644
--- a/app/src/main/res/xml-sw600dp/rows_tamil.xml
+++ b/app/src/main/res/xml-sw600dp/rows_tamil.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..6fb934805 100644
--- a/app/src/main/res/xml-sw600dp/rows_telugu.xml
+++ b/app/src/main/res/xml-sw600dp/rows_telugu.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..3d359a224 100644
--- a/app/src/main/res/xml-sw600dp/rows_thai.xml
+++ b/app/src/main/res/xml-sw600dp/rows_thai.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..bbac24fa1 100644
--- a/app/src/main/res/xml-sw600dp/rows_uzbek.xml
+++ b/app/src/main/res/xml-sw600dp/rows_uzbek.xml
@@ -20,6 +20,8 @@
 
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto" >
     <include latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <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..65b866a27 100644
--- a/app/src/main/res/xml-sw600dp/rows_workman.xml
+++ b/app/src/main/res/xml-sw600dp/rows_workman.xml
@@ -25,6 +25,8 @@
         latin:keyboardLayout="@xml/key_styles_common" />
          Ideally just the keyWidth should be different and the spacer should adjust to fill
          the available space. -->
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <!-- First row -->
     <Row>
         <include
diff --git a/app/src/main/res/xml/row_optional_number_row.xml b/app/src/main/res/xml/row_optional_number_row.xml
new file mode 100644
index 000000000..f9748ed0a
--- /dev/null
+++ b/app/src/main/res/xml/row_optional_number_row.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<merge
+    xmlns:latin="http://schemas.android.com/apk/res-auto">
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
+</merge>
\ No newline at end of file
diff --git a/app/src/main/res/xml/rows_arabic.xml b/app/src/main/res/xml/rows_arabic.xml
index 45ae9d237..09b3e682b 100644
--- a/app/src/main/res/xml/rows_arabic.xml
+++ b/app/src/main/res/xml/rows_arabic.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_arabic_pc.xml b/app/src/main/res/xml/rows_arabic_pc.xml
index 96e2ad7a5..66afe9ac0 100644
--- a/app/src/main/res/xml/rows_arabic_pc.xml
+++ b/app/src/main/res/xml/rows_arabic_pc.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_armenian_phonetic.xml b/app/src/main/res/xml/rows_armenian_phonetic.xml
index 9e306a1da..20692f330 100644
--- a/app/src/main/res/xml/rows_armenian_phonetic.xml
+++ b/app/src/main/res/xml/rows_armenian_phonetic.xml
@@ -21,18 +21,8 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include 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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10.0%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_azerty.xml b/app/src/main/res/xml/rows_azerty.xml
index ffc12c8ba..1d6ff601c 100644
--- a/app/src/main/res/xml/rows_azerty.xml
+++ b/app/src/main/res/xml/rows_azerty.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_bengali.xml b/app/src/main/res/xml/rows_bengali.xml
index 0c91bb22e..3403ac37c 100644
--- a/app/src/main/res/xml/rows_bengali.xml
+++ b/app/src/main/res/xml/rows_bengali.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_bengali_akkhor.xml b/app/src/main/res/xml/rows_bengali_akkhor.xml
index 9949a3b9c..1bcc52b07 100644
--- a/app/src/main/res/xml/rows_bengali_akkhor.xml
+++ b/app/src/main/res/xml/rows_bengali_akkhor.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyLabelFlags="fontNormal"
         latin:keyWidth="9.091%p" >
diff --git a/app/src/main/res/xml/rows_bengali_unijoy.xml b/app/src/main/res/xml/rows_bengali_unijoy.xml
index 81e97eea5..92175b29a 100644
--- a/app/src/main/res/xml/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml/rows_bengali_unijoy.xml
@@ -19,24 +19,32 @@
 -->
 
 <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="10%p">
-        <include latin:keyboardLayout="@xml/rowkeys_bengali_unijoy1" />
+    <include latin:keyboardLayout="@xml/key_styles_common"/>
+    <include latin:keyboardLayout="@xml/row_optional_number_row" />
+    <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>
diff --git a/app/src/main/res/xml/rows_bepo.xml b/app/src/main/res/xml/rows_bepo.xml
index cb6fdad52..c9be7eaab 100644
--- a/app/src/main/res/xml/rows_bepo.xml
+++ b/app/src/main/res/xml/rows_bepo.xml
@@ -18,18 +18,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_bulgarian.xml b/app/src/main/res/xml/rows_bulgarian.xml
index 6f57c84c4..8dd6b4ec1 100644
--- a/app/src/main/res/xml/rows_bulgarian.xml
+++ b/app/src/main/res/xml/rows_bulgarian.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_bulgarian_bds.xml b/app/src/main/res/xml/rows_bulgarian_bds.xml
index 81f65249b..ca5eca5a1 100644
--- a/app/src/main/res/xml/rows_bulgarian_bds.xml
+++ b/app/src/main/res/xml/rows_bulgarian_bds.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_bulgarian_bekl.xml b/app/src/main/res/xml/rows_bulgarian_bekl.xml
index 34c5e9dac..cb39e2a9a 100644
--- a/app/src/main/res/xml/rows_bulgarian_bekl.xml
+++ b/app/src/main/res/xml/rows_bulgarian_bekl.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_colemak.xml b/app/src/main/res/xml/rows_colemak.xml
index 13a95171c..e25362010 100644
--- a/app/src/main/res/xml/rows_colemak.xml
+++ b/app/src/main/res/xml/rows_colemak.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_colemak_dh.xml b/app/src/main/res/xml/rows_colemak_dh.xml
index e477282d6..efb6f2b13 100644
--- a/app/src/main/res/xml/rows_colemak_dh.xml
+++ b/app/src/main/res/xml/rows_colemak_dh.xml
@@ -23,18 +23,8 @@
     >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
         >
diff --git a/app/src/main/res/xml/rows_dvorak.xml b/app/src/main/res/xml/rows_dvorak.xml
index e454c3169..4900f04ec 100644
--- a/app/src/main/res/xml/rows_dvorak.xml
+++ b/app/src/main/res/xml/rows_dvorak.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_east_slavic.xml b/app/src/main/res/xml/rows_east_slavic.xml
index 5f120275d..064f92696 100644
--- a/app/src/main/res/xml/rows_east_slavic.xml
+++ b/app/src/main/res/xml/rows_east_slavic.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_farsi.xml b/app/src/main/res/xml/rows_farsi.xml
index 202a9c801..e7f46845b 100644
--- a/app/src/main/res/xml/rows_farsi.xml
+++ b/app/src/main/res/xml/rows_farsi.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_georgian.xml b/app/src/main/res/xml/rows_georgian.xml
index df908dd46..e28224f04 100644
--- a/app/src/main/res/xml/rows_georgian.xml
+++ b/app/src/main/res/xml/rows_georgian.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_german.xml b/app/src/main/res/xml/rows_german.xml
index 5825915f9..c53ca8797 100644
--- a/app/src/main/res/xml/rows_german.xml
+++ b/app/src/main/res/xml/rows_german.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_greek.xml b/app/src/main/res/xml/rows_greek.xml
index 8e0a23d03..8d5964c93 100644
--- a/app/src/main/res/xml/rows_greek.xml
+++ b/app/src/main/res/xml/rows_greek.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_hebrew.xml b/app/src/main/res/xml/rows_hebrew.xml
index 12e86b801..1d7a9a139 100644
--- a/app/src/main/res/xml/rows_hebrew.xml
+++ b/app/src/main/res/xml/rows_hebrew.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_hindi.xml b/app/src/main/res/xml/rows_hindi.xml
index f52ce04f0..3ad016530 100644
--- a/app/src/main/res/xml/rows_hindi.xml
+++ b/app/src/main/res/xml/rows_hindi.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_hindi_compact.xml b/app/src/main/res/xml/rows_hindi_compact.xml
index b5f10d4a7..c76b34e0c 100644
--- a/app/src/main/res/xml/rows_hindi_compact.xml
+++ b/app/src/main/res/xml/rows_hindi_compact.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_kannada.xml b/app/src/main/res/xml/rows_kannada.xml
index 6e3d6aee7..acc295cef 100644
--- a/app/src/main/res/xml/rows_kannada.xml
+++ b/app/src/main/res/xml/rows_kannada.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml/rows_khmer.xml b/app/src/main/res/xml/rows_khmer.xml
index 0b193af6d..06b323460 100644
--- a/app/src/main/res/xml/rows_khmer.xml
+++ b/app/src/main/res/xml/rows_khmer.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="8.3333%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml/rows_lao.xml b/app/src/main/res/xml/rows_lao.xml
index beb18418a..90e9ba411 100644
--- a/app/src/main/res/xml/rows_lao.xml
+++ b/app/src/main/res/xml/rows_lao.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="8.3333%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_malayalam.xml b/app/src/main/res/xml/rows_malayalam.xml
index f2cfd8613..9f49d01ac 100644
--- a/app/src/main/res/xml/rows_malayalam.xml
+++ b/app/src/main/res/xml/rows_malayalam.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml/rows_marathi.xml b/app/src/main/res/xml/rows_marathi.xml
index c742d3500..e7acb5d70 100644
--- a/app/src/main/res/xml/rows_marathi.xml
+++ b/app/src/main/res/xml/rows_marathi.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_mongolian.xml b/app/src/main/res/xml/rows_mongolian.xml
index 95a0c23d9..d3110bfaf 100644
--- a/app/src/main/res/xml/rows_mongolian.xml
+++ b/app/src/main/res/xml/rows_mongolian.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_nepali_romanized.xml b/app/src/main/res/xml/rows_nepali_romanized.xml
index 51fd37604..eb5619e05 100644
--- a/app/src/main/res/xml/rows_nepali_romanized.xml
+++ b/app/src/main/res/xml/rows_nepali_romanized.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_nepali_traditional.xml b/app/src/main/res/xml/rows_nepali_traditional.xml
index 3e99c85f0..2c3914b15 100644
--- a/app/src/main/res/xml/rows_nepali_traditional.xml
+++ b/app/src/main/res/xml/rows_nepali_traditional.xml
@@ -21,18 +21,8 @@
 <merge xmlns:latin="http://schemas.android.com/apk/res-auto">
     <include 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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_nordic.xml b/app/src/main/res/xml/rows_nordic.xml
index 406197cef..bd2562674 100644
--- a/app/src/main/res/xml/rows_nordic.xml
+++ b/app/src/main/res/xml/rows_nordic.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_pcqwerty.xml b/app/src/main/res/xml/rows_pcqwerty.xml
index c63e34360..73a235bb2 100644
--- a/app/src/main/res/xml/rows_pcqwerty.xml
+++ b/app/src/main/res/xml/rows_pcqwerty.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="7.692%p"
     >
diff --git a/app/src/main/res/xml/rows_qwerty.xml b/app/src/main/res/xml/rows_qwerty.xml
index 2408d5975..cf6d7e114 100644
--- a/app/src/main/res/xml/rows_qwerty.xml
+++ b/app/src/main/res/xml/rows_qwerty.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_qwertz.xml b/app/src/main/res/xml/rows_qwertz.xml
index a9bb03576..1cca9d603 100644
--- a/app/src/main/res/xml/rows_qwertz.xml
+++ b/app/src/main/res/xml/rows_qwertz.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_serbian_qwertz.xml b/app/src/main/res/xml/rows_serbian_qwertz.xml
index ac1a815b0..a37f219a9 100644
--- a/app/src/main/res/xml/rows_serbian_qwertz.xml
+++ b/app/src/main/res/xml/rows_serbian_qwertz.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_serbian_qwertz1" />
     </Row>
diff --git a/app/src/main/res/xml/rows_sinhala.xml b/app/src/main/res/xml/rows_sinhala.xml
index 6dba51a91..36cd497e5 100644
--- a/app/src/main/res/xml/rows_sinhala.xml
+++ b/app/src/main/res/xml/rows_sinhala.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml/rows_south_slavic.xml b/app/src/main/res/xml/rows_south_slavic.xml
index b16d975f0..6149df144 100644
--- a/app/src/main/res/xml/rows_south_slavic.xml
+++ b/app/src/main/res/xml/rows_south_slavic.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_spanish.xml b/app/src/main/res/xml/rows_spanish.xml
index 42af18504..07fb326df 100644
--- a/app/src/main/res/xml/rows_spanish.xml
+++ b/app/src/main/res/xml/rows_spanish.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_swiss.xml b/app/src/main/res/xml/rows_swiss.xml
index 8e8be7428..a3b81bf7d 100644
--- a/app/src/main/res/xml/rows_swiss.xml
+++ b/app/src/main/res/xml/rows_swiss.xml
@@ -23,18 +23,8 @@
 >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
     >
diff --git a/app/src/main/res/xml/rows_symbols_shift.xml b/app/src/main/res/xml/rows_symbols_shift.xml
index b0e6cabd4..32ad66f4a 100644
--- a/app/src/main/res/xml/rows_symbols_shift.xml
+++ b/app/src/main/res/xml/rows_symbols_shift.xml
@@ -25,18 +25,8 @@
         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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_tamil.xml b/app/src/main/res/xml/rows_tamil.xml
index fb53ae7d6..0621fe9e2 100644
--- a/app/src/main/res/xml/rows_tamil.xml
+++ b/app/src/main/res/xml/rows_tamil.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml/rows_telugu.xml b/app/src/main/res/xml/rows_telugu.xml
index aaad4f41d..ca01ac0ef 100644
--- a/app/src/main/res/xml/rows_telugu.xml
+++ b/app/src/main/res/xml/rows_telugu.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="9.091%p"
         latin:keyLabelFlags="fontNormal|autoXScale"
diff --git a/app/src/main/res/xml/rows_thai.xml b/app/src/main/res/xml/rows_thai.xml
index 99b618a18..11ee2455a 100644
--- a/app/src/main/res/xml/rows_thai.xml
+++ b/app/src/main/res/xml/rows_thai.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="8.3333%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_turkish.xml b/app/src/main/res/xml/rows_turkish.xml
index ceabdfe10..2e726186d 100644
--- a/app/src/main/res/xml/rows_turkish.xml
+++ b/app/src/main/res/xml/rows_turkish.xml
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="8.182%p"
         latin:keyLabelFlags="fontNormal"
diff --git a/app/src/main/res/xml/rows_uzbek.xml b/app/src/main/res/xml/rows_uzbek.xml
index b352c1d6f..c8e24137f 100644
--- a/app/src/main/res/xml/rows_uzbek.xml
+++ b/app/src/main/res/xml/rows_uzbek.xml
@@ -20,18 +20,8 @@
 
 <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row latin:keyWidth="9.091%p" >
         <include latin:keyboardLayout="@xml/rowkeys_uzbek1" />
     </Row>
diff --git a/app/src/main/res/xml/rows_workman.xml b/app/src/main/res/xml/rows_workman.xml
index 3b8f154fa..fc9538a35 100644
--- a/app/src/main/res/xml/rows_workman.xml
+++ b/app/src/main/res/xml/rows_workman.xml
@@ -23,18 +23,8 @@
     >
     <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>
+    <include
+        latin:keyboardLayout="@xml/row_optional_number_row" />
     <Row
         latin:keyWidth="10%p"
         >