diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png
index 1b901ac7966873b9859e8872631892be4e14a95b..55ef3e7f556ea9e56240545f1caba320512030e9 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png
index 1b901ac7966873b9859e8872631892be4e14a95b..9f307dc7f87abaeee450371352447eb274adcddc 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_active_lxx_light.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index 1b901ac7966873b9859e8872631892be4e14a95b..17a77cccb5d4a926c550316f1ddd6b22121ff7dc 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
index 1b901ac7966873b9859e8872631892be4e14a95b..55ef3e7f556ea9e56240545f1caba320512030e9 100644
Binary files a/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and b/java/res/drawable-hdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png
index a95cf3c2a1cdfc66a7b31db0f4647beb61be3ec0..ef6b19efe1651525f42c6012cb5df430dd560040 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png and b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png
index a95cf3c2a1cdfc66a7b31db0f4647beb61be3ec0..657f65acc63de50cb5cdfcb85f2d6e57ff6d9dfb 100644
Binary files a/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png and b/java/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png
index b33a0679b5ca5f35b612f16a515aad80921bdf19..765191881f2ee346e1fd85e9027187b64774e99c 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png
index b33a0679b5ca5f35b612f16a515aad80921bdf19..8131549e546f17dfc1ac614990840d3b60d49e7d 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_active_lxx_light.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index b33a0679b5ca5f35b612f16a515aad80921bdf19..dcf814ada9a051bf7907ac592f35949675e8311a 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
index b33a0679b5ca5f35b612f16a515aad80921bdf19..765191881f2ee346e1fd85e9027187b64774e99c 100644
Binary files a/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and b/java/res/drawable-mdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png
index 40e325ad67f58da9c0bb74452f91e593f25f1b24..c70084339dd3eeb3d50b11547c19474079289ccd 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png and b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png
index 40e325ad67f58da9c0bb74452f91e593f25f1b24..298cb9526d8f78a274e2b0e514bce30b6104748b 100644
Binary files a/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png and b/java/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png
index 6021e1c781834b95d16cbb4a0208d123dbd67d7b..0f3d3196b1d948990300fe894054c273e6573c65 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png
index 6021e1c781834b95d16cbb4a0208d123dbd67d7b..cef6d00c0c94997ae56846279555217de687f753 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_active_lxx_light.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index 6021e1c781834b95d16cbb4a0208d123dbd67d7b..b5768e629b5005d6869913a2234a6d358373a5b9 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
index 6021e1c781834b95d16cbb4a0208d123dbd67d7b..0f3d3196b1d948990300fe894054c273e6573c65 100644
Binary files a/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and b/java/res/drawable-xhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png
index 8af1ea448013c1967a0b8103409d24eb8454160a..e329cbc8f7ecd3218b264f8d9cd5b7a3cf2e4588 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png and b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png
index 8af1ea448013c1967a0b8103409d24eb8454160a..64fdb1762d33da694954e9709c9003f36c4618bc 100644
Binary files a/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png and b/java/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png
index dcc18c167814c81db47b24c98d4ab495a2881cae..927d87b580d22a38d7cf42ca1f0f823847eebc3a 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png
index dcc18c167814c81db47b24c98d4ab495a2881cae..ce84bde4c2d0e11e0eb7edd173fe8b0e6a0bdf15 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_lxx_light.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index dcc18c167814c81db47b24c98d4ab495a2881cae..5b0854e4611d45272e7adb8579bcaa0bd824f238 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
index dcc18c167814c81db47b24c98d4ab495a2881cae..927d87b580d22a38d7cf42ca1f0f823847eebc3a 100644
Binary files a/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and b/java/res/drawable-xxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png
index ff4979e910df83b4815dbcf84ca6962304408ba9..316903ef889296144a88f1798e0ff15747e932cc 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png and b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png
index ff4979e910df83b4815dbcf84ca6962304408ba9..2da7b651441e0eaf2819f102ef531b3dd56c6183 100644
Binary files a/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png and b/java/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png
index e44ef05e689275958cea2b4b5a4763316429ca72..eac4475831b03252fc06dd364fbb577234565163 100644
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png and b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png
index e44ef05e689275958cea2b4b5a4763316429ca72..16d1f687f3fbecf6b94c86c259559ca5c12614fd 100644
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png and b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_lxx_light.9.png differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png
index e44ef05e689275958cea2b4b5a4763316429ca72..78923a887ceddc88cca0b99b0d8911382ab61fcc 100644
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png and b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_dark.9.png differ
diff --git a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png
index e44ef05e689275958cea2b4b5a4763316429ca72..e57e80d055696318eca4ec8c3bc6824c150d40e0 100644
Binary files a/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png and b/java/res/drawable-xxxhdpi/btn_keyboard_key_active_pressed_lxx_light.9.png differ
diff --git a/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png b/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png
index e3b8b546c8e778c8b93b5b899fa1c22be6967c62..e75d556b485de2b29140c74142f19b0ed0fb99ee 100644
Binary files a/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png and b/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png differ
diff --git a/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png b/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png
index e3b8b546c8e778c8b93b5b899fa1c22be6967c62..00521bf096b2e676e5729098a3fff28ca48e40be 100644
Binary files a/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png and b/java/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 7b11cafcf49a6817d6ee60452c662b24c77cd476..5453d51c1720ceed9bda4099b177979f3a796b78 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -47,12 +47,12 @@
     <color name="key_text_inactive_color_lxx_light">#B337474F</color>
     <color name="key_hint_letter_color_lxx_light">#B337474F</color>
     <color name="language_on_spacebar_text_color_lxx_light">#B337474F</color>
