diff --git a/app/src/main/res/layout/dialog_ask_again.xml b/app/src/main/res/layout/dialog_ask_again.xml
index cc44c027f6..12d7797279 100644
--- a/app/src/main/res/layout/dialog_ask_again.xml
+++ b/app/src/main/res/layout/dialog_ask_again.xml
@@ -30,11 +30,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvMessage"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier"
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index c0a22c6425..d19850462a 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -106,11 +106,11 @@
             android:layout_height="24dp"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/title_info"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintBottom_toBottomOf="@id/tvSubjectTitle"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvSubject"
diff --git a/app/src/main/res/layout/dialog_deepl.xml b/app/src/main/res/layout/dialog_deepl.xml
index 4bf99afa91..3b70ec30d5 100644
--- a/app/src/main/res/layout/dialog_deepl.xml
+++ b/app/src/main/res/layout/dialog_deepl.xml
@@ -29,11 +29,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvDeepL"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.EditTextPlain
             android:id="@+id/etKey"
diff --git a/app/src/main/res/layout/dialog_first.xml b/app/src/main/res/layout/dialog_first.xml
index b21f538f5b..b005dd9408 100644
--- a/app/src/main/res/layout/dialog_first.xml
+++ b/app/src/main/res/layout/dialog_first.xml
@@ -63,11 +63,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBattery"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvReformat"
@@ -88,11 +88,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvReformat"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvDesign"
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 0bdb615af8..4a4e09334b 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -41,11 +41,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tvJunkHint"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <CheckBox
             android:id="@+id/cbBlockSender"
@@ -144,11 +144,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/cbJunkFilter"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <CheckBox
             android:id="@+id/cbBlocklist"
@@ -194,11 +194,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/cbBlocklist"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpInJunk"
diff --git a/app/src/main/res/layout/dialog_keyword_manage.xml b/app/src/main/res/layout/dialog_keyword_manage.xml
index 089e8141a8..76fb7cae61 100644
--- a/app/src/main/res/layout/dialog_keyword_manage.xml
+++ b/app/src/main/res/layout/dialog_keyword_manage.xml
@@ -37,13 +37,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         app:backgroundTint="?attr/colorFabBackground"
         app:elevation="0dp"
         app:fabSize="mini"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/twotone_add_24" />
+        app:srcCompat="@drawable/twotone_add_24"
+        app:tint="?attr/colorFabForeground" />
 
     <eu.faircode.email.ContentLoadingProgressBar
         android:id="@+id/pbWait"
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 4907979e9e..650a91831c 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -28,11 +28,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvTitle"
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 9c90159df7..79401ab34a 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -30,11 +30,11 @@
             android:contentDescription="@string/title_info"
             android:padding="6dp"
             android:scaleType="fitCenter"
-            android:tint="?attr/colorAccent"
             android:tooltipText="@string/title_info"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_info_24" />
+            app:srcCompat="@drawable/twotone_info_24"
+            app:tint="?attr/colorAccent" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:id="@+id/ibFlow"
diff --git a/app/src/main/res/layout/dialog_show_images.xml b/app/src/main/res/layout/dialog_show_images.xml
index 0d5f539610..b65b65f66a 100644
--- a/app/src/main/res/layout/dialog_show_images.xml
+++ b/app/src/main/res/layout/dialog_show_images.xml
@@ -24,11 +24,11 @@
             android:id="@+id/ivTracking"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:tint="?attr/colorWarning"
             app:layout_constraintBottom_toBottomOf="@+id/tvTracking"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tvTracking"
