diff --git a/app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark.xml
similarity index 75%
rename from app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx.xml
rename to app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark.xml
index 732fd39f9..6a7959cf3 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_active_pressed_lxx.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark.xml
@@ -4,7 +4,7 @@
     android:shape="oval">
 
     <solid
-        android:color="#FF3389e8"/>
+        android:color="@color/action_key_background_lxx_dark"/>
 
     <size
         android:width="35dp"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark_border.xml
similarity index 64%
rename from app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml
rename to app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark_border.xml
index f3a5ff57b..699069f1f 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_dark_border.xml
@@ -2,13 +2,13 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="#1f1f1f" />
+            <solid android:color="@color/key_bottom_bevel_lxx_dark" />
             <corners android:radius="5dp"/>
         </shape>
     </item>
-    <item android:bottom="3px">
+    <item android:bottom="1dp">
         <shape android:shape="rectangle">
-            <solid android:color="#0075f6" />
+            <solid android:color="@color/action_key_background_lxx_dark" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_active_lxx.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light.xml
similarity index 75%
rename from app/src/main/res/drawable/btn_keyboard_key_active_lxx.xml
rename to app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light.xml
index f32d4f0f9..b2e993c8f 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_active_lxx.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light.xml
@@ -4,7 +4,7 @@
     android:shape="oval">
 
     <solid
-        android:color="#DD0075f6"/>
+        android:color="@color/action_key_background_lxx_light"/>
 
     <size
         android:width="35dp"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light_border.xml
similarity index 64%
rename from app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml
rename to app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light_border.xml
index e261efec2..26fd241ba 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_action_lxx_border_light.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_normal_lxx_light_border.xml
@@ -2,13 +2,13 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item >
         <shape android:shape="rectangle">
-            <solid android:color="#99888B8E" />
+            <solid android:color="@color/key_bottom_bevel_lxx_light" />
             <corners android:radius="5dp"/>
         </shape>
     </item>
-    <item android:bottom="3px">
+    <item android:bottom="1dp">
         <shape android:shape="rectangle">
-            <solid android:color="#0075f6" />
+            <solid android:color="@color/action_key_background_lxx_light" />
             <corners android:radius="5dp" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark.xml
new file mode 100644
index 000000000..ee86a64ed
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/action_key_background_pressed_lxx_dark"/>
+
+    <size
+        android:width="35dp"
+        android:height="35dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark_border.xml
similarity index 67%
rename from app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml
rename to app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark_border.xml
index 244e2c756..024984adb 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_dark_border.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#3389e8" />
+    <solid android:color="@color/action_key_background_pressed_lxx_dark" />
     <corners android:radius="5dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light.xml
new file mode 100644
index 000000000..4ca41c3ec
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+
+    <solid
+        android:color="@color/action_key_background_pressed_lxx_light"/>
+
+    <size
+        android:width="35dp"
+        android:height="35dp"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light_border.xml
new file mode 100644
index 000000000..6762edd45
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_action_pressed_lxx_light_border.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/action_key_background_pressed_lxx_light" />
+    <corners android:radius="5dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml
deleted file mode 100644
index 995f78113..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_function_lxx_dark_border.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item >
-        <shape android:shape="rectangle">
-            <solid android:color="#1f1f1f" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-    <item android:bottom="3px">
-        <shape android:shape="rectangle">
-            <solid android:color="#1f1f1f" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_function_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_function_lxx_light_border.xml
deleted file mode 100644
index c60e35769..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_function_lxx_light_border.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item >
-        <shape android:shape="rectangle">
-            <solid android:color="#99888B8E" />
-            <corners android:radius="5dp"/>
-        </shape>
-    </item>
-    <item android:bottom="3px">
-        <shape android:shape="rectangle">
-            <solid android:color="#aab3be" />
-            <corners android:radius="5dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml
index 4b15d47b6..3b71b3307 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark.xml
@@ -14,9 +14,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx" />
+        android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_dark" />
     <item android:state_active="true"
-        android:drawable="@drawable/btn_keyboard_key_active_lxx" />
+        android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_dark" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml
index 107885984..4ef058ee7 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_dark_border.xml
@@ -17,9 +17,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_border" />
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_dark_border" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_action_lxx_border" />
+          android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_dark_border" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml
index 6b6ab44b7..0eef25308 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_light.xml
@@ -17,9 +17,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx" />
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_light" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_active_lxx" />
+          android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_light" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml b/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml
index f08ddace1..51165ee75 100644
--- a/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml
+++ b/app/src/main/res/drawable/btn_keyboard_key_lxx_light_border.xml
@@ -17,9 +17,9 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
-          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_border" />
+          android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_light_border" />
     <item android:state_active="true"
