diff --git a/app/src/main/res/drawable/twotone_vpn_key_24.xml b/app/src/main/res/drawable/twotone_vpn_key_24.xml
new file mode 100644
index 0000000000..9913dd7980
--- /dev/null
+++ b/app/src/main/res/drawable/twotone_vpn_key_24.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M11.71,10.33C11.01,8.34 9.11,7 7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5c2.11,0 4.01,-1.34 4.71,-3.33l0.23,-0.67H18v4h2v-4h2v-2H11.94l-0.23,-0.67zM7,15c-1.65,0 -3,-1.35 -3,-3s1.35,-3 3,-3 3,1.35 3,3 -1.35,3 -3,3z"
+      android:strokeAlpha="0.3"
+      android:fillAlpha="0.3"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7,5c-3.86,0 -7,3.14 -7,7s3.14,7 7,7c2.72,0 5.17,-1.58 6.32,-4L16,15v4h6v-4h2L24,9L13.32,9C12.17,6.58 9.72,5 7,5zM22,13h-2v4h-2v-4h-6.06l-0.23,0.67C11.01,15.66 9.11,17 7,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5c2.11,0 4.01,1.34 4.71,3.33l0.23,0.67L22,11v2zM7,9c-1.65,0 -3,1.35 -3,3s1.35,3 3,3 3,-1.35 3,-3 -1.35,-3 -3,-3zM7,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_advanced.xml b/app/src/main/res/layout/dialog_advanced.xml
index f0125e5e11..31678a1b44 100644
--- a/app/src/main/res/layout/dialog_advanced.xml
+++ b/app/src/main/res/layout/dialog_advanced.xml
@@ -16,23 +16,17 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="6dp"
+            android:drawableStart="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_advanced_hint_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
             android:textStyle="bold"
-            app:layout_constraintEnd_toStartOf="@id/ivInfo"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-            android:id="@+id/ivInfo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:contentDescription="@string/title_info"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/twotone_info_24" />
-
         <eu.faircode.email.FixedTextView
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_boundary_error.xml b/app/src/main/res/layout/dialog_boundary_error.xml
index 6150c28039..1f442a43cf 100644
--- a/app/src/main/res/layout/dialog_boundary_error.xml
+++ b/app/src/main/res/layout/dialog_boundary_error.xml
@@ -25,6 +25,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
+            android:drawableStart="@drawable/twotone_warning_24"
+            android:drawablePadding="12dp"
+            android:drawableTint="?attr/colorError"
             android:text="Error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_certificate.xml b/app/src/main/res/layout/dialog_certificate.xml
index d19850462a..b174599fd6 100644
--- a/app/src/main/res/layout/dialog_certificate.xml
+++ b/app/src/main/res/layout/dialog_certificate.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_gesture_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_signature_valid"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_contact_group.xml b/app/src/main/res/layout/dialog_contact_group.xml
index d1bf76e7f9..39634ec3c9 100644
--- a/app/src/main/res/layout/dialog_contact_group.xml
+++ b/app/src/main/res/layout/dialog_contact_group.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvGroup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_people_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:text="@string/title_insert_contact_group"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_deepl.xml b/app/src/main/res/layout/dialog_deepl.xml
index 3b70ec30d5..f7a764c4ad 100644
--- a/app/src/main/res/layout/dialog_deepl.xml
+++ b/app/src/main/res/layout/dialog_deepl.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvDeepL"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_translate_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:labelFor="@+id/etKey"
             android:text="DeepL"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_delete_operations.xml b/app/src/main/res/layout/dialog_delete_operations.xml
index 33fbd3c44c..5ad4c7fab0 100644
--- a/app/src/main/res/layout/dialog_delete_operations.xml
+++ b/app/src/main/res/layout/dialog_delete_operations.xml
@@ -9,7 +9,7 @@
         android:id="@+id/tvAddImage"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableStart="@drawable/twotone_warning_24"
+        android:drawableStart="@drawable/twotone_delete_24"
         android:drawablePadding="12dp"
         android:drawableTint="?attr/colorError"
         android:text="@string/title_delete_operation_title"
