diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
index 6065d54dd..7a76aa77f 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/keyboard/KeyboardView.java
@@ -611,7 +611,7 @@ public class KeyboardView extends View {
                     || keyboard.mId.mElementId == KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED
                     || keyboard.mId.mElementId == KeyboardId.ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED
             )
-                icon.setColorFilter(mColors.getAccent(), PorterDuff.Mode.SRC_ATOP); // todo: switch to accentColorFilter after changing keyboard symbols to white icons
+                icon.setColorFilter(mColors.getAccentColorFilter());
             else
                 icon.setColorFilter(mColors.getKeyTextFilter()); // key text if not shifted
         } else if (key.getBackgroundType() != Key.BACKGROUND_TYPE_NORMAL) {
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png
deleted file mode 100644
index d498861ca..000000000
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png
index 214778522..8099fdc8c 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png
deleted file mode 100644
index 3880afe98..000000000
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png
index 54b3e33a3..8099fdc8c 100644
Binary files a/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png and b/app/src/main/res/drawable-hdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png
deleted file mode 100644
index a81f5c137..000000000
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png
index 1b4da74ce..2922cdb14 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png
deleted file mode 100644
index a93ae89ee..000000000
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png
index d4a5e9da1..2922cdb14 100644
Binary files a/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png and b/app/src/main/res/drawable-mdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
index 96232f024..f92abfea8 100644
--- a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
+++ b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_dark_system_accent.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/sym_keyboard_shift_locked_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_dark" />
+    android:src="@drawable/sym_keyboard_shift_locked_lxx_light" android:tint="@color/icon_tint_system_accent_lxx_dark" />
diff --git a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_light_system_accent.xml b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_light_system_accent.xml
index 86f6dd0b9..e5fa120fe 100644
--- a/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_light_system_accent.xml
+++ b/app/src/main/res/drawable-v31/sym_keyboard_shift_locked_lxx_light_system_accent.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/sym_keyboard_shift_locked_lxx_dark" android:tint="@color/icon_tint_system_accent_lxx_light" />
+    android:src="@drawable/sym_keyboard_shift_locked_lxx_light" android:tint="@color/icon_tint_system_accent_lxx_light" />
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png
deleted file mode 100644
index 4ff90f6b2..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png
index 8f2bbed0e..e6b4a8c0d 100644
Binary files a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png and b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png
deleted file mode 100644
index ddd81f627..000000000
Binary files a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png
index 0ff6c8459..e6b4a8c0d 100644
Binary files a/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png and b/app/src/main/res/drawable-xhdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png
deleted file mode 100644
index 0ebec83bd..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png
index 9a0d09deb..2e700aeab 100644
Binary files a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png
deleted file mode 100644
index 4bcad2d31..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png
index 1af06a315..2e700aeab 100644
Binary files a/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png and b/app/src/main/res/drawable-xxhdpi/sym_keyboard_shift_lxx_light.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png
deleted file mode 100644
index 840510416..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png
index b064b8054..98bed03ed 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_locked_lxx_light.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_dark.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_dark.png
deleted file mode 100644
index 9f32e5322..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_dark.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png
index cef49ec67..98bed03ed 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png and b/app/src/main/res/drawable-xxxhdpi/sym_keyboard_shift_lxx_light.png differ