diff --git a/app/src/main/res/layout/about_translation.xml b/app/src/main/res/layout/about_translation.xml
index 37687d6cbfb26d3b67c0326d1e290323ad7172d7..b0d85702417d80ccb174e778fc2e8ef9abef49d4 100644
--- a/app/src/main/res/layout/about_translation.xml
+++ b/app/src/main/res/layout/about_translation.xml
@@ -3,14 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:contentPadding="@dimen/card_padding"
     android:layout_marginTop="8dp"
     android:layout_marginBottom="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:padding="@dimen/card_padding"
+        android:background="@color/foregroundColor"
         android:orientation="vertical">
 
         <TextView
diff --git a/app/src/main/res/layout/account_collections.xml b/app/src/main/res/layout/account_collections.xml
index afd4285557affbdfbe2b0bcb51c71ac5b1d4edd5..54defa1acc1e2d63659dcb5f78397ae252316676 100644
--- a/app/src/main/res/layout/account_collections.xml
+++ b/app/src/main/res/layout/account_collections.xml
@@ -32,6 +32,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="@dimen/card_padding"
+                android:background="@color/foregroundColor"
                 android:orientation="horizontal">
                 <TextView
                     android:id="@+id/permissionsText"
@@ -52,6 +53,7 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintBottom_toBottomOf="parent"
                     style="@style/Widget.MaterialComponents.Button.TextButton"
+                    android:textColor="@color/primaryTextColor"
                     android:text="@string/account_permissions_action" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/account_list.xml b/app/src/main/res/layout/account_list.xml
index 18078361a708f05a8c5172225d54666a073ab024..1c5c33bc2c3a4ec868cbf7872f046dafa5bf06e3 100644
--- a/app/src/main/res/layout/account_list.xml
+++ b/app/src/main/res/layout/account_list.xml
@@ -31,6 +31,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:textColor="@color/primaryTextColor"
                 android:text="Manage connections" />
 
         </LinearLayout>
@@ -63,6 +64,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:textColor="@color/primaryTextColor"
                 android:text="Manage storage" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_add_webdav_mount.xml b/app/src/main/res/layout/activity_add_webdav_mount.xml
index 2797006ca5ac4f661f3cdc04b006f7e967f05188..67c0b5dc94de08bf642a310e8842038c26b7e23f 100644
--- a/app/src/main/res/layout/activity_add_webdav_mount.xml
+++ b/app/src/main/res/layout/activity_add_webdav_mount.xml
@@ -119,6 +119,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
+                android:textColor="@color/primaryTextColor"
                 android:text="@string/webdav_add_mount_add" />
 
         </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/activity_debug_info.xml b/app/src/main/res/layout/activity_debug_info.xml
index fd3ab5dc8098ac1296dffad5158f90bff67972d8..ac6abe3b90cb781520d51fc6ec017d8614b010b0 100644
--- a/app/src/main/res/layout/activity_debug_info.xml
+++ b/app/src/main/res/layout/activity_debug_info.xml
@@ -22,6 +22,7 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/backgroundColor"
                     android:layout_margin="@dimen/activity_margin"
                     android:orientation="vertical">
 
@@ -42,7 +43,8 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="@dimen/card_padding">
+                            android:background="@color/foregroundColor"
+                            android:paddingBottom="@dimen/card_padding">
 
                             <androidx.constraintlayout.widget.Guideline
                                 android:id="@+id/zipStart"
@@ -124,6 +126,7 @@
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 style="@style/Widget.MaterialComponents.Button.TextButton"
                                 android:enabled="@{model.debugInfo != null &amp;&amp; !model.zipProgress}"
+                                android:textColor="@color/primaryTextColor"
                                 android:text="@string/debug_info_archive_share" />
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -139,7 +142,8 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="@dimen/card_padding"
+                            android:paddingBottom="@dimen/card_padding"
+                            android:background="@color/foregroundColor"
                             android:orientation="vertical">
 
                             <androidx.constraintlayout.widget.Guideline