diff --git a/app/src/main/res/layout/dialog_error_reporting.xml b/app/src/main/res/layout/dialog_error_reporting.xml
index 40144fd200..ed5fa8054a 100644
--- a/app/src/main/res/layout/dialog_error_reporting.xml
+++ b/app/src/main/res/layout/dialog_error_reporting.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_bug_report_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_ask_reporting"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_export.xml b/app/src/main/res/layout/dialog_export.xml
index aa79404586..4c1a41a440 100644
--- a/app/src/main/res/layout/dialog_export.xml
+++ b/app/src/main/res/layout/dialog_export.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_archive_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_setup_export"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_first.xml b/app/src/main/res/layout/dialog_first.xml
index b005dd9408..c1039ab2fb 100644
--- a/app/src/main/res/layout/dialog_first.xml
+++ b/app/src/main/res/layout/dialog_first.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvImportant"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_info_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_hint_important"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_folder_all.xml b/app/src/main/res/layout/dialog_folder_all.xml
index 5c94a19e51..e30156028a 100644
--- a/app/src/main/res/layout/dialog_folder_all.xml
+++ b/app/src/main/res/layout/dialog_folder_all.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_save_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_apply_to_all"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_forward_raw.xml b/app/src/main/res/layout/dialog_forward_raw.xml
index 7726af5a1b..b18f9a54e4 100644
--- a/app/src/main/res/layout/dialog_forward_raw.xml
+++ b/app/src/main/res/layout/dialog_forward_raw.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_attachment_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_raw_send"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_identity.xml b/app/src/main/res/layout/dialog_identity.xml
index d5583069ba..8c1720e766 100644
--- a/app/src/main/res/layout/dialog_identity.xml
+++ b/app/src/main/res/layout/dialog_identity.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvIdentity"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_send_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_send_via"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_import.xml b/app/src/main/res/layout/dialog_import.xml
index 8ceccbc8ab..a70a84835c 100644
--- a/app/src/main/res/layout/dialog_import.xml
+++ b/app/src/main/res/layout/dialog_import.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_unarchive_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_setup_import"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_insert_link.xml b/app/src/main/res/layout/dialog_insert_link.xml
index 370f7c7149..fcb4846355 100644
--- a/app/src/main/res/layout/dialog_insert_link.xml
+++ b/app/src/main/res/layout/dialog_insert_link.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvInsertLink"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_insert_link_45_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:labelFor="@+id/etLink"
         android:text="@string/title_style_link"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_junk.xml b/app/src/main/res/layout/dialog_junk.xml
index 9c7c083d44..fdf4acf5b9 100644
--- a/app/src/main/res/layout/dialog_junk.xml
+++ b/app/src/main/res/layout/dialog_junk.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_warning_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_ask_spam_who"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_keyword_add.xml b/app/src/main/res/layout/dialog_keyword_add.xml
index 9de53af157..1016a7092d 100644
--- a/app/src/main/res/layout/dialog_keyword_add.xml
+++ b/app/src/main/res/layout/dialog_keyword_add.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvKeyword"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_label_important_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:labelFor="@+id/etKeyword"
         android:text="@string/title_add_keyword"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_nav_options.xml b/app/src/main/res/layout/dialog_nav_options.xml
index f74d611345..fbca6778bd 100644
--- a/app/src/main/res/layout/dialog_nav_options.xml
+++ b/app/src/main/res/layout/dialog_nav_options.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_visibility_off_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_advanced_nav_hide_title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_notes.xml b/app/src/main/res/layout/dialog_notes.xml
index 727ee9cb61..dc61c9eee0 100644
--- a/app/src/main/res/layout/dialog_notes.xml
+++ b/app/src/main/res/layout/dialog_notes.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvNotes"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_sticky_note_2_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:labelFor="@+id/etKeyword"
             android:text="@string/title_edit_notes"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_pin_ask.xml b/app/src/main/res/layout/dialog_pin_ask.xml
index 799d1c42dc..7ba5f4aa4f 100644
--- a/app/src/main/res/layout/dialog_pin_ask.xml
+++ b/app/src/main/res/layout/dialog_pin_ask.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_pin_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:labelFor="@+id/etPin"
         android:text="@string/app_name"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_pin_set.xml b/app/src/main/res/layout/dialog_pin_set.xml
index 4c63796462..2aa667a12e 100644
--- a/app/src/main/res/layout/dialog_pin_set.xml
+++ b/app/src/main/res/layout/dialog_pin_set.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_pin_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:labelFor="@+id/etPin"
         android:text="@string/title_advanced_pin"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_print.xml b/app/src/main/res/layout/dialog_print.xml
