diff --git a/app/src/main/res/xml/rows_azerty.xml b/app/src/main/res/xml/rows_azerty.xml
index 1d6ff601c..e371528c7 100644
--- a/app/src/main/res/xml/rows_azerty.xml
+++ b/app/src/main/res/xml/rows_azerty.xml
@@ -42,14 +42,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_azerty3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_bengali_unijoy.xml b/app/src/main/res/xml/rows_bengali_unijoy.xml
index 7b7036941..1cc53e511 100644
--- a/app/src/main/res/xml/rows_bengali_unijoy.xml
+++ b/app/src/main/res/xml/rows_bengali_unijoy.xml
@@ -43,14 +43,12 @@
         >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_bengali_unijoy3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_bepo.xml b/app/src/main/res/xml/rows_bepo.xml
index c9be7eaab..708eeff24 100644
--- a/app/src/main/res/xml/rows_bepo.xml
+++ b/app/src/main/res/xml/rows_bepo.xml
@@ -37,14 +37,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_bepo3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_colemak.xml b/app/src/main/res/xml/rows_colemak.xml
index e25362010..aab0c3b19 100644
--- a/app/src/main/res/xml/rows_colemak.xml
+++ b/app/src/main/res/xml/rows_colemak.xml
@@ -42,14 +42,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_colemak3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_colemak_dh.xml b/app/src/main/res/xml/rows_colemak_dh.xml
index efb6f2b13..836bfb0f3 100644
--- a/app/src/main/res/xml/rows_colemak_dh.xml
+++ b/app/src/main/res/xml/rows_colemak_dh.xml
@@ -42,14 +42,12 @@
         >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_colemak_dh3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_dvorak.xml b/app/src/main/res/xml/rows_dvorak.xml
index 4900f04ec..e0b288f50 100644
--- a/app/src/main/res/xml/rows_dvorak.xml
+++ b/app/src/main/res/xml/rows_dvorak.xml
@@ -42,14 +42,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_dvorak3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <!-- Dvorak layout shares almost the same row with Qwerty layout.
          The difference is defined in xml/row_qwerty4.xml. -->
diff --git a/app/src/main/res/xml/rows_georgian.xml b/app/src/main/res/xml/rows_georgian.xml
index e28224f04..730447c51 100644
--- a/app/src/main/res/xml/rows_georgian.xml
+++ b/app/src/main/res/xml/rows_georgian.xml
@@ -43,14 +43,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_georgian3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_german.xml b/app/src/main/res/xml/rows_german.xml
index c53ca8797..b10a95886 100644
--- a/app/src/main/res/xml/rows_german.xml
+++ b/app/src/main/res/xml/rows_german.xml
@@ -42,15 +42,13 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_german3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-15%p"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_greek.xml b/app/src/main/res/xml/rows_greek.xml
index 8d5964c93..914841186 100644
--- a/app/src/main/res/xml/rows_greek.xml
+++ b/app/src/main/res/xml/rows_greek.xml
@@ -43,14 +43,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_greek3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_halmak.xml b/app/src/main/res/xml/rows_halmak.xml
index 8f86743bf..efc67c4b9 100644
--- a/app/src/main/res/xml/rows_halmak.xml
+++ b/app/src/main/res/xml/rows_halmak.xml
@@ -42,14 +42,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_halmak3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_halmak4" />
diff --git a/app/src/main/res/xml/rows_nepali_romanized.xml b/app/src/main/res/xml/rows_nepali_romanized.xml
index eb5619e05..b851c367d 100644
--- a/app/src/main/res/xml/rows_nepali_romanized.xml
+++ b/app/src/main/res/xml/rows_nepali_romanized.xml
@@ -40,13 +40,11 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include latin:keyboardLayout="@xml/rowkeys_nepali_romanized3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml/rows_nordic.xml b/app/src/main/res/xml/rows_nordic.xml
index bd2562674..63b059928 100644
--- a/app/src/main/res/xml/rows_nordic.xml
+++ b/app/src/main/res/xml/rows_nordic.xml
@@ -42,8 +42,7 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <Spacer
             latin:keyWidth="2.8%p" />
         <include
