diff --git a/java/res/xml-sw600dp-land/kbd_number.xml b/java/res/xml-sw600dp-land/kbd_number.xml
index 9d358b678..cb86b3b2f 100644
--- a/java/res/xml-sw600dp-land/kbd_number.xml
+++ b/java/res/xml-sw600dp-land/kbd_number.xml
@@ -21,7 +21,7 @@
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
     latin:keyboardHorizontalEdgesPadding="10%p"
-    latin:keyWidth="15.00%p"
+    latin:keyWidth="18%p"
 >
     <include
         latin:keyboardLayout="@xml/rows_number" />
diff --git a/java/res/xml-sw600dp-land/kbd_phone.xml b/java/res/xml-sw600dp-land/kbd_phone.xml
index abac6bd4f..71c7c04a1 100644
--- a/java/res/xml-sw600dp-land/kbd_phone.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone.xml
@@ -21,7 +21,7 @@
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
     latin:keyboardHorizontalEdgesPadding="10%p"
-    latin:keyWidth="15.00%p"
+    latin:keyWidth="18%p"
 >
     <include
         latin:keyboardLayout="@xml/rows_phone" />
diff --git a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
index e3f56bce7..39bdae3c7 100644
--- a/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp-land/kbd_phone_symbols.xml
@@ -21,7 +21,7 @@
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
     latin:keyboardHorizontalEdgesPadding="10%p"
-    latin:keyWidth="15.00%p"
+    latin:keyWidth="18%p"
 >
     <!-- Tablet doesn't have phone symbols keyboard -->
     <include
diff --git a/java/res/xml-sw600dp/kbd_number.xml b/java/res/xml-sw600dp/kbd_number.xml
index 70cf6a2ca..4a8b08c2a 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="15.00%p"
+    latin:keyWidth="18%p"
 >
     <include
         latin:keyboardLayout="@xml/rows_number" />
diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml
index ef20910d8..f63f1c648 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="18.00%p"
+    latin:keyWidth="18%p"
 >
     <include
         latin:keyboardLayout="@xml/rows_phone" />
diff --git a/java/res/xml-sw600dp/kbd_phone_symbols.xml b/java/res/xml-sw600dp/kbd_phone_symbols.xml
index e475f8510..a0f55b732 100644
--- a/java/res/xml-sw600dp/kbd_phone_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_phone_symbols.xml
@@ -20,7 +20,7 @@
 
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
-    latin:keyWidth="18.00%p"
+    latin:keyWidth="18%p"
 >
     <!-- Tablet doesn't have phone symbols keyboard -->
     <include
diff --git a/java/res/xml-sw600dp/rows_number_normal.xml b/java/res/xml-sw600dp/rows_number_normal.xml
index 04d295336..3954b000e 100644
--- a/java/res/xml-sw600dp/rows_number_normal.xml
+++ b/java/res/xml-sw600dp/rows_number_normal.xml
@@ -22,25 +22,22 @@
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
 >
     <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="12.75%p" />
         <Key
             latin:keyLabel="-"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="+"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="."
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="1"
             latin:keyStyle="numKeyStyle"
-            latin:keyXPos="42.25%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyLabel="2"
             latin:keyStyle="numKeyStyle" />
@@ -49,20 +46,17 @@
             latin:keyStyle="numKeyStyle" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-11.00%p"
+            latin:keyXPos="-14%p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="12.75%p" />
         <Key
             latin:keyStyle="numStarKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="/"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <switch>
             <case
                 latin:mode="time|datetime"
@@ -72,19 +66,19 @@
                     latin:keyLabelFlags="hasPopupHint"
                     latin:moreKeys="!text/more_keys_for_am_pm"
                     latin:keyStyle="numKeyStyle"
-                    latin:keyWidth="9.25%p" />
+                    latin:keyWidth="10%p" />
             </case>
             <default>
                 <Key
                     latin:keyLabel=","
                     latin:keyStyle="numKeyStyle"
-                    latin:keyWidth="9.25%p" />
+                    latin:keyWidth="10%p" />
             </default>
         </switch>
         <Key
             latin:keyLabel="4"
             latin:keyStyle="numKeyStyle"
-            latin:keyXPos="42.25%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyLabel="5"
             latin:keyStyle="numKeyStyle" />
@@ -93,21 +87,18 @@
             latin:keyStyle="numKeyStyle" />
         <Key
             latin:keyStyle="enterKeyStyle"
-            latin:keyXPos="-11.00%p"
+            latin:keyXPos="-14%p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row>
-        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
-        <Spacer
-            latin:keyWidth="12.75%p" />
         <Key
             latin:keyLabel="("
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel=")"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="9.25%p" />
+            latin:keyWidth="10%p" />
         <switch>
             <case
                 latin:mode="time|datetime"
@@ -115,19 +106,19 @@
                 <Key
                     latin:keyLabel=":"
                     latin:keyStyle="numKeyStyle"
-                    latin:keyWidth="9.25%p" />
+                    latin:keyWidth="10%p" />
             </case>
             <default>
                 <Key
                     latin:keyLabel="="
                     latin:keyStyle="numKeyStyle"
-                    latin:keyWidth="9.25%p" />
+                    latin:keyWidth="10%p" />
             </default>
         </switch>
         <Key
             latin:keyLabel="7"
             latin:keyStyle="numKeyStyle"
