diff --git a/java/res/xml-iw/kbd_qwerty.xml b/java/res/xml-iw/kbd_qwerty.xml
index 7f66eef..fd94a12 100644
--- a/java/res/xml-iw/kbd_qwerty.xml
+++ b/java/res/xml-iw/kbd_qwerty.xml
@@ -21,16 +21,17 @@
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
     latin:keyWidth="10%p"
-    latin:horizontalGap="0px"
+    latin:horizontalGap="@dimen/key_horizontal_gap"
     latin:verticalGap="@dimen/key_bottom_gap"
     latin:keyHeight="@dimen/key_height"
 >
     <Row
         latin:rowEdgeFlags="top"
     >
+        <Spacer
+            latin:horizontalGap="5%p" />
         <Key
             latin:keyLabel="ק"
-            latin:horizontalGap="5%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ר" />
@@ -46,13 +47,14 @@
             latin:keyLabel="ם" />
         <Key
             latin:keyLabel="פ" />
+        <Spacer
+            latin:horizontalGap="1.25%p" />
         <Key
             latin:codes="@integer/key_delete"
             latin:keyIcon="@drawable/sym_keyboard_delete"
             latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
             latin:keyWidth="13.75%p"
             latin:isModifier="true"
-            latin:horizontalGap="1.25%p"
             latin:isRepeatable="true"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -81,9 +83,10 @@
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
+        <Spacer
+            latin:horizontalGap="5%p" />
         <Key
             latin:keyLabel="ז"
-            latin:horizontalGap="5%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ס" />
diff --git a/java/res/xml-iw/kbd_qwerty_black.xml b/java/res/xml-iw/kbd_qwerty_black.xml
index 80ade20..1c1c1e3 100644
--- a/java/res/xml-iw/kbd_qwerty_black.xml
+++ b/java/res/xml-iw/kbd_qwerty_black.xml
@@ -21,16 +21,17 @@
 <Keyboard
     xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
     latin:keyWidth="10%p"
-    latin:horizontalGap="0px"
+    latin:horizontalGap="@dimen/key_horizontal_gap"
     latin:verticalGap="@dimen/key_bottom_gap"
     latin:keyHeight="@dimen/key_height"
 >
     <Row
         latin:rowEdgeFlags="top"
     >
+        <Spacer
+            latin:horizontalGap="5%p" />
         <Key
             latin:keyLabel="ק"
-            latin:horizontalGap="5%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ר" />
@@ -46,12 +47,13 @@
             latin:keyLabel="ם" />
         <Key
             latin:keyLabel="פ" />
+        <Spacer
+            latin:horizontalGap="1.25%p" />
         <Key
             latin:codes="@integer/key_delete"
             latin:keyIcon="@drawable/sym_bkeyboard_delete"
             latin:iconPreview="@drawable/sym_keyboard_feedback_delete"
             latin:keyWidth="13.75%p"
-            latin:horizontalGap="1.25%p"
             latin:isRepeatable="true"
             latin:keyEdgeFlags="right" />
     </Row>
@@ -80,9 +82,10 @@
             latin:keyEdgeFlags="right" />
     </Row>
     <Row>
+        <Spacer
+            latin:horizontalGap="5%p" />
         <Key
             latin:keyLabel="ז"
-            latin:horizontalGap="5%p"
             latin:keyEdgeFlags="left" />
         <Key
             latin:keyLabel="ס" />