diff --git a/java/res/xml-sw600dp/kbd_qwerty_row4.xml b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
index 4f41c17b4..c457c69b4 100644
--- a/java/res/xml-sw600dp/kbd_qwerty_row4.xml
+++ b/java/res/xml-sw600dp/kbd_qwerty_row4.xml
@@ -59,99 +59,46 @@
             latin:keyWidth="39.750%p" />
         <switch>
             <case
-                latin:languageCode="ru"
+                latin:mode="email"
             >
-                <switch>
-                    <case
-                        latin:mode="email"
-                    >
-                        <Key
-                            latin:keyLabel="-"
-                            latin:keyWidth="9.750%p" />
-                    </case>
-                    <case
-                        latin:mode="url"
-                    >
-                        <Key
-                            latin:keyLabel="/"
-                            latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLabel=":"
-                            latin:popupCharacters=":"
-                            latin:keyWidth="9.750%p" />
-                    </case>
-                    <default>
-                        <Key
-                            latin:keyLabel="\?"
-                            latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLabel="_"
-                            latin:popupCharacters="_"
-                            latin:keyWidth="9.750%p" />
-                    </default>
-                </switch>
-                <switch>
-                    <case
-                        latin:mode="email"
-                    >
-                        <Key
-                            latin:keyLabel="_"
-                            latin:keyWidth="9.750%p" />
-                    </case>
-                    <default>
-                        <Key
-                            latin:keyLabel="!"
-                            latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLabel="\'"
-                            latin:popupCharacters="\'"
-                            latin:keyWidth="9.750%p" />
-                    </default>
-                </switch>
+                <Key
+                    latin:keyLabel="-"
+                    latin:keyWidth="9.750%p" />
+            </case>
+            <case
+                latin:mode="url"
+            >
+                <Key
+                    latin:keyLabel="/"
+                    latin:keyLabelOption="hasUppercaseLetter"
+                    latin:keyHintLabel=":"
+                    latin:popupCharacters=":"
+                    latin:keyWidth="9.750%p" />
             </case>
-            <!-- not languageCode="ru" -->
             <default>
-                <switch>
-                    <case
-                        latin:mode="email"
-                    >
-                        <Key
-                            latin:keyLabel="-"
-                            latin:keyWidth="9.750%p" />
-                    </case>
-                    <case
-                        latin:mode="url"
-                    >
-                        <Key
-                            latin:keyLabel="/"
-                            latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLabel=":"
-                            latin:popupCharacters=":"
-                            latin:keyWidth="9.750%p" />
-                    </case>
-                    <default>
-                        <Key
-                            latin:keyLabel="\'"
-                            latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLabel="&quot;"
-                            latin:popupCharacters="&quot;"
-                            latin:keyWidth="9.750%p" />
-                    </default>
-                </switch>
-                <switch>
-                    <case
-                        latin:mode="email"
-                    >
-                        <Key
-                            latin:keyLabel="_"
-                            latin:keyWidth="9.750%p" />
-                    </case>
-                    <default>
-                        <Key
-                            latin:keyLabel="-"
-                            latin:keyLabelOption="hasUppercaseLetter"
-                            latin:keyHintLabel="_"
-                            latin:popupCharacters="_"
-                            latin:keyWidth="9.750%p" />
-                    </default>
-                </switch>
+                <Key
+                    latin:keyLabel="\'"
+                    latin:keyLabelOption="hasUppercaseLetter"
+                    latin:keyHintLabel="&quot;"
+                    latin:popupCharacters="&quot;"
+                    latin:keyWidth="9.750%p" />
+            </default>
+        </switch>
+        <switch>
+            <case
+                latin:mode="email"
+            >
+                <Key
+                    latin:keyLabel="_"
+                    latin:keyWidth="9.750%p" />
+            </case>
+            <default>
+                <Key
+                    latin:keyLabel="-"
+                    latin:keyLabelOption="hasUppercaseLetter"
+                    latin:keyHintLabel="_"
+                    latin:popupCharacters="_"
+                    latin:keyWidth="9.750%p" />
             </default>
         </switch>
         <Spacer
diff --git a/java/res/xml-sw600dp/kbd_rows_russian.xml b/java/res/xml-sw600dp/kbd_rows_russian.xml
index b72324745..4c42d5e08 100644
--- a/java/res/xml-sw600dp/kbd_rows_russian.xml
+++ b/java/res/xml-sw600dp/kbd_rows_russian.xml
@@ -24,12 +24,11 @@
     <include
         latin:keyboardLayout="@xml/kbd_key_styles" />
     <Row
-        latin:keyWidth="8.0%p"
+        latin:keyWidth="7.60%p"
         latin:rowEdgeFlags="top"
     >
         <Key
             latin:keyLabel="й"
-            latin:keyXPos="2.15%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ц" />
@@ -52,6 +51,8 @@
             latin:keyLabel="з" />
         <Key
             latin:keyLabel="х" />
+        <Key
+            latin:keyLabel="ъ" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-10.0%p"
@@ -59,11 +60,11 @@
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-            latin:keyWidth="8.0%p"
+        latin:keyWidth="7.60%p"
     >
         <Key
             latin:keyLabel="ф"
-            latin:keyEdgeFlags="left" />
+            latin:keyXPos="2.25%p" />
         <Key
             latin:keyLabel="ы" />
         <Key
@@ -91,11 +92,10 @@
             latin:keyEdgeFlags="right" />
     </Row>
     <Row
-        latin:keyWidth="8.0%p"
+        latin:keyWidth="7.60%p"
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="10.0%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="я" />
@@ -116,11 +116,28 @@
             latin:keyLabel="б" />
         <Key
             latin:keyLabel="ю" />
-        <Key
-            latin:keyLabel="."
-            latin:keyLabelOption="hasUppercaseLetter"
-            latin:keyHintLabel=","
-            latin:popupCharacters="," />
+        <switch>
+            <case
+                latin:mode="email"
+            >
+                <Key
+                    latin:keyLabel="," />
+                <Key
+                    latin:keyLabel="." />
+            </case>
+            <default>
+                <Key
+                    latin:keyLabel=","
+                    latin:keyLabelOption="hasUppercaseLetter"
+                    latin:keyHintLabel="!"
+                    latin:popupCharacters="!" />
+                <Key
+                    latin:keyLabel="."
+                    latin:keyLabelOption="hasUppercaseLetter"
+                    latin:keyHintLabel="\?"
+                    latin:popupCharacters="\?" />
+            </default>
+        </switch>
         <include
             latin:keyboardLayout="@xml/kbd_row3_right" />
     </Row>
diff --git a/java/res/xml-sw600dp/kbd_symbols.xml b/java/res/xml-sw600dp/kbd_symbols.xml
index 77849f6fd..fc2a14856 100644
--- a/java/res/xml-sw600dp/kbd_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_symbols.xml
@@ -113,12 +113,6 @@
             latin:keyLabel="="
             latin:popupCharacters="≠,≈" />
         <switch>
-            <case
-                latin:languageCode="ru"
-            >
-                <Key
-                    latin:keyLabel=":" />
-            </case>
             <case
                 latin:mode="url"
             >
@@ -133,37 +127,16 @@
         </switch>
         <Key
             latin:keyLabel=";" />
-        <switch>
-            <case
-                latin:languageCode="ru"
-            >
-                <Key
-                    latin:keyLabel="\'"
-                    latin:popupCharacters="‘,’,‚,‛" />
-                <!-- Note: DroidSans doesn't have double-high-reversed-quotation
-                    '\u201f' glyph. -->
-                <!-- latin:popupCharacters="“,”,„,‟,«,»" -->
-                <Key
-                    latin:keyLabel="&quot;"
-                    latin:popupCharacters="“,”,«,»" />
-                <Key
-                    latin:keyLabel="." />
-                <Key
-                    latin:keyLabel="," />
-            </case>
-            <default>
-                <Key
-                    latin:keyLabel="," />
-                <Key
-                    latin:keyLabel="." />
-                <Key
-                    latin:keyLabel="!"
-                    latin:popupCharacters="¡" />
-                <Key
-                    latin:keyLabel="\?"
-                    latin:popupCharacters="¿" />
-            </default>
-        </switch>
+        <Key
+            latin:keyLabel="," />
+        <Key
+            latin:keyLabel="." />
+        <Key
+            latin:keyLabel="!"
+            latin:popupCharacters="¡" />
+        <Key
+            latin:keyLabel="\?"
+            latin:popupCharacters="¿" />
         <Key
             latin:keyLabel="/"
             latin:keyWidth="fillRight" />
@@ -185,30 +158,16 @@
             latin:keyStyle="spaceKeyStyle"
             latin:keyXPos="30.750%p"
             latin:keyWidth="39.750%p" />
-        <switch>
-            <case
-                latin:languageCode="ru"
-            >
-                <Key
-                    latin:keyLabel="_"
-                    latin:keyWidth="9.750%p" />
-                <Key
-                    latin:keyLabel="-"
-                    latin:keyWidth="9.750%p" />
-            </case>
-            <default>
                 <!-- Note: DroidSans doesn't have double-high-reversed-quotation
                     '\u201f' glyph. -->
                 <!-- latin:popupCharacters="“,”,„,‟,«,»,‘,’,‚,‛" -->
-                <Key
-                    latin:keyLabel="&quot;"
-                    latin:popupCharacters="“,”,«,»,‘,’,‚,‛"
-                    latin:keyWidth="9.750%p" />
-                <Key
-                    latin:keyLabel="_"
-                    latin:keyWidth="9.750%p" />
-            </default>
-        </switch>
+        <Key
+            latin:keyLabel="&quot;"
+            latin:popupCharacters="“,”,«,»,‘,’,‚,‛"
+            latin:keyWidth="9.750%p" />
+        <Key
+            latin:keyLabel="_"
+            latin:keyWidth="9.750%p" />
         <Spacer
             latin:keyXPos="-10.00%p"
             latin:keyWidth="0%p" />