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 312cf146d..0817a95e6 100644
--- a/app/src/main/res/xml-sw600dp-land/rows_qwertz.xml
+++ b/app/src/main/res/xml-sw600dp-land/rows_qwertz.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <!-- First row -->
     <Row>
         <switch>
diff --git a/app/src/main/res/xml-sw600dp/rows_azerty.xml b/app/src/main/res/xml-sw600dp/rows_azerty.xml
index d047c729f..404796b05 100644
--- a/app/src/main/res/xml-sw600dp/rows_azerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_azerty.xml
@@ -23,6 +23,20 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <include
+        latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         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 88d95535b..937dcada5 100644
--- a/app/src/main/res/xml-sw600dp/rows_bepo.xml
+++ b/app/src/main/res/xml-sw600dp/rows_bepo.xml
@@ -18,6 +18,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_colemak.xml b/app/src/main/res/xml-sw600dp/rows_colemak.xml
index f3f32d159..fc07064c2 100644
--- a/app/src/main/res/xml-sw600dp/rows_colemak.xml
+++ b/app/src/main/res/xml-sw600dp/rows_colemak.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml b/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
index cf3f26073..50b6821ab 100644
--- a/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
+++ b/app/src/main/res/xml-sw600dp/rows_colemak_dh.xml
@@ -23,6 +23,18 @@
     >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
         >
diff --git a/app/src/main/res/xml-sw600dp/rows_dvorak.xml b/app/src/main/res/xml-sw600dp/rows_dvorak.xml
index 9fb3e649d..28368b896 100644
--- a/app/src/main/res/xml-sw600dp/rows_dvorak.xml
+++ b/app/src/main/res/xml-sw600dp/rows_dvorak.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="9.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml b/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
index 2075c62c0..ecb9af282 100644
--- a/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/app/src/main/res/xml-sw600dp/rows_pcqwerty.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="7.0%p"
     >
diff --git a/app/src/main/res/xml-sw600dp/rows_qwertz.xml b/app/src/main/res/xml-sw600dp/rows_qwertz.xml
index 148b26d74..1b40b11b2 100644
--- a/app/src/main/res/xml-sw600dp/rows_qwertz.xml
+++ b/app/src/main/res/xml-sw600dp/rows_qwertz.xml
@@ -26,6 +26,18 @@
     <!-- TODO: Consolidate the layout specification between protrait and landscape.
          Ideally just the keyWidth should be different and the spacer should adjust to fill
          the available space. -->
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <!-- First row -->
     <Row>
         <switch>
diff --git a/app/src/main/res/xml/rows_colemak.xml b/app/src/main/res/xml/rows_colemak.xml
index 6b0365217..13a95171c 100644
--- a/app/src/main/res/xml/rows_colemak.xml
+++ b/app/src/main/res/xml/rows_colemak.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="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 5acc83728..e477282d6 100644
--- a/app/src/main/res/xml/rows_colemak_dh.xml
+++ b/app/src/main/res/xml/rows_colemak_dh.xml
@@ -23,6 +23,18 @@
     >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="10%p"
         >
diff --git a/app/src/main/res/xml/rows_dvorak.xml b/app/src/main/res/xml/rows_dvorak.xml
index 3a2be744b..e454c3169 100644
--- a/app/src/main/res/xml/rows_dvorak.xml
+++ b/app/src/main/res/xml/rows_dvorak.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="10%p"
     >
diff --git a/app/src/main/res/xml/rows_pcqwerty.xml b/app/src/main/res/xml/rows_pcqwerty.xml
index 2417fc9bf..c63e34360 100644
--- a/app/src/main/res/xml/rows_pcqwerty.xml
+++ b/app/src/main/res/xml/rows_pcqwerty.xml
@@ -23,6 +23,18 @@
 >
     <include
         latin:keyboardLayout="@xml/key_styles_common" />
+    <switch>
+        <case
+            latin:numberRowEnabled="true"
+            >
+            <Row
+                latin:keyWidth="10%p"
+                >
+                <include
+                    latin:keyboardLayout="@xml/rowkeys_symbols1" />
+            </Row>
+        </case>
+    </switch>
     <Row
         latin:keyWidth="7.692%p"
     >