-            app:srcCompat="@drawable/twotone_my_location_24" />
+            app:srcCompat="@drawable/twotone_my_location_24"
+            app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvTracking"
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 5512563901..4386448636 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -66,10 +66,10 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_compose"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_edit_24" />
+        app:srcCompat="@drawable/twotone_edit_24"
+        app:tint="?attr/colorFabForeground" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -78,8 +78,8 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_add_24" />
+        app:srcCompat="@drawable/twotone_add_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml
index 191286c7b7..10eae290cf 100644
--- a/app/src/main/res/layout/fragment_answers.xml
+++ b/app/src/main/res/layout/fragment_answers.xml
@@ -49,8 +49,8 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_add_24" />
+        app:srcCompat="@drawable/twotone_add_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_certificates.xml b/app/src/main/res/layout/fragment_certificates.xml
index f7468ded39..b6f9ef7b17 100644
--- a/app/src/main/res/layout/fragment_certificates.xml
+++ b/app/src/main/res/layout/fragment_certificates.xml
@@ -46,8 +46,8 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_add_24" />
+        app:srcCompat="@drawable/twotone_add_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index cc64d74d07..1c400d1f14 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -309,10 +309,10 @@
                     android:layout_marginEnd="6dp"
                     android:background="?attr/selectableItemBackground"
                     android:padding="3dp"
-                    android:tint="?attr/colorSeparator"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/etBody"
-                    app:srcCompat="@drawable/outline_translate_24" />
+                    app:srcCompat="@drawable/outline_translate_24"
+                    app:tint="?attr/colorSeparator" />
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvNoInternet"
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index cb2d9599b0..9b5d8c1441 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -140,10 +140,10 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_create_new_folder_24" />
+        app:srcCompat="@drawable/twotone_create_new_folder_24"
+        app:tint="?attr/colorFabForeground" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabCompose"
@@ -152,10 +152,10 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_compose"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_edit_24" />
+        app:srcCompat="@drawable/twotone_edit_24"
+        app:tint="?attr/colorFabForeground" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabError"
@@ -164,8 +164,8 @@
         android:layout_gravity="center_horizontal|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_compose"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
         app:backgroundTint="?attr/colorWarning"
-        app:srcCompat="@drawable/twotone_warning_24" />
+        app:srcCompat="@drawable/twotone_warning_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml
index 613084e8b5..1817dc248c 100644
--- a/app/src/main/res/layout/fragment_identities.xml
+++ b/app/src/main/res/layout/fragment_identities.xml
@@ -58,8 +58,8 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_add_24" />
+        app:srcCompat="@drawable/twotone_add_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_legend_messages.xml b/app/src/main/res/layout/fragment_legend_messages.xml
index d56afe6cda..033ccecc2e 100644
--- a/app/src/main/res/layout/fragment_legend_messages.xml
+++ b/app/src/main/res/layout/fragment_legend_messages.xml
@@ -40,10 +40,10 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_thread"
             android:padding="12dp"
-            android:tint="?attr/colorAccent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivThread"
-            app:srcCompat="@drawable/twotone_message_24" />
+            app:srcCompat="@drawable/twotone_message_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvBookmark"
@@ -107,10 +107,10 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_auth"
             android:padding="12dp"
-            android:tint="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivDraft"
-            app:srcCompat="@drawable/twotone_flag_24" />
+            app:srcCompat="@drawable/twotone_flag_24"
+            app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvAuth"
@@ -130,10 +130,10 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_priority"
             android:padding="12dp"
-            android:tint="?attr/colorAccent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivAuth"
-            app:srcCompat="@drawable/twotone_priority_high_24" />
+            app:srcCompat="@drawable/twotone_priority_high_24"
+            app:tint="?attr/colorAccent" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvHighPriority"
@@ -373,10 +373,10 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_receipt"
             android:padding="12dp"
-            android:tint="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivPlain"
-            app:srcCompat="@drawable/twotone_playlist_add_check_24" />
+            app:srcCompat="@drawable/twotone_playlist_add_check_24"
+            app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvReceiptType"
@@ -748,10 +748,10 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_tracking_pixel"
             android:padding="12dp"
-            android:tint="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivEmbeddedImage"
-            app:srcCompat="@drawable/twotone_my_location_24" />
+            app:srcCompat="@drawable/twotone_my_location_24"
+            app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvTrackingPixel"
diff --git a/app/src/main/res/layout/fragment_legend_synchronization.xml b/app/src/main/res/layout/fragment_legend_synchronization.xml
index 582bd8fe59..01b6948794 100644
--- a/app/src/main/res/layout/fragment_legend_synchronization.xml
+++ b/app/src/main/res/layout/fragment_legend_synchronization.xml
@@ -293,10 +293,10 @@
             android:layout_height="wrap_content"
             android:contentDescription="@string/title_legend_backoff"
             android:padding="12dp"
-            android:tint="?attr/colorWarning"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/ivBackoff"
-            app:srcCompat="@drawable/twotone_disc_full_24" />
+            app:srcCompat="@drawable/twotone_disc_full_24"
+            app:tint="?attr/colorWarning" />
 
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvQuota"
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 03e85d907c..762fea0427 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -200,11 +200,11 @@
                 android:layout_gravity="end|bottom"
                 android:layout_margin="@dimen/fab_padding"
                 android:contentDescription="@string/title_reply"
-                android:tint="?attr/colorFabForeground"
                 app:backgroundTint="?attr/colorFabBackground"
                 app:layout_constraintBottom_toTopOf="@+id/sbThread"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:srcCompat="@drawable/twotone_reply_24_options" />
+                app:srcCompat="@drawable/twotone_reply_24_options"
+                app:tint="?attr/colorFabForeground" />
 
             <ImageButton
                 android:id="@+id/ibDown"
@@ -213,12 +213,12 @@
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/title_accessibility_scroll_down"
                 android:padding="12dp"
-                android:tint="?attr/colorSeparator"
                 app:layout_constraintBottom_toTopOf="@+id/sbThread"
                 app:layout_constraintEnd_toStartOf="@+id/ibUp"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
-                app:srcCompat="@drawable/twotone_vertical_align_bottom_24" />
+                app:srcCompat="@drawable/twotone_vertical_align_bottom_24"
+                app:tint="?attr/colorSeparator" />
 
             <ImageButton
                 android:id="@+id/ibUp"
@@ -227,12 +227,12 @@
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/title_accessibility_scroll_up"
                 android:padding="12dp"
-                android:tint="?attr/colorSeparator"
                 app:layout_constraintBottom_toTopOf="@+id/sbThread"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toEndOf="@+id/ibDown"
-                app:srcCompat="@drawable/twotone_vertical_align_top_24" />
+                app:srcCompat="@drawable/twotone_vertical_align_top_24"
+                app:tint="?attr/colorSeparator" />
 
             <ImageButton
                 android:id="@+id/ibOutbox"
@@ -241,10 +241,10 @@
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/title_folder_outbox"
                 android:padding="12dp"
-                android:tint="?attr/colorSeparator"
                 app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
                 app:layout_constraintStart_toStartOf="parent"
-                app:srcCompat="@drawable/twotone_schedule_send_24" />
+                app:srcCompat="@drawable/twotone_schedule_send_24"
+                app:tint="?attr/colorSeparator" />
 
             <TextView
                 android:id="@+id/tvOutboxCount"
@@ -265,12 +265,12 @@
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/title_accessibility_filter_out_seen"
                 android:padding="12dp"
-                android:tint="?attr/colorSeparator"
                 app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
                 app:layout_constraintEnd_toStartOf="@id/ibUnflagged"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="parent"
-                app:srcCompat="@drawable/twotone_drafts_24" />
+                app:srcCompat="@drawable/twotone_drafts_24"
+                app:tint="?attr/colorSeparator" />
 
             <ImageButton
                 android:id="@+id/ibUnflagged"
@@ -279,11 +279,11 @@
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/title_accessibility_filter_out_unflagged"
                 android:padding="12dp"
-                android:tint="?attr/colorSeparator"
                 app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
                 app:layout_constraintEnd_toStartOf="@+id/ibSnoozed"
                 app:layout_constraintStart_toEndOf="@id/ibSeen"
-                app:srcCompat="@drawable/baseline_star_24" />
+                app:srcCompat="@drawable/baseline_star_24"
+                app:tint="?attr/colorSeparator" />
 
             <ImageButton
                 android:id="@+id/ibSnoozed"
@@ -292,11 +292,11 @@
                 android:background="?attr/selectableItemBackground"
                 android:contentDescription="@string/title_accessibility_filter_out_snoozed"
                 android:padding="12dp"
-                android:tint="?attr/colorSeparator"
                 app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toEndOf="@id/ibUnflagged"
-                app:srcCompat="@drawable/twotone_timelapse_24" />
+                app:srcCompat="@drawable/twotone_timelapse_24"
+                app:tint="?attr/colorSeparator" />
 
             <SeekBar
                 android:id="@+id/sbThread"
@@ -365,10 +365,10 @@
         android:layout_marginEnd="@dimen/fab_padding"
         android:layout_marginBottom="90dp"
         android:contentDescription="@string/title_more"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_more"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_more_vert_24" />
+        app:srcCompat="@drawable/twotone_more_vert_24"
+        app:tint="?attr/colorFabForeground" />
 
     <TextView
         android:id="@+id/tvSelectedCount"
@@ -391,10 +391,10 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_search_server"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_search_server"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_youtube_searched_for_24" />
+        app:srcCompat="@drawable/twotone_youtube_searched_for_24"
+        app:tint="?attr/colorFabForeground" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabCompose"
@@ -403,10 +403,10 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_compose"
-        android:tint="?attr/colorFabForeground"
-        android:tooltipText="@string/title_compose"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_edit_24" />
+        app:srcCompat="@drawable/twotone_edit_24"
+        app:tint="?attr/colorFabForeground"
+        app:tooltipText="@string/title_compose" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fabError"
@@ -415,8 +415,8 @@
         android:layout_gravity="center_horizontal|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_legend_section_folders"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_compose"
         app:backgroundTint="?attr/colorWarning"
-        app:srcCompat="@drawable/twotone_warning_24" />
+        app:srcCompat="@drawable/twotone_warning_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_options_display.xml b/app/src/main/res/layout/fragment_options_display.xml
index 19b19bdff2..8da9f448e2 100644
--- a/app/src/main/res/layout/fragment_options_display.xml
+++ b/app/src/main/res/layout/fragment_options_display.xml
@@ -1338,11 +1338,11 @@
                     android:layout_width="21dp"
                     android:layout_height="21dp"
                     android:contentDescription="@string/title_legend_auth"
-                    android:tint="?attr/colorWarning"
                     app:layout_constraintBottom_toBottomOf="@+id/swAuthentication"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="@+id/swAuthentication"
-                    app:srcCompat="@drawable/twotone_flag_24" />
+                    app:srcCompat="@drawable/twotone_flag_24"
+                    app:tint="?attr/colorWarning" />
 
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/swAuthentication"
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index 6c0b45e26b..5d75a2d6e2 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -49,8 +49,8 @@
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
         android:contentDescription="@string/title_add"
-        android:tint="?attr/colorFabForeground"
         android:tooltipText="@string/title_add"
         app:backgroundTint="?attr/colorFabBackground"
-        app:srcCompat="@drawable/twotone_add_24" />
+        app:srcCompat="@drawable/twotone_add_24"
+        app:tint="?attr/colorFabForeground" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_setup.xml b/app/src/main/res/layout/fragment_setup.xml
index 00a9bab9a3..30bd4940f6 100644
--- a/app/src/main/res/layout/fragment_setup.xml
+++ b/app/src/main/res/layout/fragment_setup.xml
@@ -150,12 +150,12 @@
                     android:contentDescription="@string/title_setup_help"
                     android:padding="6dp"
                     android:scaleType="fitCenter"
-                    android:tint="?attr/colorAccent"
                     android:tooltipText="@string/title_setup_help"
                     app:layout_constraintBottom_toBottomOf="@id/btnQuick"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="@id/btnQuick"
