diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/RichInputMethodSubtype.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/RichInputMethodSubtype.java
index 2a097096..bda31c11 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/RichInputMethodSubtype.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/RichInputMethodSubtype.java
@@ -174,7 +174,7 @@ public class RichInputMethodSubtype {
     private static final RichInputMethodSubtype DUMMY_NO_LANGUAGE_SUBTYPE =
             new RichInputMethodSubtype(new InputMethodSubtype.InputMethodSubtypeBuilder()
                     .setSubtypeNameResId(R.string.subtype_no_language_qwerty)
-                    .setSubtypeIconResId(R.drawable.ic_ime_switcher_dark)
+                    .setSubtypeIconResId(R.drawable.ic_ime_switcher)
                     .setSubtypeLocale(SubtypeLocaleUtils.NO_LANGUAGE)
                     .setSubtypeMode(KEYBOARD_MODE)
                     .setSubtypeExtraValue(EXTRA_VALUE_OF_DUMMY_NO_LANGUAGE_SUBTYPE)
@@ -194,7 +194,7 @@ public class RichInputMethodSubtype {
     private static final RichInputMethodSubtype DUMMY_EMOJI_SUBTYPE =
             new RichInputMethodSubtype(new InputMethodSubtype.InputMethodSubtypeBuilder()
                     .setSubtypeNameResId(R.string.subtype_emoji)
-                    .setSubtypeIconResId(R.drawable.ic_ime_switcher_dark)
+                    .setSubtypeIconResId(R.drawable.ic_ime_switcher)
                     .setSubtypeLocale(SubtypeLocaleUtils.NO_LANGUAGE)
                     .setSubtypeMode(KEYBOARD_MODE)
                     .setSubtypeExtraValue(EXTRA_VALUE_OF_DUMMY_EMOJI_SUBTYPE)
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/AdditionalSubtypeUtils.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/AdditionalSubtypeUtils.java
index de801359..563bb1ae 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/AdditionalSubtypeUtils.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/AdditionalSubtypeUtils.java
@@ -58,7 +58,7 @@ public final class AdditionalSubtypeUtils {
                 getPlatformVersionIndependentSubtypeId(localeString, keyboardLayoutSetName);
         final InputMethodSubtype.InputMethodSubtypeBuilder builder = new InputMethodSubtype.InputMethodSubtypeBuilder()
                 .setSubtypeNameResId(nameId)
-                .setSubtypeIconResId(R.drawable.ic_ime_switcher_dark)
+                .setSubtypeIconResId(R.drawable.ic_ime_switcher)
                 .setSubtypeLocale(localeString)
                 .setSubtypeMode(KEYBOARD_MODE)
                 .setSubtypeExtraValue(platformVersionDependentExtraValues)
diff --git a/app/src/main/res/drawable-hdpi/ic_ime_switcher_dark.webp b/app/src/main/res/drawable-hdpi/ic_ime_switcher_dark.webp
deleted file mode 100644
index e77cd0ad..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_ime_switcher_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notify_dictionary_white.png b/app/src/main/res/drawable-hdpi/ic_notify_dictionary_white.png
deleted file mode 100644
index 76eb3306..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_notify_dictionary_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_ime_switcher_dark.webp b/app/src/main/res/drawable-mdpi/ic_ime_switcher_dark.webp
deleted file mode 100644
index 9c88fbac..00000000
Binary files a/app/src/main/res/drawable-mdpi/ic_ime_switcher_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/ic_notify_dictionary.xml b/app/src/main/res/drawable-v21/ic_notify_dictionary.xml
deleted file mode 100644
index 1fbe4fb5..00000000
--- a/app/src/main/res/drawable-v21/ic_notify_dictionary.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-   android:inset="@dimen/settings_screen_icon_inset">
-    <bitmap android:src="@drawable/ic_notify_dictionary_white"
-        android:tint="?android:colorForeground"/>
-</inset>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/ic_ime_switcher_dark.webp b/app/src/main/res/drawable-xhdpi/ic_ime_switcher_dark.webp
deleted file mode 100644
index 8cacacbc..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_ime_switcher_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notify_dictionary_white.png b/app/src/main/res/drawable-xhdpi/ic_notify_dictionary_white.png
deleted file mode 100644
index 4bd44276..00000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_notify_dictionary_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_ime_switcher_dark.webp b/app/src/main/res/drawable-xxhdpi/ic_ime_switcher_dark.webp
deleted file mode 100644
index 4df6dfa0..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_ime_switcher_dark.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notify_dictionary_white.png b/app/src/main/res/drawable-xxhdpi/ic_notify_dictionary_white.png
deleted file mode 100644
index 3d94b1b7..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notify_dictionary_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notify_dictionary_white.png b/app/src/main/res/drawable-xxxhdpi/ic_notify_dictionary_white.png
deleted file mode 100644
index 4c8016c3..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_notify_dictionary_white.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_ime_switcher.xml b/app/src/main/res/drawable/ic_ime_switcher.xml
new file mode 100644
index 00000000..23f1a64b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_ime_switcher.xml
@@ -0,0 +1,13 @@
+<!--
+    icon from pictogrammers.com
+    SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FFF"
+        android:pathData="M6,16H18V18H6V16M6,13V15H2V13H6M7,15V13H10V15H7M11,15V13H13V15H11M14,15V13H17V15H14M18,15V13H22V15H18M2,10H5V12H2V10M19,12V10H22V12H19M18,12H16V10H18V12M8,12H6V10H8V12M12,12H9V10H12V12M15,12H13V10H15V12M2,9V7H4V9H2M5,9V7H7V9H5M8,9V7H10V9H8M11,9V7H13V9H11M14,9V7H16V9H14M17,9V7H22V9H17Z"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_notify_dictionary.xml b/app/src/main/res/drawable/ic_notify_dictionary.xml
deleted file mode 100644
index 48083d36..00000000
--- a/app/src/main/res/drawable/ic_notify_dictionary.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_notify_dictionary_white"/>
\ No newline at end of file
diff --git a/app/src/main/res/xml/method.xml b/app/src/main/res/xml/method.xml
index 501e8c17..7cdfa197 100644
--- a/app/src/main/res/xml/method.xml
+++ b/app/src/main/res/xml/method.xml
@@ -111,7 +111,7 @@
         android:settingsActivity="org.dslul.openboard.inputmethod.latin.settings.SettingsActivity"
         android:isDefault="@bool/im_is_default"
         android:supportsSwitchingToNextInputMethod="true">
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xc9194f97"
             android:imeSubtypeLocale="en_AU"
@@ -120,7 +120,7 @@
             android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_en_US"
             android:subtypeId="0xc9194f98"
             android:imeSubtypeLocale="en_US"
@@ -129,7 +129,7 @@
             android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_en_GB"
             android:subtypeId="0xb045e755"
             android:imeSubtypeLocale="en_GB"
@@ -138,7 +138,7 @@
             android:imeSubtypeExtraValue="TrySuppressingImeSwitcher,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x6f972360"
             android:imeSubtypeLocale="af"
@@ -147,7 +147,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x590dde40"
             android:imeSubtypeLocale="ar"
@@ -156,7 +156,7 @@
             android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_arabic_pc"
             android:subtypeId="0x590dde41"
             android:imeSubtypeLocale="ar"
@@ -165,7 +165,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=arabic_pc,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x70b0f974"
             android:imeSubtypeLocale="az_AZ"
@@ -174,7 +174,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x1dc3a859"
             android:imeSubtypeLocale="be_BY"
@@ -183,7 +183,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x0ba9c0e8"
             android:imeSubtypeLocale="bg"
@@ -192,7 +192,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_bulgarian_bds"
             android:subtypeId="0x5f51ba9a"
             android:imeSubtypeLocale="bg"
@@ -201,7 +201,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bds,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_bulgarian_bekl"
             android:subtypeId="0x5f51ba9b"
             android:imeSubtypeLocale="bg"
@@ -210,7 +210,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=bulgarian_bekl,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xa2144b0c"
             android:imeSubtypeLocale="bn_BD"
@@ -219,7 +219,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_unijoy,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_with_layout_bn_BD"
             android:subtypeId="0xa2144b0d"
             android:imeSubtypeLocale="bn_BD"
@@ -228,7 +228,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali_akkhor,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xbff5986c"
             android:imeSubtypeLocale="bn_IN"
@@ -237,7 +237,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=bengali,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xd2e520d5"
             android:imeSubtypeLocale="ca"
@@ -246,7 +246,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x2d3d2ed0"
             android:imeSubtypeLocale="cs"
@@ -255,7 +255,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x2df4605d"
             android:imeSubtypeLocale="da"
@@ -264,7 +264,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x2e2cbe61"
             android:imeSubtypeLocale="de"
@@ -273,7 +273,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x7acfd0aa"
             android:imeSubtypeLocale="de_CH"
@@ -282,7 +282,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x00"
             android:imeSubtypeLocale="de_DE"
@@ -291,7 +291,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=german,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x0e7802d3"
             android:imeSubtypeLocale="el"
@@ -300,7 +300,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=greek,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8d58fc2d"
             android:imeSubtypeLocale="en_IN"
@@ -309,7 +309,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x4090554a"
             android:imeSubtypeLocale="eo"
@@ -318,7 +318,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x30a6e00e"
             android:imeSubtypeLocale="es"
@@ -327,7 +327,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_es_US"
             android:subtypeId="0x84d2efc6"
             android:imeSubtypeLocale="es_US"
@@ -336,7 +336,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xa23e5d19"
             android:imeSubtypeLocale="es_419"
@@ -345,7 +345,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xec2d3955"
             android:imeSubtypeLocale="et_EE"
@@ -354,7 +354,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=nordic,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x070e5c07"
             android:imeSubtypeLocale="eu_ES"
@@ -363,7 +363,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xbe66c254"
             android:imeSubtypeLocale="fa"
@@ -372,7 +372,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=farsi,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x31cecda3"
             android:imeSubtypeLocale="fi"
@@ -381,7 +381,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x324da12c"
             android:imeSubtypeLocale="fr"
@@ -390,7 +390,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xeadbb691"
             android:imeSubtypeLocale="fr_CA"
@@ -399,7 +399,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xeadc55f5"
             android:imeSubtypeLocale="fr_CH"
@@ -408,7 +408,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=swiss,AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xb939573c"
             android:imeSubtypeLocale="gl_ES"
@@ -417,7 +417,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x39753b7f"
             android:imeSubtypeLocale="hi"
@@ -426,7 +426,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic_compact"
             android:subtypeId="0xe49c89a1"
             android:imeSubtypeLocale="hi"
@@ -438,7 +438,7 @@
     <!-- TODO: This Hinglish keyboard is a preliminary layout.
                This isn't based on the final specification.
                Was disabled because there is no LM yet, and this layout does not offer anything different. -->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_hi_ZZ"
             android:subtypeId="0x352eb37c"
             android:imeSubtypeLocale="hi_ZZ"
@@ -447,7 +447,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x35b7526a"
             android:imeSubtypeLocale="hr"
@@ -456,7 +456,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x35e198ed"
             android:imeSubtypeLocale="hu"
@@ -465,7 +465,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xe39ac3ca"
             android:imeSubtypeLocale="hy_AM"
@@ -475,7 +475,7 @@
             android:isAsciiCapable="false"
     />
     <!-- Java uses the deprecated "in" code instead of the standard "id" code for Indonesian. -->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x7daea460"
             android:imeSubtypeLocale="in"
@@ -484,7 +484,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x7df519e5"
             android:imeSubtypeLocale="is"
@@ -493,7 +493,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x37885a0b"
             android:imeSubtypeLocale="it"
@@ -502,7 +502,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xd914fe1a"
             android:imeSubtypeLocale="it_CH"
@@ -512,7 +512,7 @@
             android:isAsciiCapable="true"
     />
     <!-- Java uses the deprecated "iw" code instead of the standard "he" code for Hebrew. -->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x66fb18bd"
             android:imeSubtypeLocale="iw"
@@ -521,7 +521,7 @@
             android:imeSubtypeExtraValue="SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x6e119e6a"
             android:imeSubtypeLocale="ka_GE"
@@ -530,7 +530,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=georgian,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x2d73d2f6"
             android:imeSubtypeLocale="kk"
@@ -539,7 +539,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x1365683a"
             android:imeSubtypeLocale="km_KH"
@@ -548,7 +548,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=khmer,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8c78064f"
             android:imeSubtypeLocale="kn_IN"
@@ -557,7 +557,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=kannada,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x456d04f2"
             android:imeSubtypeLocale="ko"
@@ -566,7 +566,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=korean,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic_sebeolsik_390"
             android:subtypeId="0xb0bbe261"
             android:imeSubtypeLocale="ko"
@@ -575,7 +575,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=korean_sebeolsik_390,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic_sebeolsik_final"
             android:subtypeId="0xb6774038"
             android:imeSubtypeLocale="ko"
@@ -584,7 +584,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=korean_sebeolsik_final,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x2e391c04"
             android:imeSubtypeLocale="ky"
@@ -593,7 +593,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x6c624c55"
             android:imeSubtypeLocale="lb"
@@ -601,7 +601,7 @@
             android:imeSubtypeMode="keyboard"
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwertz,AsciiCapable,EmojiCapable"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8315772c"
             android:imeSubtypeLocale="lo_LA"
@@ -610,7 +610,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=lao,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8321bb43"
             android:imeSubtypeLocale="lt"
@@ -619,7 +619,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x833dea45"
             android:imeSubtypeLocale="lv"
@@ -628,7 +628,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xaf50ab7c"
             android:imeSubtypeLocale="mk"
@@ -637,7 +637,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=south_slavic,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xc182ebd4"
             android:imeSubtypeLocale="ml_IN"
@@ -646,7 +646,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=malayalam,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xcdcfc3ab"
             android:imeSubtypeLocale="mn_MN"
@@ -655,7 +655,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=mongolian,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x747b9f03"
             android:imeSubtypeLocale="mr_IN"
@@ -664,7 +664,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=marathi,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x84c87c61"
             android:imeSubtypeLocale="ms_MY"
@@ -673,7 +673,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x3f12ee14"
             android:imeSubtypeLocale="nb"
@@ -682,7 +682,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xd80a4cee"
             android:imeSubtypeLocale="ne_NP"
@@ -691,7 +691,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_romanized,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic_traditional"
             android:subtypeId="0x5fafea88"
             android:imeSubtypeLocale="ne_NP"
@@ -700,7 +700,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_traditional,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x3f9fd91e"
             android:imeSubtypeLocale="nl"
@@ -709,7 +709,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x500ca92c"
             android:imeSubtypeLocale="nl_BE"
@@ -718,7 +718,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=azerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x43098a5c"
             android:imeSubtypeLocale="pl"
@@ -727,7 +727,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xcafff4a6"
             android:imeSubtypeLocale="pt_BR"
@@ -736,7 +736,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xe2fffc5a"
             android:imeSubtypeLocale="pt_PT"
@@ -745,7 +745,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8d185978"
             android:imeSubtypeLocale="ro"
@@ -754,7 +754,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x763a8752"
             android:imeSubtypeLocale="ru"
@@ -776,7 +776,7 @@
             android:isAsciiCapable="false"
     />
     -->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8e94d413"
             android:imeSubtypeLocale="sk"
@@ -785,7 +785,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8ea2eb94"
             android:imeSubtypeLocale="sl"
@@ -794,7 +794,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x77c5196e"
             android:imeSubtypeLocale="sr"
@@ -805,7 +805,7 @@
     />
     <!-- TODO: This Serbian Latin keyboard is a preliminary layout.
                This isn't based on the final specification. -->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_sr_ZZ"
             android:subtypeId="0xf4a5569c"
             android:imeSubtypeLocale="sr_ZZ"
@@ -814,7 +814,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=serbian_qwertz,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x48b4ff43"
             android:imeSubtypeLocale="sv"
@@ -823,7 +823,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x8f3dee1f"
             android:imeSubtypeLocale="sw"
@@ -832,7 +832,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x67acea2a"
             android:imeSubtypeLocale="ta_IN"
@@ -853,7 +853,7 @@
             android:isAsciiCapable="false"
     />
     !-->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x785abbd9"
             android:imeSubtypeLocale="ta_SG"
@@ -862,7 +862,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=tamil,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x1e177389"
             android:imeSubtypeLocale="te_IN"
@@ -871,7 +871,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=telugu,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x1f94d5d4"
             android:imeSubtypeLocale="th"
@@ -880,7 +880,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=thai,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xf08285ef"
             android:imeSubtypeLocale="tl"
@@ -889,7 +889,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=spanish,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x4a3179de"
             android:imeSubtypeLocale="tr"
@@ -898,7 +898,7 @@
             android:imeSubtypeExtraValue="AsciiCapable,SupportTouchPositionCorrection,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x3e84492c"
             android:imeSubtypeLocale="uk"
@@ -907,7 +907,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=east_slavic,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x1e8349fc"
             android:imeSubtypeLocale="ur_PK"
@@ -918,7 +918,7 @@
         />
     <!-- TODO: This Uzbek keyboard is a preliminary layout.
                This isn't based on the final specification. -->
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0xad5cf7f6"
             android:imeSubtypeLocale="uz_UZ"
@@ -927,7 +927,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=uzbek,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x93972eee"
             android:imeSubtypeLocale="vi"
@@ -936,7 +936,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_generic"
             android:subtypeId="0x9b13ab76"
             android:imeSubtypeLocale="zu"
@@ -945,7 +945,7 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
             android:isAsciiCapable="true"
     />
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:label="@string/subtype_no_language_qwerty"
             android:subtypeId="0xa239ebad"
             android:imeSubtypeLocale="zz"
diff --git a/app/src/main/res/xml/method_dummy.xml b/app/src/main/res/xml/method_dummy.xml
index 181abd78..16180bf1 100644
--- a/app/src/main/res/xml/method_dummy.xml
+++ b/app/src/main/res/xml/method_dummy.xml
@@ -18,7 +18,7 @@ the system picker crashes on some devices for unknown reasons.
         android:settingsActivity="org.dslul.openboard.inputmethod.latin.settings.SettingsActivity"
         android:isDefault="@bool/im_is_default"
         android:supportsSwitchingToNextInputMethod="true">
-    <subtype android:icon="@drawable/ic_ime_switcher_dark"
+    <subtype android:icon="@drawable/ic_ime_switcher"
             android:imeSubtypeExtraValue="dummy"
             android:imeSubtypeMode="keyboard"
             android:isAsciiCapable="true"