-            latin:keyXPos="42.25%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyLabel="8"
             latin:keyStyle="numKeyStyle" />
@@ -138,16 +129,12 @@
         <Spacer />
     </Row>
     <Row>
-        <Key
-            latin:keyStyle="numTabKeyStyle"
-            latin:keyWidth="11.00%p" />
         <Key
             latin:keyStyle="spaceKeyStyle"
-            latin:keyWidth="27.75%p"
-            latin:keyXPos="12.75%p" />
+            latin:keyWidth="30%p" />
         <Key
             latin:keyStyle="numStarKeyStyle"
-            latin:keyXPos="42.25%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyLabel="0"
             latin:keyStyle="numKeyStyle" />
@@ -155,7 +142,7 @@
             latin:keyLabel="#"
             latin:keyStyle="numKeyStyle" />
         <include
-            latin:keyXPos="-11.0%p"
+            latin:keyXPos="-10%p"
             latin:keyWidth="fillRight"
             latin:keyboardLayout="@xml/key_shortcut" />
     </Row>
diff --git a/java/res/xml-sw600dp/rows_number_password.xml b/java/res/xml-sw600dp/rows_number_password.xml
index 2a2c33d93..36f4bba46 100644
--- a/java/res/xml-sw600dp/rows_number_password.xml
+++ b/java/res/xml-sw600dp/rows_number_password.xml
@@ -24,7 +24,7 @@
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="27.50%p" />
+            latin:keyWidth="23%p" />
         <Key
             latin:keyStyle="num1KeyStyle" />
         <Key
@@ -33,13 +33,13 @@
             latin:keyStyle="num3KeyStyle" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-11.00%p"
+            latin:keyXPos="-16%p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="27.50%p" />
+            latin:keyWidth="23%p" />
         <Key
             latin:keyStyle="num4KeyStyle" />
         <Key
@@ -48,13 +48,13 @@
             latin:keyStyle="num6KeyStyle" />
         <Key
             latin:keyStyle="enterKeyStyle"
-            latin:keyXPos="-11.00%p"
+            latin:keyXPos="-16%p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
         <Spacer
-            latin:keyWidth="27.50%p" />
+            latin:keyWidth="23%p" />
         <Key
             latin:keyStyle="num7KeyStyle" />
         <Key
@@ -65,14 +65,13 @@
         <Spacer />
     </Row>
     <Row>
+        <!-- Note: This Spacer prevents the below key from being marked as a left edge key. -->
+        <Spacer
+            latin:keyWidth="41%p" />
         <Key
-            latin:keyStyle="tabKeyStyle"
-            latin:keyWidth="11.00%p" />
-        <Key
-            latin:keyStyle="num0KeyStyle"
-            latin:keyXPos="42.50%p"/>
+            latin:keyStyle="num0KeyStyle" />
         <include
-            latin:keyXPos="-11.00%p"
+            latin:keyXPos="-10%p"
             latin:keyWidth="fillRight"
             latin:keyboardLayout="@xml/key_shortcut" />
     </Row>
diff --git a/java/res/xml-sw600dp/rows_phone.xml b/java/res/xml-sw600dp/rows_phone.xml
index bb80494a8..113ce1fa6 100644
--- a/java/res/xml-sw600dp/rows_phone.xml
+++ b/java/res/xml-sw600dp/rows_phone.xml
@@ -29,66 +29,66 @@
         <Key
             latin:keyLabel="-"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="+"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyStyle="numPauseKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyStyle="num1KeyStyle"
-            latin:keyXPos="32.00%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyStyle="num2KeyStyle" />
         <Key
             latin:keyStyle="num3KeyStyle" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyXPos="-12.00%p"
+            latin:keyXPos="-14%p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <Key
             latin:keyLabel=","
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="."
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyStyle="numWaitKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyStyle="num4KeyStyle"
-            latin:keyXPos="32.00%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyStyle="num5KeyStyle" />
         <Key
             latin:keyStyle="num6KeyStyle" />
         <Key
             latin:keyStyle="enterKeyStyle"
-            latin:keyXPos="-12.00%p"
+            latin:keyXPos="-14%p"
             latin:keyWidth="fillRight" />
     </Row>
     <Row>
         <Key
             latin:keyLabel="("
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel=")"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyLabel="N"
             latin:keyStyle="numKeyStyle"
-            latin:keyWidth="10.00%p" />
+            latin:keyWidth="10%p" />
         <Key
             latin:keyStyle="num7KeyStyle"
-            latin:keyXPos="32.00%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyStyle="num8KeyStyle" />
         <Key
@@ -99,17 +99,17 @@
     <Row>
         <Key
             latin:keyStyle="spaceKeyStyle"
-            latin:keyWidth="30.00%p" />
+            latin:keyWidth="30%p" />
         <Key
             latin:keyStyle="numStarKeyStyle"
-            latin:keyXPos="32.00%p" />
+            latin:keyXPos="31%p" />
         <Key
             latin:keyStyle="num0KeyStyle" />
         <Key
             latin:keyLabel="#"
             latin:keyStyle="numKeyStyle" />
         <include
-            latin:keyXPos="-12.0%p"
+            latin:keyXPos="-10%p"
             latin:keyWidth="fillRight"
             latin:keyboardLayout="@xml/key_shortcut" />
     </Row>