diff --git a/app/src/main/res/layout/activity_clear.xml b/app/src/main/res/layout/activity_clear.xml
index 7adb391ed4..b7e0a06041 100644
--- a/app/src/main/res/layout/activity_clear.xml
+++ b/app/src/main/res/layout/activity_clear.xml
@@ -43,7 +43,7 @@
                         android:layout_height="wrap_content"
                         android:drawableStart="@drawable/twotone_warning_24"
                         android:drawablePadding="6dp"
-                        android:drawableTint="?attr/colorError"
+                        android:drawableTint="?attr/colorWarning"
                         android:text="@string/title_advanced_clear_all"
                         android:textAppearance="@style/TextAppearance.AppCompat.Large"
                         android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 181427f7c0..6ebfeb9334 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -43,7 +43,7 @@
                         android:layout_height="wrap_content"
                         android:drawableStart="@drawable/twotone_warning_24"
                         android:drawablePadding="6dp"
-                        android:drawableTint="?attr/colorError"
+                        android:drawableTint="?attr/colorWarning"
                         android:text="Error"
                         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                         android:textColor="?android:attr/textColorPrimary"
@@ -60,7 +60,7 @@
                         android:autoLink="email|web"
                         android:text="Error"
                         android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                        android:textColor="?attr/colorError"
+                        android:textColor="?attr/colorWarning"
                         android:textIsSelectable="true"
                         android:textStyle="bold"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_boundary_error.xml b/app/src/main/res/layout/dialog_boundary_error.xml
index 1f442a43cf..0202134a2e 100644
--- a/app/src/main/res/layout/dialog_boundary_error.xml
+++ b/app/src/main/res/layout/dialog_boundary_error.xml
@@ -27,7 +27,7 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="12dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="Error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 6336ded07a..19811a23ff 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -29,10 +29,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_setup_quick_no_sent"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvMessage" />
@@ -56,10 +56,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="Invalid address"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnFixSent" />
@@ -71,10 +71,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_dsn_reminder"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvAddressError" />
@@ -86,10 +86,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_size_reminder"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindDsn" />
@@ -101,10 +101,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_pgp_reminder"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindSize" />
@@ -116,10 +116,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_smime_reminder"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindPgp" />
@@ -131,10 +131,10 @@
             android:layout_marginTop="12dp"
             android:drawableStart="@drawable/twotone_warning_24"
             android:drawablePadding="6dp"
-            android:drawableTint="?attr/colorError"
+            android:drawableTint="?attr/colorWarning"
             android:text="@string/title_to_missing"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
-            android:textColor="?attr/colorError"
+            android:textColor="?attr/colorWarning"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvRemindSmime" />
diff --git a/app/src/main/res/layout/fragment_options_connection.xml b/app/src/main/res/layout/fragment_options_connection.xml
index 0f0706d8e4..8123fc681e 100644
--- a/app/src/main/res/layout/fragment_options_connection.xml
+++ b/app/src/main/res/layout/fragment_options_connection.xml
@@ -521,7 +521,7 @@
                     android:drawableStart="@drawable/twotone_warning_24"
                     android:drawableEnd="@drawable/twotone_warning_24"
                     android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorError"
+                    android:drawableTint="?attr/colorWarning"
                     android:gravity="center"
                     android:text="@string/title_advanced_caption_debug"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/fragment_options_encryption.xml b/app/src/main/res/layout/fragment_options_encryption.xml
index 686f4148eb..059727d8b8 100644
--- a/app/src/main/res/layout/fragment_options_encryption.xml
+++ b/app/src/main/res/layout/fragment_options_encryption.xml
@@ -430,7 +430,7 @@
                     android:drawableStart="@drawable/twotone_warning_24"
                     android:drawableEnd="@drawable/twotone_warning_24"
                     android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorError"
+                    android:drawableTint="?attr/colorWarning"
                     android:gravity="center"
                     android:text="@string/title_advanced_caption_debug"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 2e33db9b60..9a8d289fcc 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -659,7 +659,7 @@
                     android:drawableStart="@drawable/twotone_warning_24"
                     android:drawableEnd="@drawable/twotone_warning_24"
                     android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorError"
+                    android:drawableTint="?attr/colorWarning"
                     android:gravity="center"
                     android:text="@string/title_advanced_caption_debug"
                     android:textAppearance="@style/TextAppearance.AppCompat.Large"
@@ -711,7 +711,7 @@
                     android:layout_marginTop="12dp"
                     android:drawableStart="@drawable/twotone_warning_24"
                     android:drawablePadding="6dp"
-                    android:drawableTint="?attr/colorError"
+                    android:drawableTint="?attr/colorWarning"
                     android:text="@string/title_advanced_external_storage"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"