-                    app:srcCompat="@drawable/twotone_help_24" />
+                    app:srcCompat="@drawable/twotone_help_24"
+                    app:tint="?attr/colorAccent" />
 
                 <Button
                     android:id="@+id/btnQuick"
@@ -211,10 +211,10 @@
                     android:background="?android:attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/title_legend_expander"
                     android:scaleType="centerCrop"
-                    android:tint="?attr/colorAccent"
                     app:layout_constraintStart_toStartOf="@+id/tvManual"
                     app:layout_constraintTop_toBottomOf="@id/tvQuickNew"
-                    app:srcCompat="@drawable/dropdown" />
+                    app:srcCompat="@drawable/dropdown"
+                    app:tint="?attr/colorAccent" />
 
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvManual"
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index e95624eb1c..8fe0ff9d06 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -121,10 +121,10 @@
         android:contentDescription="@string/title_trash"
         android:padding="6dp"
         android:scaleType="fitCenter"
-        android:tint="?attr/colorSeparator"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/wvBody"
-        app:srcCompat="@drawable/twotone_delete_24" />
+        app:srcCompat="@drawable/twotone_delete_24"
+        app:tint="?attr/colorSeparator" />
 
     <ImageButton
         android:id="@+id/ibArchiveBottom"
@@ -135,10 +135,10 @@
         android:contentDescription="@string/title_archive"
         android:padding="6dp"
         android:scaleType="fitCenter"
-        android:tint="?attr/colorSeparator"
         app:layout_constraintStart_toEndOf="@id/ibTrashBottom"
         app:layout_constraintTop_toBottomOf="@id/wvBody"
-        app:srcCompat="@drawable/twotone_archive_24" />
+        app:srcCompat="@drawable/twotone_archive_24"
+        app:tint="?attr/colorSeparator" />
 
     <ImageButton
         android:id="@+id/ibSeenBottom"
@@ -148,11 +148,11 @@
         android:contentDescription="@string/title_toggle_seen"
         android:padding="6dp"
         android:scaleType="fitCenter"
-        android:tint="?attr/colorSeparator"
         android:tooltipText="@string/title_toggle_seen"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/wvBody"
-        app:srcCompat="@drawable/twotone_mail_24" />
+        app:srcCompat="@drawable/twotone_mail_24"
+        app:tint="?attr/colorSeparator" />
 
     <include
         android:id="@+id/InAction"
diff --git a/app/src/main/res/layout/include_message_compact.xml b/app/src/main/res/layout/include_message_compact.xml
index d610311e61..a9af9b7426 100644
--- a/app/src/main/res/layout/include_message_compact.xml
+++ b/app/src/main/res/layout/include_message_compact.xml
@@ -64,11 +64,11 @@
         android:layout_marginStart="6dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_auth"
-        android:tint="?attr/colorWarning"
         app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
-        app:srcCompat="@drawable/twotone_flag_24" />
+        app:srcCompat="@drawable/twotone_flag_24"
+        app:tint="?attr/colorWarning" />
 
     <ImageView
         android:id="@+id/ivPriorityHigh"
@@ -76,11 +76,11 @@
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
         android:contentDescription="@string/title_legend_priority"
-        android:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
         app:layout_constraintStart_toEndOf="@id/ibAuth"
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
-        app:srcCompat="@drawable/twotone_priority_high_24" />
+        app:srcCompat="@drawable/twotone_priority_high_24"
+        app:tint="?attr/colorAccent" />
 
     <ImageView
         android:id="@+id/ivPriorityLow"
@@ -402,10 +402,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:tint="?attr/colorWarning"
         app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
         app:layout_constraintTop_toTopOf="@id/tvError"
-        app:srcCompat="@drawable/twotone_info_24" />
+        app:srcCompat="@drawable/twotone_info_24"
+        app:tint="?attr/colorWarning" />
 
     <View
         android:id="@+id/paddingEnd"
