diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
index f259fa8ace..7b94db34f8 100644
--- a/app/src/main/res/menu/menu_folders.xml
+++ b/app/src/main/res/menu/menu_folders.xml
@@ -18,7 +18,9 @@
         <item
             android:id="@+id/menu_theme"
             android:title="@string/title_setup_theme"
-            app:showAsAction="never" />
+            app:showAsAction="never">
+            <menu />
+        </item>
 
         <item
             android:id="@+id/menu_compact"
@@ -50,14 +52,16 @@
     <group android:id="@+id/group_operations">
         <item
             android:id="@+id/menu_search_folder"
-            android:title="@string/title_search"
+            android:title="@string/title_search_folder"
             app:actionViewClass="androidx.appcompat.widget.SearchView"
             app:showAsAction="collapseActionView|never" />
 
         <item
             android:id="@+id/menu_apply_all"
             android:title="@string/title_apply_to_all"
-            app:showAsAction="never" />
+            app:showAsAction="never">
+            <menu />
+        </item>
 
         <item
             android:id="@+id/menu_force_sync"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0685e7f337..6b66477182 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -903,7 +903,8 @@
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_show_flagged">Show starred message count</string>
     <string name="title_subscribed_only">Subscribed only</string>
-    <string name="title_apply_to_all">Apply to all &#8230;</string>
+    <string name="title_search_folder">Search for folder</string>
+    <string name="title_apply_to_all">Apply to all</string>
     <string name="title_hide_folder">Hide folder</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_navigation_folder">Show in navigation menu</string>