index 9c812937c7..5e1d72ad22 100644
--- a/app/src/main/res/layout/dialog_print.xml
+++ b/app/src/main/res/layout/dialog_print.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_print_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_print"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             android:textColor="?android:attr/textColorPrimary"
@@ -24,7 +27,7 @@
             android:id="@+id/tvHtmlRemark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
+            android:layout_marginTop="12dp"
             android:text="@string/title_ask_show_html"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
diff --git a/app/src/main/res/layout/dialog_response.xml b/app/src/main/res/layout/dialog_response.xml
index c9cccf46ec..089c817a59 100644
--- a/app/src/main/res/layout/dialog_response.xml
+++ b/app/src/main/res/layout/dialog_response.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvCaption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_vpn_key_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:labelFor="@+id/etPin"
         android:text="@string/title_pro_response"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_review.xml b/app/src/main/res/layout/dialog_review.xml
index 34d4d2ebc7..1d9bc2691f 100644
--- a/app/src/main/res/layout/dialog_review.xml
+++ b/app/src/main/res/layout/dialog_review.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_star_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_ask_review"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             android:textColor="?android:attr/textColorPrimary"
diff --git a/app/src/main/res/layout/dialog_review_account.xml b/app/src/main/res/layout/dialog_review_account.xml
index 8348a8a2fe..f6ed796e57 100644
--- a/app/src/main/res/layout/dialog_review_account.xml
+++ b/app/src/main/res/layout/dialog_review_account.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvName"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_account_circle_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="Name"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index b0d746d506..ffde45d22d 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -16,6 +16,9 @@
             android:id="@+id/tvCaption"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_search_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_search"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintEnd_toStartOf="@+id/ibInfo"
diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index e6461974b1..603a5ae382 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_send_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_send"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_setup.xml b/app/src/main/res/layout/dialog_setup.xml
index 4130003477..18f969831b 100644
--- a/app/src/main/res/layout/dialog_setup.xml
+++ b/app/src/main/res/layout/dialog_setup.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_settings_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_setup_still"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_swipes.xml b/app/src/main/res/layout/dialog_swipes.xml
index 4e0908e54e..c984a3b09a 100644
--- a/app/src/main/res/layout/dialog_swipes.xml
+++ b/app/src/main/res/layout/dialog_swipes.xml
@@ -14,6 +14,9 @@
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_swipe_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_advanced_swipe_actions"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_sync.xml b/app/src/main/res/layout/dialog_sync.xml
index 8ce99d2579..e5164659f1 100644
--- a/app/src/main/res/layout/dialog_sync.xml
+++ b/app/src/main/res/layout/dialog_sync.xml
@@ -9,6 +9,9 @@
         android:id="@+id/tvFolder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:drawableStart="@drawable/twotone_save_alt_24"
+        android:drawablePadding="6dp"
+        android:drawableTint="?android:attr/textColorPrimary"
         android:labelFor="@+id/etKeyword"
         android:text="Folder"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index 47cc819f03..06a8920b2e 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvCaption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_palette_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:text="@string/title_setup_theme"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_translate.xml b/app/src/main/res/layout/dialog_translate.xml
index 80a4067ca2..3886b19346 100644
--- a/app/src/main/res/layout/dialog_translate.xml
+++ b/app/src/main/res/layout/dialog_translate.xml
@@ -15,6 +15,9 @@
             android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/twotone_translate_24"
+            android:drawablePadding="6dp"
+            android:drawableTint="?android:attr/textColorPrimary"
             android:labelFor="@+id/etKeyword"
             android:text="@string/title_translate_tap"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
diff --git a/app/src/main/res/layout/include_nav.xml b/app/src/main/res/layout/include_nav.xml
index 766615ccd6..110dfc3472 100644
--- a/app/src/main/res/layout/include_nav.xml
+++ b/app/src/main/res/layout/include_nav.xml
@@ -69,7 +69,7 @@
         app:layout_constraintEnd_toStartOf="@+id/ibForceSync"
         app:layout_constraintStart_toEndOf="@id/ibSettings"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/twotone_get_app_24" />
+        app:srcCompat="@drawable/twotone_save_alt_24" />
 
     <ImageButton
         android:id="@+id/ibForceSync"