-    <color name="highlight_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
+    <color name="highlight_color_lxx_light">#4DB6AC</color>
     <color name="auto_correct_color_lxx_light">#37474F</color>
     <color name="typed_word_color_lxx_light">#D937474F</color>
     <color name="suggested_word_color_lxx_light">#B337474F</color>
-    <color name="gesture_trail_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
-    <color name="sliding_key_input_preview_color_lxx_light">@lineageos.platform:color/color_default_accent</color>
+    <color name="gesture_trail_color_lxx_light">#4DB6AC</color>
+    <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="suggested_word_background_selected_lxx_light">#2637474F</color>
@@ -65,12 +65,12 @@
     <color name="key_text_inactive_color_lxx_dark">#80FFFFFF</color>
     <color name="key_hint_letter_color_lxx_dark">#80FFFFFF</color>
     <color name="language_on_spacebar_text_color_lxx_dark">#B3FFFFFF</color>
-    <color name="highlight_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
+    <color name="highlight_color_lxx_dark">#80CBC4</color>
     <color name="auto_correct_color_lxx_dark">#FFFFFF</color>
     <color name="typed_word_color_lxx_dark">#D9FFFFFF</color>
     <color name="suggested_word_color_lxx_dark">#B3FFFFFF</color>
-    <color name="gesture_trail_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
-    <color name="sliding_key_input_preview_color_lxx_dark">@lineageos.platform:color/color_default_accent</color>
+    <color name="gesture_trail_color_lxx_dark">#80CBC4</color>
+    <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="suggested_word_background_selected_lxx_dark">#19FFFFFF</color>
@@ -79,7 +79,7 @@
     <!-- Color resources for setup wizard and tutorial -->
     <color name="setup_background">#FFEBEBEB</color>
     <color name="setup_text_dark">#FF707070</color>
-    <color name="setup_text_action">@lineageos.platform:color/color_default_accent</color>
+    <color name="setup_text_action">@android:color/holo_blue_light</color>
     <color name="setup_step_background">@android:color/background_light</color>
     <color name="setup_welcome_video_margin_color">#FFCCCCCC</color>
     <!-- Accent color for the notification. We need to match this to the OS build -->