diff --git a/app/src/main/res/menu/cab_directories.xml b/app/src/main/res/menu/cab_directories.xml
index dcf7f9c41..08d7fcf58 100644
--- a/app/src/main/res/menu/cab_directories.xml
+++ b/app/src/main/res/menu/cab_directories.xml
@@ -3,6 +3,26 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="AppCompatResource">
+    <item
+        android:id="@+id/cab_delete"
+        android:icon="@drawable/ic_delete_vector"
+        android:title="@string/delete"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_properties"
+        android:icon="@drawable/ic_info_vector"
+        android:title="@string/properties"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_pin"
+        android:icon="@drawable/ic_pin"
+        android:title="@string/pin_to_the_top"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_unpin"
+        android:icon="@drawable/ic_unpin"
+        android:title="@string/unpin_folder"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_move_to_top"
         android:icon="@drawable/ic_move_to_top_vector"
@@ -13,26 +33,6 @@
         android:icon="@drawable/ic_move_to_bottom_vector"
         android:title="@string/move_to_bottom"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_delete"
-        android:icon="@drawable/ic_delete_vector"
-        android:title="@string/delete"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_properties"
-        android:icon="@drawable/ic_info_vector"
-        android:title="@string/properties"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_pin"
-        android:icon="@drawable/ic_pin"
-        android:title="@string/pin_to_the_top"
-        app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/cab_unpin"
-        android:icon="@drawable/ic_unpin"
-        android:title="@string/unpin_folder"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/cab_change_order"
         android:icon="@drawable/ic_drag_handle_vector"
diff --git a/app/src/main/res/menu/cab_hidden_folders.xml b/app/src/main/res/menu/cab_hidden_folders.xml
index b99cd4913..f12982ec8 100644
--- a/app/src/main/res/menu/cab_hidden_folders.xml
+++ b/app/src/main/res/menu/cab_hidden_folders.xml
@@ -5,5 +5,5 @@
         android:id="@+id/cab_unhide"
         android:icon="@drawable/ic_unhide_vector"
         android:title="@string/unhide"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index ff8fd3510..ee34b51e9 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -7,17 +7,17 @@
         android:id="@+id/cab_confirm_selection"
         android:icon="@drawable/ic_check_vector"
         android:title="@string/confirm_selection"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_delete"
         android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_share"
         android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_rotate"
         android:icon="@drawable/ic_rotate_right_vector"
diff --git a/app/src/main/res/menu/menu_add_folder.xml b/app/src/main/res/menu/menu_add_folder.xml
index 1addb1988..b0ec5470f 100644
--- a/app/src/main/res/menu/menu_add_folder.xml
+++ b/app/src/main/res/menu/menu_add_folder.xml
@@ -5,5 +5,5 @@
         android:id="@+id/add_folder"
         android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_folder"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml
index 1b8d9941b..a4a4466a1 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -5,15 +5,15 @@
         android:id="@+id/save_as"
         android:icon="@drawable/ic_check_vector"
         android:title="@string/save_as"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/edit"
         android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit_with"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/share"
         android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/menu_included_folders.xml b/app/src/main/res/menu/menu_included_folders.xml
index 1addb1988..b0ec5470f 100644
--- a/app/src/main/res/menu/menu_included_folders.xml
+++ b/app/src/main/res/menu/menu_included_folders.xml
@@ -5,5 +5,5 @@
         android:id="@+id/add_folder"
         android:icon="@drawable/ic_plus_vector"
         android:title="@string/add_folder"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
 </menu>
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index 1d3349a16..812461cf8 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -8,17 +8,17 @@
         android:icon="@drawable/ic_search_vector"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="collapseActionView|ifRoom" />
+        app:showAsAction="collapseActionView|always" />
     <item
         android:id="@+id/toggle_filename"
         android:icon="@drawable/ic_label_vector"
         android:title="@string/toggle_filename"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/sort"
         android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter_vector"
diff --git a/app/src/main/res/menu/menu_set_wallpaper.xml b/app/src/main/res/menu/menu_set_wallpaper.xml
index 99353cb70..a18434c14 100644
--- a/app/src/main/res/menu/menu_set_wallpaper.xml
+++ b/app/src/main/res/menu/menu_set_wallpaper.xml
@@ -5,7 +5,7 @@
         android:id="@+id/save"
         android:icon="@drawable/ic_check_vector"
         android:title="@string/save"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/allow_changing_aspect_ratio"
         android:title="@string/allow_changing_aspect_ratio"
diff --git a/app/src/main/res/menu/menu_video_player.xml b/app/src/main/res/menu/menu_video_player.xml
index f605d9bb9..3477c05c5 100644
--- a/app/src/main/res/menu/menu_video_player.xml
+++ b/app/src/main/res/menu/menu_video_player.xml
@@ -7,12 +7,12 @@
         android:id="@+id/menu_change_orientation"
         android:icon="@drawable/ic_orientation_auto_vector"
         android:title="@string/change_orientation"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_open_with"
         android:showAsAction="never"
diff --git a/app/src/main/res/menu/menu_viewpager.xml b/app/src/main/res/menu/menu_viewpager.xml
index 2c18b9b07..d2118c4bf 100644
--- a/app/src/main/res/menu/menu_viewpager.xml
+++ b/app/src/main/res/menu/menu_viewpager.xml
@@ -8,17 +8,17 @@
         android:icon="@drawable/ic_check_vector"
         android:title="@string/save_as"
         android:visible="false"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_delete"
         android:icon="@drawable/ic_delete_vector"
         android:title="@string/delete"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_rotate"
         android:icon="@drawable/ic_rotate_right_vector"
diff --git a/app/src/main/res/menu/photo_video_menu.xml b/app/src/main/res/menu/photo_video_menu.xml
index 28db4a460..af7de21ad 100644
--- a/app/src/main/res/menu/photo_video_menu.xml
+++ b/app/src/main/res/menu/photo_video_menu.xml
@@ -7,17 +7,17 @@
         android:id="@+id/menu_share"
         android:icon="@drawable/ic_share_vector"
         android:title="@string/share"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_properties"
         android:icon="@drawable/ic_info_vector"
         android:title="@string/properties"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_edit"
         android:icon="@drawable/ic_edit_vector"
         android:title="@string/edit"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="always" />
     <item
         android:id="@+id/menu_set_as"
         android:icon="@drawable/ic_set_as_vector"