diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index ab8a4c5447..e6b76d5884 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -631,6 +631,7 @@ public class FragmentAccount extends FragmentBase {
 
         // Initialize
         Helper.setViewsEnabled(view, false);
+        FragmentDialogTheme.setBackground(getContext(), view, false);
 
         tvGmailHint.setVisibility(View.GONE);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 888cfd2c4a..6d10c8549a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -575,6 +575,7 @@ public class FragmentIdentity extends FragmentBase {
 
         // Initialize
         Helper.setViewsEnabled(view, false);
+        FragmentDialogTheme.setBackground(getContext(), view, false);
 
         btnAutoConfig.setEnabled(false);
         pbAutoConfig.setVisibility(View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java
index 98a43a95c7..650fb1f3a7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentPop.java
+++ b/app/src/main/java/eu/faircode/email/FragmentPop.java
@@ -363,6 +363,7 @@ public class FragmentPop extends FragmentBase {
 
         // Initialize
         Helper.setViewsEnabled(view, false);
+        FragmentDialogTheme.setBackground(getContext(), view, false);
 
         if (!SSLHelper.customTrustManager()) {
             Helper.hide(cbInsecure);
diff --git a/app/src/main/res/color/background_warning.xml b/app/src/main/res/color/background_warning.xml
index d609ab583b..836888b22e 100644
--- a/app/src/main/res/color/background_warning.xml
+++ b/app/src/main/res/color/background_warning.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.15" android:color="?attr/colorWarning" />
+    <item android:alpha="0.1" android:color="?attr/colorWarning" />
 </selector>
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index bdccd13609..5a2f453f3f 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -111,7 +111,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="3dp"
             android:layout_marginTop="24dp"
-            app:cardBackgroundColor="@color/background_warning"
+            app:cardBackgroundColor="?attr/colorCardBackground"
             app:cardCornerRadius="6dp"
             app:cardElevation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -121,7 +121,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="6dp"
+                android:paddingHorizontal="12dp"
                 android:paddingVertical="12dp">
 
                 <TextView
@@ -130,6 +130,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/title_imap"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="?android:textColorPrimary"
+                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 2e5cdf4b1c..a5af7ff2ff 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -261,7 +261,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="3dp"
             android:layout_marginTop="24dp"
-            app:cardBackgroundColor="@color/background_warning"
+            app:cardBackgroundColor="?attr/colorCardBackground"
             app:cardCornerRadius="6dp"
             app:cardElevation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -271,7 +271,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="6dp"
+                android:paddingHorizontal="12dp"
                 android:paddingVertical="12dp">
 
                 <TextView
@@ -280,6 +280,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/title_smtp"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="?android:textColorPrimary"
+                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/layout/fragment_pop.xml b/app/src/main/res/layout/fragment_pop.xml
index e7f28f390c..86c447de7f 100644
--- a/app/src/main/res/layout/fragment_pop.xml
+++ b/app/src/main/res/layout/fragment_pop.xml
@@ -54,7 +54,7 @@
             android:layout_height="wrap_content"
             android:layout_marginHorizontal="3dp"
             android:layout_marginTop="24dp"
-            app:cardBackgroundColor="@color/background_warning"
+            app:cardBackgroundColor="?attr/colorCardBackground"
             app:cardCornerRadius="6dp"
             app:cardElevation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -64,7 +64,7 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingHorizontal="6dp"
+                android:paddingHorizontal="12dp"
                 android:paddingVertical="12dp">
 
                 <TextView
@@ -73,6 +73,8 @@
                     android:layout_height="wrap_content"
                     android:text="@string/title_pop3"
                     android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                    android:textColor="?android:textColorPrimary"
+                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />