diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index fe52677a5..ad588d7ed 100644
--- a/java/res/xml-sw600dp/kbd_number.xml
+++ b/java/res/xml-sw600dp/kbd_number.xml
@@ -20,7 +20,7 @@
 
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="16.75%p"
+    latin:keyWidth="15.00%p"
 >
     <include
         latin:keyboardLayout="@xml/kbd_rows_number" />
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index 2d0460316..ce769b8f7 100644
--- a/java/res/xml-sw600dp/kbd_phone.xml
+++ b/java/res/xml-sw600dp/kbd_phone.xml
@@ -20,7 +20,7 @@
 
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="16.75%p"
+    latin:keyWidth="15.00%p"
 >
     <include
         latin:keyboardLayout="@xml/kbd_rows_phone" />
diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/kbd_phone_shift.xml
index 2b710eb18..3753deb8c 100644
--- a/java/res/xml-sw600dp/kbd_phone_shift.xml
+++ b/java/res/xml-sw600dp/kbd_phone_shift.xml
@@ -20,7 +20,7 @@
 
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="16.75%p"
+    latin:keyWidth="15.00%p"
 >
     <include
         latin:keyboardLayout="@xml/kbd_rows_phone_shift" />
diff --git a/java/res/xml-sw600dp/kbd_rows_number.xml b/java/res/xml-sw600dp/kbd_rows_number.xml
index 38cc1861c..cfb24212b 100644
--- a/java/res/xml-sw600dp/kbd_rows_number.xml
+++ b/java/res/xml-sw600dp/kbd_rows_number.xml
@@ -32,7 +32,7 @@
             <Row>
                 <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
                 <Spacer
-                    latin:keyWidth="24.875%p" />
+                    latin:keyWidth="27.50%p" />
                 <Key
                     latin:keyStyle="num1KeyStyle" />
                 <Key
@@ -47,7 +47,7 @@
             <Row>
                 <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
                 <Spacer
-                    latin:keyWidth="24.875%p" />
+                    latin:keyWidth="27.50%p" />
                 <Key
                     latin:keyStyle="num4KeyStyle" />
                 <Key
@@ -62,7 +62,7 @@
             <Row>
                 <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
                 <Spacer
-                    latin:keyWidth="24.875%p" />
+                    latin:keyWidth="27.50%p" />
                 <Key
                     latin:keyStyle="num7KeyStyle" />
                 <Key
@@ -77,10 +77,9 @@
                 <Key
                     latin:keyStyle="tabKeyStyle"
                     latin:keyWidth="11.00%p" />
-                <Spacer
-                    latin:keyXPos="24.875%p" />
                 <Key
-                    latin:keyStyle="num0KeyStyle" />
+                    latin:keyStyle="num0KeyStyle"
+                    latin:keyXPos="42.50%p"/>
                 <Spacer
                     latin:keyXPos="-11.00%p"
                     latin:keyWidth="0%p" />
@@ -93,7 +92,7 @@
             <Row>
                 <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
                 <Spacer
-                    latin:keyWidth="11.00%p" />
+                    latin:keyWidth="12.75%p" />
                 <Key
                     latin:keyLabel="-"
                     latin:keyStyle="numKeyStyle"
@@ -109,7 +108,7 @@
                 <Key
                     latin:keyLabel="1"
                     latin:keyStyle="numKeyStyle"
-                    latin:keyXPos="38.75%p" />
+                    latin:keyXPos="42.25%p" />
                 <Key
                     latin:keyLabel="2"
                     latin:keyStyle="numKeyStyle" />
@@ -119,12 +118,12 @@
                 <Key
                     latin:keyStyle="deleteKeyStyle"
                     latin:keyXPos="-11.00%p"
-                    latin:keyWidth="fillBoth" />
+                    latin:keyWidth="fillRight" />
             </Row>
             <Row>
                 <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
                 <Spacer
-                    latin:keyWidth="11.00%p" />
+                    latin:keyWidth="12.75%p" />
                 <Key
                     latin:keyStyle="numStarKeyStyle"
                     latin:keyWidth="9.25%p" />
@@ -139,7 +138,7 @@
                 <Key
                     latin:keyLabel="4"
                     latin:keyStyle="numKeyStyle"
-                    latin:keyXPos="38.75%p" />
+                    latin:keyXPos="42.25%p" />
                 <Key
                     latin:keyLabel="5"
                     latin:keyStyle="numKeyStyle" />
@@ -149,12 +148,12 @@
                 <Key
                     latin:keyStyle="returnKeyStyle"
                     latin:keyXPos="-11.00%p"
-                    latin:keyWidth="fillBoth" />
+                    latin:keyWidth="fillRight" />
             </Row>
             <Row>
                 <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
                 <Spacer
-                    latin:keyWidth="11.00%p" />
+                    latin:keyWidth="12.75%p" />
                 <Key
                     latin:keyLabel="("
                     latin:keyStyle="numKeyStyle"
@@ -170,7 +169,7 @@
                 <Key
                     latin:keyLabel="7"
                     latin:keyStyle="numKeyStyle"
-                    latin:keyXPos="38.75%p" />
+                    latin:keyXPos="42.25%p" />
                 <Key
                     latin:keyLabel="8"
                     latin:keyStyle="numKeyStyle" />
@@ -187,10 +186,11 @@
                     latin:keyWidth="11.00%p" />
                 <Key
                     latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
-                    latin:keyWidth="27.75%p" />
+                    latin:keyWidth="27.75%p"
+                    latin:keyXPos="12.75%p" />
                 <Key
                     latin:keyStyle="numStarKeyStyle"
-                    latin:keyXPos="38.75%p" />
+                    latin:keyXPos="42.25%p" />
                 <Key
                     latin:keyLabel="0"
                     latin:keyStyle="numKeyStyle" />
diff --git a/java/res/xml-sw600dp/kbd_rows_phone.xml b/java/res/xml-sw600dp/kbd_rows_phone.xml
index a96cc7613..69d058fd8 100644
--- a/java/res/xml-sw600dp/kbd_rows_phone.xml
+++ b/java/res/xml-sw600dp/kbd_rows_phone.xml
@@ -28,7 +28,7 @@
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="15.625%p" />
+            latin:keyWidth="17.375%p" />
         <Key
             latin:keyLabel="-"
             latin:keyStyle="numKeyStyle"
@@ -39,7 +39,7 @@
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num2KeyStyle" />
         <Key
@@ -47,12 +47,12 @@
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-11.00%p"
-            latin:keyWidth="fillBoth" />
+            latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="15.625%p" />
+            latin:keyWidth="17.375%p" />
         <Key
             latin:keyLabel=","
             latin:keyStyle="numKeyStyle"
@@ -63,7 +63,7 @@
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num5KeyStyle" />
         <Key
@@ -71,7 +71,7 @@
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-11.00%p"
-            latin:keyWidth="fillBoth" />
+            latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <Key
@@ -80,7 +80,7 @@
         <Key
             latin:keyLabel="("
             latin:keyStyle="numKeyStyle"
-            latin:keyXPos="15.625%p"
+            latin:keyXPos="17.375%p"
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyLabel=")"
@@ -88,7 +88,7 @@
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num8KeyStyle" />
         <Key
@@ -103,11 +103,11 @@
             latin:keyWidth="11.00%p" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
-            latin:keyXPos="15.625%p"
-            latin:keyWidth="18.50%p" />
+            latin:keyWidth="18.50%p"
+            latin:keyXPos="17.375%p" />
         <Key
             latin:keyStyle="numStarKeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
diff --git a/java/res/xml-sw600dp/kbd_rows_phone_shift.xml b/java/res/xml-sw600dp/kbd_rows_phone_shift.xml
index 654684a54..04db6780f 100644
--- a/java/res/xml-sw600dp/kbd_rows_phone_shift.xml
+++ b/java/res/xml-sw600dp/kbd_rows_phone_shift.xml
@@ -28,7 +28,7 @@
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="11.00%p" />
+            latin:keyWidth="12.75%p" />
         <Key
             latin:keyLabel="-"
             latin:keyStyle="numKeyStyle"
@@ -42,7 +42,7 @@
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num2KeyStyle" />
         <Key
@@ -50,12 +50,12 @@
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-11.00%p"
-            latin:keyWidth="fillBoth" />
+            latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="11.00%p" />
+            latin:keyWidth="12.75%p" />
         <Key
             latin:keyLabel=","
             latin:keyStyle="numKeyStyle"
@@ -69,7 +69,7 @@
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num5KeyStyle" />
         <Key
@@ -77,7 +77,7 @@
         <Key
             latin:keyStyle="returnKeyStyle"
             latin:keyXPos="-11.00%p"
-            latin:keyWidth="fillBoth" />
+            latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <Key
@@ -86,7 +86,8 @@
         <Key
             latin:keyLabel="("
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="9.25%p"
+            latin:keyXPos="12.75%p" />
         <Key
             latin:keyLabel=")"
             latin:keyStyle="numKeyStyle"
@@ -97,7 +98,7 @@
             latin:keyWidth="9.25%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num8KeyStyle" />
         <Key
@@ -112,10 +113,11 @@
             latin:keyWidth="11.00%p" />
         <Key
             latin:keyStyle="nonSpecialBackgroundSpaceKeyStyle"
-            latin:keyWidth="27.75%p" />
+            latin:keyWidth="27.75%p"
+            latin:keyXPos="12.75%p" />
         <Key
             latin:keyStyle="numStarKeyStyle"
-            latin:keyXPos="38.867%p" />
+            latin:keyXPos="42.25%p" />
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key