diff --git a/app/src/main/java/eu/faircode/email/ToastEx.java b/app/src/main/java/eu/faircode/email/ToastEx.java
index 00dcd80122..45bfd25934 100644
--- a/app/src/main/java/eu/faircode/email/ToastEx.java
+++ b/app/src/main/java/eu/faircode/email/ToastEx.java
@@ -24,7 +24,7 @@ public class ToastEx extends Toast {
         view.setBackground(context.getResources().getDrawable(R.drawable.toast_background, context.getTheme()));
 
         TextView tv = view.findViewById(android.R.id.message);
-        tv.setTextColor(Helper.resolveColor(context, R.attr.colorToastForeground));
+        tv.setTextColor(Helper.resolveColor(context, R.attr.colorInfoForeground));
         tv.setText(text);
         toast.setView(view);
         toast.setDuration(duration);
diff --git a/app/src/main/res/drawable/toast_background.xml b/app/src/main/res/drawable/toast_background.xml
index 0550e2714d..e62fcec14d 100644
--- a/app/src/main/res/drawable/toast_background.xml
+++ b/app/src/main/res/drawable/toast_background.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <corners android:radius="12dp" />
-    <solid android:color="?attr/colorToastBackground" />
+    <solid android:color="?attr/colorInfoBackground" />
 </shape>
diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 68b60df1eb..e44298dab7 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -843,9 +843,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/title_setup_help"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTrust" />
@@ -855,9 +855,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/menu_faq"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTrust" />
diff --git a/app/src/main/res/layout/fragment_gmail.xml b/app/src/main/res/layout/fragment_gmail.xml
index 05f2835f13..ed48e4c1c6 100644
--- a/app/src/main/res/layout/fragment_gmail.xml
+++ b/app/src/main/res/layout/fragment_gmail.xml
@@ -133,9 +133,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/menu_faq"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDraftsHint" />
diff --git a/app/src/main/res/layout/fragment_identity.xml b/app/src/main/res/layout/fragment_identity.xml
index 487d17c9bc..964e4085d8 100644
--- a/app/src/main/res/layout/fragment_identity.xml
+++ b/app/src/main/res/layout/fragment_identity.xml
@@ -646,9 +646,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/title_setup_help"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTrust" />
@@ -658,9 +658,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/menu_faq"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbTrust" />
diff --git a/app/src/main/res/layout/fragment_oauth.xml b/app/src/main/res/layout/fragment_oauth.xml
index d0da94db2d..c6dd9efd53 100644
--- a/app/src/main/res/layout/fragment_oauth.xml
+++ b/app/src/main/res/layout/fragment_oauth.xml
@@ -108,9 +108,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/menu_faq"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvGmailDraftsHint" />
diff --git a/app/src/main/res/layout/fragment_quick_setup.xml b/app/src/main/res/layout/fragment_quick_setup.xml
index eac7f0bd0e..3acc4c4e76 100644
--- a/app/src/main/res/layout/fragment_quick_setup.xml
+++ b/app/src/main/res/layout/fragment_quick_setup.xml
@@ -121,9 +121,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/title_setup_help"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
@@ -133,9 +133,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorAccent"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:text="@string/menu_faq"
-            android:textColor="@android:color/black"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index e0b290fc3c..4adf59e39c 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -85,11 +85,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorInfoBackground"
             android:minWidth="0dp"
             android:minHeight="0dp"
             android:text="@string/title_setup_help"
-            android:textColor="@android:color/white"
+            android:textColor="?attr/colorInfoForeground"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvQuick" />
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
index 260b7c1ab8..5e14d109a0 100644
--- a/app/src/main/res/layout/item_account.xml
+++ b/app/src/main/res/layout/item_account.xml
@@ -207,11 +207,11 @@
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:backgroundTint="?attr/colorAccent"
+                android:backgroundTint="?attr/colorInfoBackground"
                 android:minWidth="0dp"
                 android:minHeight="0dp"
                 android:text="@string/title_setup_help"
-                android:textColor="@android:color/black"
+                android:textColor="?attr/colorInfoForeground"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvError" />
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index dbcf7d48c7..b9b62f0429 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -245,11 +245,11 @@
                 style="?android:attr/buttonStyleSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:backgroundTint="?attr/colorAccent"
+                android:backgroundTint="?attr/colorInfoBackground"
                 android:minWidth="0dp"
                 android:minHeight="0dp"
                 android:text="@string/title_setup_help"
-                android:textColor="@android:color/black"
+                android:textColor="?attr/colorInfoForeground"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvError" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e4e62dc965..7b6e22d8b8 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,8 +15,8 @@
     <attr name="colorActionBackground" format="reference" />
     <attr name="colorFabForeground" format="reference" />
     <attr name="colorFabBackground" format="reference" />
-    <attr name="colorToastForeground" format="reference" />
-    <attr name="colorToastBackground" format="reference" />
+    <attr name="colorInfoForeground" format="reference" />
+    <attr name="colorInfoBackground" format="reference" />
     <attr name="activatableItemBackground" format="reference" />
 
     <style name="AppThemeBaseLight" parent="Base.Theme.AppCompat.Light.DarkActionBar">
@@ -108,8 +108,8 @@
 
         <item name="colorFabBackground">@color/colorAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/colorPrimaryDark</item>
+        <item name="colorInfoForeground">@color/black</item>
+        <item name="colorInfoBackground">@color/colorAccent</item>
 
         <item name="android:textColorLink">@color/colorAccentDark</item>
     </style>
@@ -123,8 +123,8 @@
 
         <item name="colorFabBackground">@color/lightPurpleAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/lightPurpleAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/lightPurpleAccent</item>
 
         <item name="android:textColorLink">@color/lightPurpleAccent</item>
     </style>
@@ -138,8 +138,8 @@
 
         <item name="colorFabBackground">@color/lightGreenAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/lightGreenAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/lightGreenAccent</item>
 
         <item name="android:textColorLink">@color/lightGreenAccent</item>
     </style>
@@ -155,8 +155,8 @@
 
         <item name="colorFabBackground">@color/colorAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/darkColorPrimary</item>
+        <item name="colorInfoForeground">@color/black</item>
+        <item name="colorInfoBackground">@color/colorAccent</item>
     </style>
 
     <style name="AppThemeYellowPurpleDark" parent="AppThemeBaseDark">
@@ -168,8 +168,8 @@
 
         <item name="colorFabBackground">@color/darkPurpleAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/darkPurpleAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/darkPurpleAccent</item>
 
         <item name="android:textColorLink">@color/darkPurpleAccent</item>
     </style>
@@ -183,8 +183,8 @@
 
         <item name="colorFabBackground">@color/darkGreenAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/darkGreenAccent</item>
+        <item name="colorInfoForeground">@color/black</item>
+        <item name="colorInfoBackground">@color/darkGreenAccent</item>
 
         <item name="android:textColorLink">@color/darkGreenAccent</item>
     </style>
@@ -209,8 +209,8 @@
 
         <item name="colorFabBackground">@color/greyAccent</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/greyAccent</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/greyAccent</item>
     </style>
 
     <style name="AppThemeGreySteelBlueDark" parent="AppThemeBlack">
@@ -225,8 +225,8 @@
 
         <item name="colorFabBackground">@color/greyAccentDark</item>
 
-        <item name="colorToastForeground">@color/white</item>
-        <item name="colorToastBackground">@color/greyAccentDark</item>
+        <item name="colorInfoForeground">@color/white</item>
+        <item name="colorInfoBackground">@color/greyAccentDark</item>
     </style>
 
     <style name="Theme.AppCompat.Translucent" parent="Theme.AppCompat.NoActionBar">