-          android:drawable="@drawable/btn_keyboard_key_action_lxx_border_light" />
+          android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_light_border" />
 
     <!-- Toggle keys. Use checkable/checked state. -->
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx.xml
deleted file mode 100644
index e8c112931..000000000
--- a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx" />
-    <item android:drawable="@drawable/btn_keyboard_key_active_lxx" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml
new file mode 100644
index 000000000..2c4fee132
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_dark" />
+    <item android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_dark" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml
new file mode 100644
index 000000000..346346957
--- /dev/null
+++ b/app/src/main/res/drawable/btn_keyboard_key_popup_action_lxx_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true"
+        android:drawable="@drawable/btn_keyboard_key_action_pressed_lxx_light" />
+    <item android:drawable="@drawable/btn_keyboard_key_action_normal_lxx_light" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 56fb232f2..6b949b30d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -55,6 +55,8 @@
     <color name="sliding_key_input_preview_color_lxx_light">#B34DB6AC</color>
     <color name="key_background_lxx_light">#ECEFF1</color>
     <color name="key_background_pressed_lxx_light">#2637474F</color>
+    <color name="action_key_background_lxx_light">#1A73E8</color>
+    <color name="action_key_background_pressed_lxx_light">#3683e8</color>
     <color name="suggested_word_background_selected_lxx_light">#2637474F</color>
     <color name="gesture_floating_preview_color_lxx_light">#E6ECEFF1</color>
     <color name="emoji_tab_page_indicator_background_lxx_light">#E4E7E9</color>
@@ -73,7 +75,8 @@
     <color name="sliding_key_input_preview_color_lxx_dark">#B380CBC4</color>
     <color name="key_background_lxx_dark">#263238</color>
     <color name="key_background_pressed_lxx_dark">#19FFFFFF</color>
-    <color name="key_background_amoled">#000000</color>
+    <color name="action_key_background_lxx_dark">#5E97F6</color>
+    <color name="action_key_background_pressed_lxx_dark">#86b0f6</color>
     <color name="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
     <color name="gesture_floating_preview_color_lxx_dark">#E621272B</color>
     <color name="emoji_tab_page_indicator_background_lxx_dark">#21272B</color>
diff --git a/app/src/main/res/values/themes-lxx-dark.xml b/app/src/main/res/values/themes-lxx-dark.xml
index 07261c9c8..1f37a61a0 100644
--- a/app/src/main/res/values/themes-lxx-dark.xml
+++ b/app/src/main/res/values/themes-lxx-dark.xml
@@ -19,7 +19,10 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="KeyboardTheme.LXX_Dark" parent="KeyboardIcons.LXX_Dark">
+    <style
+        name="KeyboardTheme.LXX_Dark"
+        parent="KeyboardIcons.LXX_Dark"
+    >
         <item name="inputViewStyle">@style/InputView.LXX</item>
         <item name="keyboardStyle">@style/Keyboard.LXX_Dark</item>
         <item name="keyboardViewStyle">@style/KeyboardView.LXX_Dark</item>
@@ -120,7 +123,7 @@
         parent="MoreKeysKeyboardView.LXX_Dark"
     >
         <item name="android:background">@android:color/transparent</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_dark</item>
         <item name="divider">@null</item>
         <item name="keyLabelFlags">keepBackgroundAspectRatio</item>
     </style>
diff --git a/app/src/main/res/values/themes-lxx-light.xml b/app/src/main/res/values/themes-lxx-light.xml
index 19fd9980b..2476272ff 100644
--- a/app/src/main/res/values/themes-lxx-light.xml
+++ b/app/src/main/res/values/themes-lxx-light.xml
@@ -120,7 +120,7 @@
         parent="MoreKeysKeyboardView.LXX_Light"
     >
         <item name="android:background">@android:color/transparent</item>
-        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx</item>
+        <item name="keyBackground">@drawable/btn_keyboard_key_popup_action_lxx_light</item>
         <item name="divider">@null</item>
         <item name="keyLabelFlags">keepBackgroundAspectRatio</item>
     </style>