diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
index 65fbf96a6..48d7faad4 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/internal/KeyboardTextsTable.java
@@ -259,6 +259,7 @@ public final class KeyboardTextsTable {
         /* 173: 0 */ "morekeys_double_quote",
         /* 174: 0 */ "morekeys_tablet_double_quote",
         /* 175: 0 */ "keyspec_emoji_action_key",
+        /* 176: 0 */ "keyspec_emoji_normal_key",
     };
 
     private static final String EMPTY = "";
@@ -480,6 +481,7 @@ public final class KeyboardTextsTable {
         /* morekeys_double_quote */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
         /* morekeys_tablet_double_quote */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
         /* keyspec_emoji_action_key */ "!icon/emoji_action_key|!code/key_emoji",
+        /* keyspec_emoji_normal_key */ "!icon/emoji_normal_key|!code/key_emoji",
     };
 
     /* Locale af: Afrikaans */
diff --git a/app/src/main/res/xml/key_emoji.xml b/app/src/main/res/xml/key_emoji.xml
index 2d56c90a1..6d7fc7030 100644
--- a/app/src/main/res/xml/key_emoji.xml
+++ b/app/src/main/res/xml/key_emoji.xml
@@ -32,6 +32,7 @@
         <default>
             <Key
                 latin:keyStyle="emojiKeyStyle"
+                latin:backgroundType="action"
                 latin:keyWidth="fillRight" />
         </default>
     </switch>
diff --git a/app/src/main/res/xml/key_styles_common.xml b/app/src/main/res/xml/key_styles_common.xml
index a08936cdf..6eb0da1ee 100644
--- a/app/src/main/res/xml/key_styles_common.xml
+++ b/app/src/main/res/xml/key_styles_common.xml
@@ -81,18 +81,18 @@
         <case latin:keyboardTheme="ICS|KLP|LXXLightBorder|LXXDarkBorder">
             <key-style
                 latin:styleName="emojiKeyStyle"
-                latin:keySpec="!icon/emoji_action_key|!code/key_emoji"
+                latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
                 latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="action" />
+                latin:backgroundType="functional" />
         </case>
         <!-- keyboardTheme="LXXLight|LXXDark" -->
         <default>
             <key-style
                 latin:styleName="emojiKeyStyle"
-                latin:keySpec="!icon/emoji_action_key|!code/key_emoji"
+                latin:keySpec="!icon/emoji_normal_key|!code/key_emoji"
                 latin:keyLabelFlags="keepBackgroundAspectRatio"
                 latin:keyActionFlags="noKeyPreview"
-                latin:backgroundType="action" />
+                latin:backgroundType="functional" />
         </default>
     </switch>
     <include
diff --git a/app/src/main/res/xml/key_styles_settings.xml b/app/src/main/res/xml/key_styles_settings.xml
index b9f9d1c13..05f285fb0 100644
--- a/app/src/main/res/xml/key_styles_settings.xml
+++ b/app/src/main/res/xml/key_styles_settings.xml
@@ -35,7 +35,7 @@
             <key-style
                 latin:styleName="settingsMoreKeysStyle"
                 latin:keyLabelFlags="hasPopupHint"
-                latin:additionalMoreKeys="!text/keyspec_settings,!icon/language_switch_key|!code/key_language_switch,!text/keyspec_emoji_action_key"
+                latin:additionalMoreKeys="!text/keyspec_settings,!icon/language_switch_key|!code/key_language_switch,!text/keyspec_emoji_normal_key"
                 latin:backgroundType="functional" />
         </default>
     </switch>