diff --git a/app/src/main/res/layout/dialog_edit_name.xml b/app/src/main/res/layout/dialog_edit_name.xml
index 009ab1e78b..d4b5099590 100644
--- a/app/src/main/res/layout/dialog_edit_name.xml
+++ b/app/src/main/res/layout/dialog_edit_name.xml
@@ -9,7 +9,7 @@
         android:id="@+id/tvName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:labelFor="@+id/etKeyword"
+        android:labelFor="@+id/etName"
         android:text="@string/title_advanced_edit_name"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_nav_options.xml b/app/src/main/res/layout/dialog_nav_options.xml
index fbca6778bd..5a2ddeb3fc 100644
--- a/app/src/main/res/layout/dialog_nav_options.xml
+++ b/app/src/main/res/layout/dialog_nav_options.xml
@@ -27,7 +27,7 @@
             android:id="@+id/ivExpanderNav"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:padding="6dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
@@ -37,7 +37,7 @@
             android:id="@+id/ivPin"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:padding="6dp"
             app:layout_constraintStart_toEndOf="@id/ivExpanderNav"
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
@@ -47,7 +47,7 @@
             android:id="@+id/ivHide"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:padding="6dp"
             app:layout_constraintStart_toEndOf="@id/ivPin"
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
@@ -57,7 +57,7 @@
             android:id="@+id/ivSettings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:padding="6dp"
             app:layout_constraintStart_toEndOf="@id/ivHide"
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
@@ -67,7 +67,7 @@
             android:id="@+id/ivFetchMore"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:padding="6dp"
             app:layout_constraintStart_toEndOf="@id/ivSettings"
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
@@ -77,7 +77,7 @@
             android:id="@+id/ivSync"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:padding="6dp"
             app:layout_constraintStart_toEndOf="@id/ivFetchMore"
             app:layout_constraintTop_toBottomOf="@id/tvTitle"
@@ -97,7 +97,7 @@
             android:id="@+id/tMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="24dp"
             android:text="@string/title_advanced_nav_hide_message"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textStyle="italic"
diff --git a/app/src/main/res/layout/dialog_notes.xml b/app/src/main/res/layout/dialog_notes.xml
index dc61c9eee0..47013b80b5 100644
--- a/app/src/main/res/layout/dialog_notes.xml
+++ b/app/src/main/res/layout/dialog_notes.xml
@@ -17,7 +17,7 @@
             android:drawableStart="@drawable/twotone_sticky_note_2_24"
             android:drawablePadding="6dp"
             android:drawableTint="?android:attr/textColorPrimary"
-            android:labelFor="@+id/etKeyword"
+            android:labelFor="@+id/etNotes"
             android:text="@string/title_edit_notes"
             android:textAppearance="@style/TextAppearance.AppCompat.Large"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_open_link.xml b/app/src/main/res/layout/dialog_open_link.xml
index 5dfea15468..95fd58e2f7 100644
--- a/app/src/main/res/layout/dialog_open_link.xml
+++ b/app/src/main/res/layout/dialog_open_link.xml
@@ -40,7 +40,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:layout_marginEnd="12dp"
-            android:labelFor="@+id/etLink"
             android:maxLines="2"
             android:text="Link title"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
diff --git a/app/src/main/res/layout/dialog_response.xml b/app/src/main/res/layout/dialog_response.xml
index 089c817a59..cf2dafe4f9 100644
--- a/app/src/main/res/layout/dialog_response.xml
+++ b/app/src/main/res/layout/dialog_response.xml
@@ -12,7 +12,7 @@
         android:drawableStart="@drawable/twotone_vpn_key_24"
         android:drawablePadding="6dp"
         android:drawableTint="?android:attr/textColorPrimary"
-        android:labelFor="@+id/etPin"
+        android:labelFor="@+id/etResponse"
         android:text="@string/title_pro_response"
         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 e5164659f1..1e3224c428 100644
--- a/app/src/main/res/layout/dialog_sync.xml
+++ b/app/src/main/res/layout/dialog_sync.xml
@@ -6,28 +6,28 @@
     android:padding="24dp">
 
     <eu.faircode.email.FixedTextView
-        android:id="@+id/tvFolder"
+        android:id="@+id/tvSync"
         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"
+        android:text="@string/title_synchronize_more"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <eu.faircode.email.FixedTextView
-        android:id="@+id/tvSync"
+        android:id="@+id/tvFolder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"
-        android:labelFor="@+id/etKeyword"
-        android:text="@string/title_synchronize_more"
+        android:text="Folder"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+        android:textColor="?android:attr/textColorPrimary"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvFolder" />
+        app:layout_constraintTop_toBottomOf="@id/tvSync" />
 
     <eu.faircode.email.EditTextPlain
         android:id="@+id/etMonths"
@@ -41,7 +41,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         app:layout_constraintEnd_toStartOf="@+id/tvMonths"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvSync">
+        app:layout_constraintTop_toBottomOf="@id/tvFolder">
 
         <requestFocus />
     </eu.faircode.email.EditTextPlain>
diff --git a/app/src/main/res/layout/dialog_translate.xml b/app/src/main/res/layout/dialog_translate.xml
index 3886b19346..e0abc2f543 100644
--- a/app/src/main/res/layout/dialog_translate.xml
+++ b/app/src/main/res/layout/dialog_translate.xml
@@ -18,7 +18,6 @@
             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"
             app:layout_constraintStart_toStartOf="parent"