diff --git a/app/src/main/res/layout/include_message_normal.xml b/app/src/main/res/layout/include_message_normal.xml
index 8d37de5def..3039c53f1b 100644
--- a/app/src/main/res/layout/include_message_normal.xml
+++ b/app/src/main/res/layout/include_message_normal.xml
@@ -63,11 +63,11 @@
         android:layout_marginStart="6dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/title_legend_auth"
-        android:tint="?attr/colorWarning"
         app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
         app:layout_constraintStart_toEndOf="@id/ibAvatar"
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
-        app:srcCompat="@drawable/twotone_flag_24" />
+        app:srcCompat="@drawable/twotone_flag_24"
+        app:tint="?attr/colorWarning" />
 
     <ImageView
         android:id="@+id/ivPriorityHigh"
@@ -75,11 +75,11 @@
         android:layout_height="21dp"
         android:layout_marginStart="6dp"
         android:contentDescription="@string/title_legend_priority"
-        android:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="@+id/tvFrom"
         app:layout_constraintStart_toEndOf="@id/ibAuth"
         app:layout_constraintTop_toTopOf="@+id/tvFrom"
-        app:srcCompat="@drawable/twotone_priority_high_24" />
+        app:srcCompat="@drawable/twotone_priority_high_24"
+        app:tint="?attr/colorAccent" />
 
     <ImageView
         android:id="@+id/ivPriorityLow"
@@ -402,10 +402,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="6dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:tint="?attr/colorWarning"
         app:layout_constraintEnd_toStartOf="@+id/paddingEnd"
         app:layout_constraintTop_toTopOf="@id/tvError"
-        app:srcCompat="@drawable/twotone_info_24" />
+        app:srcCompat="@drawable/twotone_info_24"
+        app:tint="?attr/colorWarning" />
 
     <View
         android:id="@+id/paddingEnd"
diff --git a/app/src/main/res/layout/item_nav.xml b/app/src/main/res/layout/item_nav.xml
index bf41aa7391..915452e373 100644
--- a/app/src/main/res/layout/item_nav.xml
+++ b/app/src/main/res/layout/item_nav.xml
@@ -67,10 +67,10 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="12dp"
-            android:tint="?attr/colorWarning"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_warning_24" />
+            app:srcCompat="@drawable/twotone_warning_24"
+            app:tint="?attr/colorWarning" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index a3284c01f9..b9f4d8892d 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/widget"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,7 +16,7 @@
         android:layout_weight="2"
         android:contentDescription="@string/title_legend_count"
         android:src="@drawable/baseline_mail_24"
-        android:tint="@color/colorWidgetForeground" />
+        app:tint="@color/colorWidgetForeground" />
 
     <TextView
         android:id="@+id/tvCount"
diff --git a/app/src/main/res/layout/widget_new.xml b/app/src/main/res/layout/widget_new.xml
index 832c6b625d..1144c0ccc9 100644
--- a/app/src/main/res/layout/widget_new.xml
+++ b/app/src/main/res/layout/widget_new.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/widget"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -15,7 +16,7 @@
         android:padding="3dp"
         android:scaleType="fitXY"
         android:src="@drawable/baseline_mail_widget_24"
-        android:tint="@color/colorWidgetForeground" />
+        app:tint="@color/colorWidgetForeground" />
 
     <TextView
         android:id="@+id/tvCount"
diff --git a/app/src/main/res/layout/widget_sync.xml b/app/src/main/res/layout/widget_sync.xml
index 57f74dae6d..f60e65d87e 100644
--- a/app/src/main/res/layout/widget_sync.xml
+++ b/app/src/main/res/layout/widget_sync.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/widget"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -14,5 +15,5 @@
         android:contentDescription="@string/title_widget_title_sync"
         android:scaleType="fitXY"
         android:src="@drawable/twotone_sync_disabled_24"
-        android:tint="@color/colorWidgetForeground" />
+        app:tint="@color/colorWidgetForeground" />
 </RelativeLayout>