diff --git a/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt b/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt
index bb259812c3208ba854274c2ced492bc86f5ff98f..b4cae9640613c805f6cae8c33cabcaa63a1f4d82 100644
--- a/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt
+++ b/app/src/main/java/at/bitfire/davdroid/ui/intro/IntroActivity.kt
@@ -58,7 +58,7 @@ class IntroActivity: AppIntro2() {
                 addSlide(factory.create())
         }
 
-        setBarColor(ResourcesCompat.getColor(resources, R.color.primaryDarkColor, null))
+        setBarColor(ResourcesCompat.getColor(resources, R.color.accentColor, null))
         isSkipButtonEnabled = false
     }
 
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 5a27b18627a5a34421d9d53e486201182178a2b8..7ac779c055651f1c6ec9526c74bf432f3b8f564c 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,36 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress AndroidUnknownAttribute -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
     android:width="108dp"
-    android:height="108dp">
-    <group
-        android:translateX="-213.3939"
-        android:translateY="-709.5244">
-        <group
-            android:scaleX="0.0662553"
-            android:scaleY="0.0662553"
-            android:translateX="233.5464"
-            android:translateY="729.8276">
-            <path
-                android:pathData="M282.78183 280.50711l-85.53115 -85.53116 -0.00001 228.08306 228.08306 0 -85.53115 -85.53114c94.36922 -94.36921 247.75506 -94.36951 342.12458 0.00001 28.79533 28.79533 49.03756 48.10677 59.87183 84.60006l83.25028 0c-12.82982 -57.30603 -41.34018 -96.85969 -86.10134 -141.62083 -126.01589 -126.0159 -330.15022 -126.0159 -456.1661 0zm399.14533 399.14532c-94.36952 94.36952 -247.75535 94.36921 -342.12458 0 -28.79562 -28.79564 -49.03816 -48.10677 -59.8718 -84.60006l-83.25029 0c12.82949 57.30571 41.33988 96.85938 86.10134 141.62083 126.01588 126.0159 330.15021 126.0159 456.1661 0l85.53115 85.53115 0.00001 -228.08305 -228.08307 0z"
-                android:fillColor="@color/accentColor" />
-            <path
-                android:pathData="M201.33878 550.34595l27.70423 0c25.78414 0 44.43649 -13.44067 44.43649 -44.98509 0 -31.54442 -18.65235 -44.16219 -45.80799 -44.16219l-26.33273 0zm23.58974 -18.92666l0 -51.29397 1.3715 0c12.89207 0 23.04114 4.38879 23.04114 25.23554 0 20.84675 -10.14907 26.05843 -23.04114 26.05843z"
-                android:fillColor="@color/accentColor" />
-            <path
-                android:pathData="M311.13854 507.00666c2.1944 -8.50328 4.38879 -19.20096 6.30889 -28.25283l0.5486 0c2.19439 8.91472 4.38879 19.74955 6.58318 28.25283l1.50865 6.17173 -16.45796 0zm-34.28741 43.33929l24.13834 0 4.38879 -18.92666 24.96124 0 4.38878 18.92666 24.96124 0 -27.15563 -89.14728 -28.52713 0z"
-                android:fillColor="@color/accentColor" />
-            <path
-                android:pathData="M380.56703 550.34595l28.52713 0 26.33273 -89.14728 -24.13834 0 -9.05188 38.9505c-2.33154 9.46333 -4.11449 18.65236 -6.58318 28.25283l-0.5486 0c-2.46869 -9.60047 -4.11449 -18.7895 -6.58318 -28.25283l-9.32618 -38.9505 -24.96124 0z"
-                android:fillColor="@color/accentColor" />
-            <path
-                android:pathData="M449.1301 596.08783l39.35586 0 6.19081 -15.47702c2.4321 -6.41191 5.0853 -12.82382 7.51741 -19.01463l0.8844 0c3.3165 6.19081 6.41191 12.82382 9.72841 19.01463l8.84401 15.47702 40.68246 0 -33.16504 -53.06408 31.39624 -57.48608 -39.35586 0 -5.3064 15.47703c-1.98991 6.1908 -4.64311 12.82381 -6.63301 19.01462l-0.8844 0c-2.87431 -6.19081 -5.96971 -12.82382 -8.84402 -19.01462l-7.95961 -15.47703 -40.68245 0 31.39624 53.06408z"
-                android:fillColor="@color/accentColor" />
-            <path
-                android:pathData="M601.43782 509.37229c18.53926 0 34.49164 -11.78465 34.49164 -32.19221 0 -19.25783 -13.50922 -28.16817 -29.3179 -28.16817 -3.01801 0 -5.46117 0.28743 -8.62291 1.43715l1.14972 -13.2218 32.76707 0 0 -20.69499 -54.03691 0 -2.29945 46.85116 10.63493 6.89832c5.46117 -3.44916 7.76062 -4.31145 12.64693 -4.31145 7.18576 0 12.35951 4.02402 12.35951 11.78464 0 8.04806 -4.88632 11.78465 -13.50923 11.78465 -6.6109 0 -12.93437 -3.73659 -18.39554 -8.62291l-10.92236 15.52124c7.47319 7.47319 18.10812 12.93437 33.0545 12.93437z"
-                android:fillColor="@color/accentColor" />
-        </group>
-    </group>
-</vector>
\ No newline at end of file
+    android:height="108dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z" />
+</vector>
diff --git a/app/src/main/res/layout/activity_permissions.xml b/app/src/main/res/layout/activity_permissions.xml
index 4862d54803a312f660383552046ab110826ba849..0bb9b4c8660aebe38907cc93621a43a47d72f303 100644
--- a/app/src/main/res/layout/activity_permissions.xml
+++ b/app/src/main/res/layout/activity_permissions.xml
@@ -25,7 +25,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="@dimen/card_padding">
+                    android:paddingBottom="@dimen/card_padding"
+                    android:background="@color/foregroundColor">
 
                     <at.bitfire.davdroid.ui.widget.CropImageView
                         android:id="@+id/image"