@@ -51,8 +50,7 @@
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-15%p"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_qwerty.xml b/app/src/main/res/xml/rows_qwerty.xml
index cf6d7e114..7bbc1e6e2 100644
--- a/app/src/main/res/xml/rows_qwerty.xml
+++ b/app/src/main/res/xml/rows_qwerty.xml
@@ -43,14 +43,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_qwerty3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_qwertz.xml b/app/src/main/res/xml/rows_qwertz.xml
index 1cca9d603..cd91b3d59 100644
--- a/app/src/main/res/xml/rows_qwertz.xml
+++ b/app/src/main/res/xml/rows_qwertz.xml
@@ -43,14 +43,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_qwertz3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
    <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_spanish.xml b/app/src/main/res/xml/rows_spanish.xml
index 07fb326df..70e475451 100644
--- a/app/src/main/res/xml/rows_spanish.xml
+++ b/app/src/main/res/xml/rows_spanish.xml
@@ -42,14 +42,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_qwerty3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_swiss.xml b/app/src/main/res/xml/rows_swiss.xml
index a3b81bf7d..15943d777 100644
--- a/app/src/main/res/xml/rows_swiss.xml
+++ b/app/src/main/res/xml/rows_swiss.xml
@@ -42,8 +42,7 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <Spacer
             latin:keyWidth="2.8%p" />
         <include
@@ -51,8 +50,7 @@
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyXPos="-15%p"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include
         latin:keyboardLayout="@xml/row_qwerty4" />
diff --git a/app/src/main/res/xml/rows_symbols.xml b/app/src/main/res/xml/rows_symbols.xml
index 046c5e89a..ffa0ce1e3 100644
--- a/app/src/main/res/xml/rows_symbols.xml
+++ b/app/src/main/res/xml/rows_symbols.xml
@@ -55,14 +55,12 @@
     >
         <Key
             latin:keyStyle="toMoreSymbolKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_symbols3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
diff --git a/app/src/main/res/xml/rows_symbols_shift.xml b/app/src/main/res/xml/rows_symbols_shift.xml
index 32ad66f4a..a0e26a361 100644
--- a/app/src/main/res/xml/rows_symbols_shift.xml
+++ b/app/src/main/res/xml/rows_symbols_shift.xml
@@ -45,14 +45,12 @@
     >
         <Key
             latin:keyStyle="backFromMoreSymbolKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_symbols_shift3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <Row
         latin:keyWidth="10%p"
diff --git a/app/src/main/res/xml/rows_turkish.xml b/app/src/main/res/xml/rows_turkish.xml
index 2e726186d..f3d444064 100644
--- a/app/src/main/res/xml/rows_turkish.xml
+++ b/app/src/main/res/xml/rows_turkish.xml
@@ -20,14 +20,12 @@
     >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_turkish3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
diff --git a/app/src/main/res/xml/rows_uzbek.xml b/app/src/main/res/xml/rows_uzbek.xml
index c8e24137f..3d02a5ba4 100644
--- a/app/src/main/res/xml/rows_uzbek.xml
+++ b/app/src/main/res/xml/rows_uzbek.xml
@@ -31,15 +31,13 @@
     <Row latin:keyWidth="9.2%p" >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <Spacer latin:keyWidth="2.8%p" />
         <include latin:keyboardLayout="@xml/rowkeys_qwerty3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
             latin:keyWidth="fillRight"
-            latin:keyXPos="-15%p"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyXPos="-15%p" />
     </Row>
     <include latin:keyboardLayout="@xml/row_qwerty4" />
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/xml/rows_workman.xml b/app/src/main/res/xml/rows_workman.xml
index fc9538a35..14dec4e1d 100644
--- a/app/src/main/res/xml/rows_workman.xml
+++ b/app/src/main/res/xml/rows_workman.xml
@@ -42,14 +42,12 @@
         >
         <Key
             latin:keyStyle="shiftKeyStyle"
-            latin:keyWidth="15%p"
-            latin:visualInsetsRight="1%p" />
+            latin:keyWidth="15%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_workman3" />
         <Key
             latin:keyStyle="deleteKeyStyle"
-            latin:keyWidth="fillRight"
-            latin:visualInsetsLeft="1%p" />
+            latin:keyWidth="fillRight" />
     </Row>
     <!-- Fourth row -->
     <include