diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/DynamicGridKeyboard.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
index 79fa46ba4..35b217637 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/emoji/DynamicGridKeyboard.java
@@ -45,6 +45,7 @@ final class DynamicGridKeyboard extends Keyboard {
 
     private final SharedPreferences mPrefs;
     private final int mHorizontalStep;
+    private final int mHorizontalGap;
     private final int mVerticalStep;
     private final int mColumnsNum;
     private final int mMaxKeyCount;
@@ -59,7 +60,8 @@ final class DynamicGridKeyboard extends Keyboard {
         super(templateKeyboard);
         final Key key0 = getTemplateKey(TEMPLATE_KEY_CODE_0);
         final Key key1 = getTemplateKey(TEMPLATE_KEY_CODE_1);
-        mHorizontalStep = Math.abs(key1.getX() - key0.getX());
+        mHorizontalGap = Math.abs(key1.getX() - key0.getX()) - key0.getWidth();
+        mHorizontalStep = key0.getWidth() + mHorizontalGap;
         mVerticalStep = key0.getHeight() + mVerticalGap;
         mColumnsNum = mBaseWidth / mHorizontalStep;
         mMaxKeyCount = maxKeyCount;
@@ -208,12 +210,12 @@ final class DynamicGridKeyboard extends Keyboard {
 
     private int getKeyX0(final int index) {
         final int column = index % mColumnsNum;
-        return column * mHorizontalStep;
+        return column * mHorizontalStep + mHorizontalGap / 2;
     }
 
     private int getKeyX1(final int index) {
         final int column = index % mColumnsNum + 1;
-        return column * mHorizontalStep;
+        return column * mHorizontalStep + mHorizontalGap / 2;
     }
 
     private int getKeyY0(final int index) {
diff --git a/app/src/main/res/xml/kbd_emoji_category1.xml b/app/src/main/res/xml/kbd_emoji_category1.xml
index 2727d890a..ccd2fee90 100644
--- a/app/src/main/res/xml/kbd_emoji_category1.xml
+++ b/app/src/main/res/xml/kbd_emoji_category1.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_smileys_emotion"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category10.xml b/app/src/main/res/xml/kbd_emoji_category10.xml
index c65528be3..56b185cd7 100644
--- a/app/src/main/res/xml/kbd_emoji_category10.xml
+++ b/app/src/main/res/xml/kbd_emoji_category10.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:textsArray="@array/emoji_emoticons"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category2.xml b/app/src/main/res/xml/kbd_emoji_category2.xml
index e4e9b2b38..ecfc4639d 100644
--- a/app/src/main/res/xml/kbd_emoji_category2.xml
+++ b/app/src/main/res/xml/kbd_emoji_category2.xml
@@ -28,6 +28,6 @@
     <GridRows
         latin:codesArray="@array/emoji_people_body"
         latin:moreCodesArray="@array/emoji_people_body_more"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category3.xml b/app/src/main/res/xml/kbd_emoji_category3.xml
index 2960d8f17..98d9296c0 100644
--- a/app/src/main/res/xml/kbd_emoji_category3.xml
+++ b/app/src/main/res/xml/kbd_emoji_category3.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_animals_nature"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category4.xml b/app/src/main/res/xml/kbd_emoji_category4.xml
index b05973dbc..a95758271 100644
--- a/app/src/main/res/xml/kbd_emoji_category4.xml
+++ b/app/src/main/res/xml/kbd_emoji_category4.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_food_drink"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category5.xml b/app/src/main/res/xml/kbd_emoji_category5.xml
index 3bb0ef876..a59138564 100644
--- a/app/src/main/res/xml/kbd_emoji_category5.xml
+++ b/app/src/main/res/xml/kbd_emoji_category5.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_travel_places"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category6.xml b/app/src/main/res/xml/kbd_emoji_category6.xml
index 4318a1fed..7860ed0cb 100644
--- a/app/src/main/res/xml/kbd_emoji_category6.xml
+++ b/app/src/main/res/xml/kbd_emoji_category6.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_activities"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category7.xml b/app/src/main/res/xml/kbd_emoji_category7.xml
index a7a94448e..2cd62ea87 100644
--- a/app/src/main/res/xml/kbd_emoji_category7.xml
+++ b/app/src/main/res/xml/kbd_emoji_category7.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_objects"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category8.xml b/app/src/main/res/xml/kbd_emoji_category8.xml
index 4205cf549..03474220f 100644
--- a/app/src/main/res/xml/kbd_emoji_category8.xml
+++ b/app/src/main/res/xml/kbd_emoji_category8.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_symbols"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_category9.xml b/app/src/main/res/xml/kbd_emoji_category9.xml
index a6c2f998e..a7d081e89 100644
--- a/app/src/main/res/xml/kbd_emoji_category9.xml
+++ b/app/src/main/res/xml/kbd_emoji_category9.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_flags"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>
diff --git a/app/src/main/res/xml/kbd_emoji_recents.xml b/app/src/main/res/xml/kbd_emoji_recents.xml
index 1f0050181..96452ba5d 100644
--- a/app/src/main/res/xml/kbd_emoji_recents.xml
+++ b/app/src/main/res/xml/kbd_emoji_recents.xml
@@ -27,6 +27,6 @@
 >
     <GridRows
         latin:codesArray="@array/emoji_recents"
-        latin:keyLabelFlags="fontNormal|alignLabelOffCenter"
+        latin:keyLabelFlags="fontNormal"
         latin:backgroundType="empty" />
 </Keyboard>