diff --git a/app/src/main/res/layout/dialog_folder_select.xml b/app/src/main/res/layout/dialog_folder_select.xml
index 7756b3c85a..e11e831ee6 100644
--- a/app/src/main/res/layout/dialog_folder_select.xml
+++ b/app/src/main/res/layout/dialog_folder_select.xml
@@ -46,7 +46,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="start"
-        android:padding="6dp"
+        android:minHeight="30dp"
+        android:paddingHorizontal="6dp"
+        android:paddingVertical="9dp"
         android:singleLine="true"
         android:text="favorite1"
         android:textColor="?android:attr/textColorPrimary"
@@ -62,7 +64,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="start"
-        android:padding="6dp"
+        android:minHeight="30dp"
+        android:paddingHorizontal="6dp"
+        android:paddingVertical="9dp"
         android:singleLine="true"
         android:text="favorite2"
         android:textColor="?android:attr/textColorPrimary"
@@ -78,7 +82,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:ellipsize="start"
-        android:padding="6dp"
+        android:minHeight="30dp"
+        android:paddingHorizontal="6dp"
+        android:paddingVertical="9dp"
         android:singleLine="true"
         android:text="favorite3"
         android:textColor="?android:attr/textColorPrimary"
@@ -94,8 +100,9 @@
         android:layout_height="wrap_content"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:padding="3dp"
+        app:layout_constraintBottom_toBottomOf="@+id/btnFavorite1"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/tvNoFolder"
+        app:layout_constraintTop_toTopOf="@id/btnFavorite1"
         app:srcCompat="@drawable/twotone_cancel_24" />
 
     <eu.faircode.email.FixedRecyclerView
diff --git a/app/src/main/res/layout/dialog_search.xml b/app/src/main/res/layout/dialog_search.xml
index 23b62904c1..86393b4a73 100644
--- a/app/src/main/res/layout/dialog_search.xml
+++ b/app/src/main/res/layout/dialog_search.xml
@@ -136,7 +136,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:padding="6dp"
+            android:minHeight="30dp"
+            android:paddingHorizontal="6dp"
+            android:paddingVertical="9dp"
             android:singleLine="true"
             android:text="search1"
             android:textColor="?android:attr/textColorPrimary"
@@ -152,7 +154,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:padding="6dp"
+            android:minHeight="30dp"
+            android:paddingHorizontal="6dp"
+            android:paddingVertical="9dp"
             android:singleLine="true"
             android:text="search2"
             android:textColor="?android:attr/textColorPrimary"
@@ -168,7 +172,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:ellipsize="end"
-            android:padding="6dp"
+            android:minHeight="30dp"
+            android:paddingHorizontal="6dp"
+            android:paddingVertical="9dp"
             android:singleLine="true"
             android:text="search3"
             android:textColor="?android:attr/textColorPrimary"
@@ -184,8 +190,9 @@
             android:layout_height="wrap_content"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:padding="3dp"
+            app:layout_constraintBottom_toBottomOf="@+id/btnSearch1"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/etQuery"
+            app:layout_constraintTop_toTopOf="@id/btnSearch1"
             app:srcCompat="@drawable/twotone_cancel_24" />
 
         <eu.faircode.email.FixedTextView