@@ -224,6 +228,7 @@
                                 app:layout_constraintLeft_toLeftOf="@id/causeStart"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 style="@style/Widget.MaterialComponents.Button.TextButton"
+                                android:textColor="@color/primaryTextColor"
                                 android:text="@string/debug_info_view_details"/>
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -239,7 +244,8 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="@dimen/card_padding"
+                            android:paddingBottom="@dimen/card_padding"
+                            android:background="@color/foregroundColor"
                             android:orientation="vertical">
 
                             <androidx.constraintlayout.widget.Guideline
@@ -312,6 +318,7 @@
                                 app:layout_constraintLeft_toLeftOf="@id/debugInfoStart"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 style="@style/Widget.MaterialComponents.Button.TextButton"
+                                android:textColor="@color/primaryTextColor"
                                 android:text="@string/debug_info_view_details"/>
 
                         </androidx.constraintlayout.widget.ConstraintLayout>
@@ -327,7 +334,8 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/card_padding">
+                            android:background="@color/foregroundColor"
+                            android:padding="@dimen/card_padding">
 
                             <ImageView
                                 android:id="@+id/resIcon"
@@ -420,7 +428,8 @@
                         <androidx.constraintlayout.widget.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_margin="@dimen/card_padding">
+                            android:background="@color/foregroundColor"
+                            android:padding="@dimen/card_padding">
 
                             <ImageView
                                 android:id="@+id/logsIcon"
@@ -464,6 +473,7 @@
                                 app:layout_constraintLeft_toLeftOf="parent"
                                 app:layout_constraintBottom_toBottomOf="parent"
                                 style="@style/Widget.MaterialComponents.Button.TextButton"
+                                android:textColor="@color/primaryTextColor"
                                 android:text="@string/debug_info_logs_view"/>
 
                         </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 98ae2209e035843a00e360beb6a1cccdc04f6dc8..51730f42e904330527d54261c95f925e3edeaee4 100644
--- a/app/src/main/res/layout/activity_tasks.xml
+++ b/app/src/main/res/layout/activity_tasks.xml
@@ -28,7 +28,7 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/card_padding"
+                    android:paddingBottom="@dimen/card_padding"
                     android:background="@color/foregroundColor">
 
                     <at.bitfire.davdroid.ui.widget.CropImageView
diff --git a/app/src/main/res/layout/intro_battery_optimizations.xml b/app/src/main/res/layout/intro_battery_optimizations.xml
index 8572e2f5265f2b27b119bfadd97e5701bf8d57b4..407a85d4f8287ff207a14806c690f7407d833ce7 100644
--- a/app/src/main/res/layout/intro_battery_optimizations.xml
+++ b/app/src/main/res/layout/intro_battery_optimizations.xml
@@ -22,12 +22,13 @@
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:contentPadding="@dimen/card_padding"
                 android:background="@color/foregroundColor">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:padding="@dimen/card_padding"
+                    android:background="@color/foregroundColor">
 
                     <TextView
                         android:id="@+id/batteryHeading"
@@ -94,12 +95,13 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:visibility="@{model.Companion.manufacturerWarning ? View.VISIBLE : View.GONE}"
-                app:contentPadding="@dimen/card_padding">
+                android:visibility="@{model.Companion.manufacturerWarning ? View.VISIBLE : View.GONE}">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:background="@color/foregroundColor"
+                    android:padding="@dimen/card_padding">
 
                     <TextView
                         android:id="@+id/autostartHeading"
diff --git a/app/src/main/res/layout/webdav_mounts_item.xml b/app/src/main/res/layout/webdav_mounts_item.xml
index 627b2105d765feea2b54712d5046f4af5fee0ed2..5e41d3ee5437a053f920ff34fcda7fdda17a6355 100644
--- a/app/src/main/res/layout/webdav_mounts_item.xml
+++ b/app/src/main/res/layout/webdav_mounts_item.xml
@@ -66,6 +66,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 style="@style/Widget.MaterialComponents.Button.TextButton"
+                android:textColor="@color/primaryTextColor"
                 android:text="@string/webdav_mounts_share_content" />
 
             <ImageButton