diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index df3ce4791..7ef23ec35 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -104,7 +104,7 @@
         </activity>
 
         <activity android:name=".settings.SettingsActivity"
-                android:theme="@style/platformSettingsTheme"
+                android:theme="@style/platformActivityTheme"
                 android:label="@string/english_ime_settings"
                 android:exported="true">
             <intent-filter>
@@ -113,7 +113,7 @@
         </activity>
 
         <activity android:name=".spellcheck.SpellCheckerSettingsActivity"
-                  android:theme="@style/platformSettingsTheme"
+                  android:theme="@style/platformActivityTheme"
                   android:label="@string/android_spell_checker_settings"
                 android:exported="true">
             <intent-filter>
diff --git a/app/src/main/res/values-night-v21/platform-themes.xml b/app/src/main/res/values-night-v21/platform-themes.xml
new file mode 100644
index 000000000..dc03640b8
--- /dev/null
+++ b/app/src/main/res/values-night-v21/platform-themes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="platformActivityTheme" parent="@android:style/Theme.Material">
+        <item name="android:colorAccent">@color/highlight_color_lxx_dark</item>
+    </style>
+    <style name="platformDialogTheme" parent="@android:style/Theme.Material.Dialog">
+        <item name="android:colorAccent">@color/highlight_color_lxx_dark</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/platform-theme.xml b/app/src/main/res/values-v21/platform-theme.xml
index 58763fbdd..5e285bce1 100644
--- a/app/src/main/res/values-v21/platform-theme.xml
+++ b/app/src/main/res/values-v21/platform-theme.xml
@@ -19,7 +19,10 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light" />
-    <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault.Settings" />
-    <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog" />
+    <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault.Light">
+        <item name="android:colorAccent">@color/highlight_color_lxx_light</item>
+    </style>
+    <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Light.Dialog">
+        <item name="android:colorAccent">@color/highlight_color_lxx_light</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values-v31/platform-themes.xml b/app/src/main/res/values-v31/platform-themes.xml
new file mode 100644
index 000000000..f99b985a8
--- /dev/null
+++ b/app/src/main/res/values-v31/platform-themes.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="platformActivityTheme" parent="@android:style/Theme.Material" />
+    <style name="platformDialogTheme" parent="@android:style/Theme.Material.Dialog"/>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/platform-theme.xml b/app/src/main/res/values/platform-theme.xml
index 2854ff72f..8e131a2b0 100644
--- a/app/src/main/res/values/platform-theme.xml
+++ b/app/src/main/res/values/platform-theme.xml
@@ -19,7 +19,6 @@
 -->
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
-    <style name="platformActivityTheme" parent="@android:style/Theme.DeviceDefault" />
-    <style name="platformSettingsTheme" parent="@android:style/Theme.DeviceDefault" />
-    <style name="platformDialogTheme" parent="@android:style/Theme.DeviceDefault.Dialog" />
+    <style name="platformActivityTheme" parent="@android:style/Theme.Holo" />
+    <style name="platformDialogTheme" parent="@android:style/Theme.Holo.Dialog" />
 </resources>