@@ -343,6 +344,7 @@
                         app:layout_constraintTop_toBottomOf="@id/appSettingsHint"
                         app:layout_constraintStart_toStartOf="@id/start"
                         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        android:textColor="@color/primaryTextColor"
                         android:text="@string/permissions_app_settings" />
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_tasks.xml b/app/src/main/res/layout/activity_tasks.xml
index 3a3f0809f5e7182b28015e5465b6c10b0e2e07a0..98ae2209e035843a00e360beb6a1cccdc04f6dc8 100644
--- a/app/src/main/res/layout/activity_tasks.xml
+++ b/app/src/main/res/layout/activity_tasks.xml
@@ -28,7 +28,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/card_padding">
+                    android:layout_marginBottom="@dimen/card_padding"
+                    android:background="@color/foregroundColor">
 
                     <at.bitfire.davdroid.ui.widget.CropImageView
                         android:id="@+id/image"
diff --git a/app/src/main/res/layout/intro_battery_optimizations.xml b/app/src/main/res/layout/intro_battery_optimizations.xml
index 0440ece524b011b640bc5458e1280d4e8e737070..8572e2f5265f2b27b119bfadd97e5701bf8d57b4 100644
--- a/app/src/main/res/layout/intro_battery_optimizations.xml
+++ b/app/src/main/res/layout/intro_battery_optimizations.xml
@@ -22,7 +22,8 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:contentPadding="@dimen/card_padding">
+                app:contentPadding="@dimen/card_padding"
+                android:background="@color/foregroundColor">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -125,6 +126,7 @@
                     <Button
                         android:id="@+id/autostartMoreInfo"
                         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        android:textColor="@color/primaryTextColor"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/intro_more_info"
diff --git a/app/src/main/res/layout/intro_open_source.xml b/app/src/main/res/layout/intro_open_source.xml
index 6fd54788c61faf932c79a20fe28a1866da27358d..f322510d5e0177b78d0ac893836f4b1ec08f6848 100644
--- a/app/src/main/res/layout/intro_open_source.xml
+++ b/app/src/main/res/layout/intro_open_source.xml
@@ -23,7 +23,8 @@
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:background="@color/foregroundColor">
 
                     <at.bitfire.davdroid.ui.widget.CropImageView
                         android:id="@+id/image"
@@ -85,6 +86,7 @@
                         android:layout_marginTop="16dp"
                         android:layout_gravity="center"
                         style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                        android:textColor="@color/primaryTextColor"
                         android:text="@string/intro_open_source_details" />
 
                     <CheckBox
diff --git a/app/src/main/res/layout/intro_welcome.xml b/app/src/main/res/layout/intro_welcome.xml
index adc3c4279e003523b20cd9fc0b6b30c35420784d..88058aa7bda4a692e019de058b26d6fec4a70852 100644
--- a/app/src/main/res/layout/intro_welcome.xml
+++ b/app/src/main/res/layout/intro_welcome.xml
@@ -11,7 +11,7 @@
         android:paddingBottom="@dimen/appintro2_bottombar_height"
         android:orientation="vertical"
         android:gravity="center"
-        android:background="@color/primaryDarkColor">
+        android:background="@color/accentColor">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/logo"
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
deleted file mode 100644
index 63f923248389931ae5484ca779d42943973991e5..0000000000000000000000000000000000000000
--- a/app/src/main/res/values-night/styles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="colorOnPrimary">@android:color/white</color>
-    <color name="colorOnSecondary">@android:color/black</color>
-
-    <color name="primaryTextColor">@android:color/white</color>
-    <color name="secondaryTextColor">@color/grey100</color>
-
-    <color name="backgroundColor">@color/grey800</color>
-    <color name="errorColor">@color/red400</color>
-
-
-</resources>
\ No newline at end of file