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 c167ee01..7f4274d0 100644
--- a/app/src/main/res/xml-sw600dp-land/rows_german.xml
+++ b/app/src/main/res/xml-sw600dp-land/rows_german.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
         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 dcbff2a7..9223d8d9 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 0817a95e..5dbd4e64 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 a4d0bbd8..c5ca605a 100644
--- a/app/src/main/res/xml-sw600dp/rows_arabic.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 4cd10e6f..358e11fa 100644
--- a/app/src/main/res/xml-sw600dp/rows_arabic_pc.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 cd926f32..6fff3f5b 100644
--- a/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.xml
+++ b/app/src/main/res/xml-sw600dp/rows_armenian_phonetic.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.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 404796b0..7da53755 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 50f3e9f3..df7f334f 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 982d058b..a4225ba3 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_akkhor.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 5f4c94c2..762b449d 100644
--- a/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bengali_unijoy.xml
@@ -20,13 +20,7 @@
 
 <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.0%p">
diff --git a/app/src/main/res/xml-sw600dp/rows_bepo.xml b/app/src/main/res/xml-sw600dp/rows_bepo.xml
index 937dcada..6de124b3 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 64183301..cad3b394 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 09c792ae..0dcc1332 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian_bds.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 9ee95d2e..b898950c 100644
--- a/app/src/main/res/xml-sw600dp/rows_bulgarian_bekl.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 fc07064c..e940470b 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 50b6821a..208c9b9b 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 28368b89..3be0577b 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 bf86153f..1fb7693f 100644
--- a/app/src/main/res/xml-sw600dp/rows_east_slavic.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 849058cf..84507af6 100644
--- a/app/src/main/res/xml-sw600dp/rows_farsi.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 03ad31c7..ba7ff6d6 100644
--- a/app/src/main/res/xml-sw600dp/rows_georgian.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 c09520ad..3dbeb735 100644
--- a/app/src/main/res/xml-sw600dp/rows_german.xml
+++ b/app/src/main/res/xml-sw600dp/rows_german.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
         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 0e0d83fb..4fbf38fc 100644
--- a/app/src/main/res/xml-sw600dp/rows_greek.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 7ce5e107..488183c6 100644
--- a/app/src/main/res/xml-sw600dp/rows_hebrew.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 7c8883d7..c405adc1 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 ec038236..2a449401 100644
--- a/app/src/main/res/xml-sw600dp/rows_hindi_compact.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 4e4df1a9..44fd0539 100644
--- a/app/src/main/res/xml-sw600dp/rows_kannada.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 8a84ac6d..1f0619fe 100644
--- a/app/src/main/res/xml-sw600dp/rows_khmer.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 2f655ac2..cb958248 100644
--- a/app/src/main/res/xml-sw600dp/rows_lao.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 dde29e0e..e6e83e2e 100644
--- a/app/src/main/res/xml-sw600dp/rows_malayalam.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 c911e6a7..39f67658 100644
--- a/app/src/main/res/xml-sw600dp/rows_marathi.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 1fee60e1..cacdcb83 100644
--- a/app/src/main/res/xml-sw600dp/rows_mongolian.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 941228cd..dbddc205 100644
--- a/app/src/main/res/xml-sw600dp/rows_nepali_romanized.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 8fe93a43..7f43bf88 100644
--- a/app/src/main/res/xml-sw600dp/rows_nepali_traditional.xml
+++ b/app/src/main/res/xml-sw600dp/rows_nepali_traditional.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.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 e267f252..4729a720 100644
--- a/app/src/main/res/xml-sw600dp/rows_nordic.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 ecb9af28..b88952f8 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 db3cb53f..166156bd 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 1b40b11b..cfd867c9 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 15d4797e..7fb6afd6 100644
--- a/app/src/main/res/xml-sw600dp/rows_sinhala.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 820f90b3..add4eace 100644
--- a/app/src/main/res/xml-sw600dp/rows_south_slavic.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 6778a216..0f6727dc 100644
--- a/app/src/main/res/xml-sw600dp/rows_spanish.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 3f7b662c..13c73e57 100644
--- a/app/src/main/res/xml-sw600dp/rows_swiss.xml
+++ b/app/src/main/res/xml-sw600dp/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="8.182%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 6a2aa42f..4c61b0b5 100644
--- a/app/src/main/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 44d09636..dd97aab9 100644
--- a/app/src/main/res/xml-sw600dp/rows_tamil.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 f663929c..6fb93480 100644
--- a/app/src/main/res/xml-sw600dp/rows_telugu.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 fc2893aa..3d359a22 100644
--- a/app/src/main/res/xml-sw600dp/rows_thai.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 713ddff6..bbac24fa 100644
--- a/app/src/main/res/xml-sw600dp/rows_uzbek.xml
+++ b/app/src/main/res/xml-sw600dp/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="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 8e911af8..65b866a2 100644
--- a/app/src/main/res/xml-sw600dp/rows_workman.xml
+++ b/app/src/main/res/xml-sw600dp/rows_workman.xml
@@ -25,18 +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. -->
-    <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>
         <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 00000000..f9748ed0
--- /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 45ae9d23..09b3e682 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 96e2ad7a..66afe9ac 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 9e306a1d..20692f33 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 ffc12c8b..1d6ff601 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 0c91bb22..3403ac37 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 9949a3b9..1bcc52b0 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 c27bf5fe..92175b29 100644
--- a/app/src/main/res/xml/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml/rows_bengali_unijoy.xml
@@ -20,13 +20,7 @@
 
 <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="10%p">
diff --git a/app/src/main/res/xml/rows_bepo.xml b/app/src/main/res/xml/rows_bepo.xml
index cb6fdad5..c9be7eaa 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 6f57c84c..8dd6b4ec 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 81f65249..ca5eca5a 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 34c5e9da..cb39e2a9 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 13a95171..e2536201 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 e477282d..efb6f2b1 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 e454c316..4900f04e 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 5f120275..064f9269 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 202a9c80..e7f46845 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 df908dd4..e28224f0 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 5825915f..c53ca879 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 8e0a23d0..8d5964c9 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 12e86b80..1d7a9a13 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 f52ce04f..3ad01653 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 b5f10d4a..c76b34e0 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 6e3d6aee..acc295ce 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 0b193af6..06b32346 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 beb18418..90e9ba41 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 f2cfd861..9f49d01a 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 c742d350..e7acb5d7 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 95a0c23d..d3110bfa 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 51fd3760..eb5619e0 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 3e99c85f..2c3914b1 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 406197ce..bd256267 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 c63e3436..73a235bb 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 2408d597..cf6d7e11 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 a9bb0357..1cca9d60 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 ac1a815b..a37f219a 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 6dba51a9..36cd497e 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 b16d975f..6149df14 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 42af1850..07fb326d 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 8e8be742..a3b81bf7 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 b0e6cabd..32ad66f4 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 fb53ae7d..0621fe9e 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 aaad4f41..ca01ac0e 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 99b618a1..11ee2455 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 ceabdfe1..2e726186 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 b352c1d6..c8e24137 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 3b8f154f..fc9538a3 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"
         >