diff --git a/app/src/main/res/drawable/ic_bolt_outline_white_24dp.xml b/app/src/main/res/drawable/ic_bolt_outline_white_24dp.xml
index 9ecde1f..1a91ebc 100644
--- a/app/src/main/res/drawable/ic_bolt_outline_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_bolt_outline_white_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_bolt_white_24dp.xml b/app/src/main/res/drawable/ic_bolt_white_24dp.xml
index 04cf83c..6bd20a0 100644
--- a/app/src/main/res/drawable/ic_bolt_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_bolt_white_24dp.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 11168ed..fdf5cf9 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -13,24 +13,14 @@
     <style name="AppTheme" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/teal_light</item>
         <item name="colorSecondary">@color/teal_light</item> <!-- checkboxes, text fields -->
-        <item name="android:colorBackground">@color/black_900</item> <!-- background -->
-        <item name="android:statusBarColor">@color/black_900</item>
-        <item name="actionModeBackground">@color/black_900</item>
-
         <!-- Action bar background & text color -->
         <item name="colorSurface">@color/black_800b</item>
         <item name="colorOnSurface">@color/white</item>
 
+        <item name="android:colorBackground">?backgroundColor</item> <!-- background -->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="actionModeBackground">?backgroundColor</item>
+
         <item name="switchPreferenceCompatStyle">@style/MaterialSwitch</item>
     </style>
-
-    <style name="DangerText" parent="@android:style/TextAppearance">
-        <item name="android:textColor">@color/red_light</item>
-    </style>
-
-    <style name="FloatingActionButton" parent="@style/Widget.Material3.FloatingActionButton.Primary" />
-
-    <style name="CardView" parent="@style/Widget.Material3.CardView.Elevated" />
-
-    <style name="CardViewBackground" />
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f751b64..c5939b8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,13 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Main app theme; dark theme styles see values-night/styles.xml -->
     <style name="AppTheme" parent="Theme.Material3.DayNight">
         <item name="colorPrimary">@color/teal</item>
         <item name="colorSecondary">@color/teal</item> <!-- checkboxes, text fields -->
         <item name="android:colorBackground">@color/white</item> <!-- background -->
-        <item name="android:statusBarColor">@color/teal</item>
-        <item name="actionModeBackground">@color/teal_dark</item>
+
+        <item name="android:windowLightStatusBar" tools:ignore="NewApi">true</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="actionModeBackground">?colorSecondary</item>
         <item name="switchPreferenceCompatStyle">@style/MaterialSwitch</item>
     </style>