diff --git a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
index 7435b318b..bdb1aa0ee 100644
--- a/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
+++ b/java/res/xml-sw600dp/rows_10_10_7_symbols.xml
@@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols1" />
+ latin:keyXPos="4.5%p" />
+ latin:keyboardLayout="@xml/key_smiley"
+ latin:keyWidth="10.0%p" />
diff --git a/java/res/xml-sw600dp/rows_azerty.xml b/java/res/xml-sw600dp/rows_azerty.xml
index 8e81346b2..3ec22d302 100644
--- a/java/res/xml-sw600dp/rows_azerty.xml
+++ b/java/res/xml-sw600dp/rows_azerty.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
+ latin:keyXPos="4.500%p" />
+ latin:keyWidth="10.0%p" />
+ latin:keyXPos="4.5%p" />
+ latin:keyStyle="shiftKeyStyle"
+ latin:keyWidth="10.0%p" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_georgian.xml b/java/res/xml-sw600dp/rows_georgian.xml
index e8f974781..d4c39af45 100644
--- a/java/res/xml-sw600dp/rows_georgian.xml
+++ b/java/res/xml-sw600dp/rows_georgian.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_greek.xml b/java/res/xml-sw600dp/rows_greek.xml
index 66f6247a3..8314222c3 100644
--- a/java/res/xml-sw600dp/rows_greek.xml
+++ b/java/res/xml-sw600dp/rows_greek.xml
@@ -33,7 +33,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_hebrew.xml b/java/res/xml-sw600dp/rows_hebrew.xml
index 519a041c1..a60da3a2b 100644
--- a/java/res/xml-sw600dp/rows_hebrew.xml
+++ b/java/res/xml-sw600dp/rows_hebrew.xml
@@ -24,7 +24,7 @@
@@ -32,29 +32,29 @@
latin:keyboardLayout="@xml/rowkeys_hebrew1" />
-
-
-
-
+
+
+
+
diff --git a/java/res/xml-sw600dp/rows_nordic.xml b/java/res/xml-sw600dp/rows_nordic.xml
index 48a3048f4..3a8aa1d33 100644
--- a/java/res/xml-sw600dp/rows_nordic.xml
+++ b/java/res/xml-sw600dp/rows_nordic.xml
@@ -24,42 +24,38 @@
+ latin:keyXPos="4.5%p" />
-
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_qwertz.xml b/java/res/xml-sw600dp/rows_qwertz.xml
index a244bf291..d8f5bc6c7 100644
--- a/java/res/xml-sw600dp/rows_qwertz.xml
+++ b/java/res/xml-sw600dp/rows_qwertz.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_south_slavic.xml b/java/res/xml-sw600dp/rows_south_slavic.xml
index 8f0f38ab6..8636cbb24 100644
--- a/java/res/xml-sw600dp/rows_south_slavic.xml
+++ b/java/res/xml-sw600dp/rows_south_slavic.xml
@@ -24,41 +24,39 @@
+ latin:keyXPos="4.5%p" />
+ latin:keyWidth="10.0%p" />
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_spanish.xml b/java/res/xml-sw600dp/rows_spanish.xml
index 3628e4b26..9451e42d7 100644
--- a/java/res/xml-sw600dp/rows_spanish.xml
+++ b/java/res/xml-sw600dp/rows_spanish.xml
@@ -31,7 +31,6 @@
latin:keyLabelFlags="disableAdditionalMoreKeys|disableKeyHintLabel" />
+ latin:keyLabel="/"
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw600dp/rows_symbols_shift.xml b/java/res/xml-sw600dp/rows_symbols_shift.xml
index 83ca0c1b6..cc66f9676 100644
--- a/java/res/xml-sw600dp/rows_symbols_shift.xml
+++ b/java/res/xml-sw600dp/rows_symbols_shift.xml
@@ -32,7 +32,6 @@
latin:keyboardLayout="@xml/rowkeys_symbols_shift1" />