diff --git a/app/src/main/res/menu/cab_media.xml b/app/src/main/res/menu/cab_media.xml
index ee10dbfa4..cb8dda1e9 100644
--- a/app/src/main/res/menu/cab_media.xml
+++ b/app/src/main/res/menu/cab_media.xml
@@ -65,6 +65,14 @@
         android:id="@+id/cab_create_shortcut"
         android:title="@string/create_shortcut"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/cab_open_with"
+        android:title="@string/open_with"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/cab_set_as"
+        android:title="@string/set_as"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/cab_edit"
         android:icon="@drawable/ic_edit_vector"
@@ -88,14 +96,6 @@
         android:id="@+id/cab_fix_date_taken"
         android:title="@string/fix_date_taken"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/cab_open_with"
-        android:title="@string/open_with"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/cab_set_as"
-        android:title="@string/set_as"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/cab_select_all"
         android:icon="@drawable/ic_select_all_vector"
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index 357048007..13d96302a 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -75,10 +75,6 @@
         android:id="@+id/create_new_folder"
         android:title="@string/create_new_folder"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/slideshow"
-        android:title="@string/slideshow"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/increase_column_count"
         android:title="@string/increase_column_count"
@@ -87,6 +83,10 @@
         android:id="@+id/reduce_column_count"
         android:title="@string/reduce_column_count"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/slideshow"
+        android:title="@string/slideshow"
+        app:showAsAction="never"/>
     <item
         android:id="@+id/settings"
         android:title="@string/settings"
diff --git a/app/src/main/res/menu/menu_viewpager.xml b/app/src/main/res/menu/menu_viewpager.xml
index 42dc1c035..a0dcfaf84 100644
--- a/app/src/main/res/menu/menu_viewpager.xml
+++ b/app/src/main/res/menu/menu_viewpager.xml
@@ -34,6 +34,52 @@
                 android:title="@string/rotate_one_eighty"/>
         </menu>
     </item>
+    <item
+        android:id="@+id/menu_properties"
+        android:icon="@drawable/ic_info"
+        android:title="@string/properties"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_rename"
+        android:icon="@drawable/ic_rename_new"
+        android:title="@string/rename"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_hide"
+        android:icon="@drawable/ic_hide"
+        android:title="@string/hide"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_unhide"
+        android:icon="@drawable/ic_unhide_vector"
+        android:title="@string/unhide"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_copy_to"
+        android:title="@string/copy_to"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_move_to"
+        android:title="@string/move_to"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_create_shortcut"
+        android:title="@string/create_shortcut"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_open_with"
+        android:title="@string/open_with"
+        app:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_set_as"
+        android:icon="@drawable/ic_set_as_vector"
+        android:title="@string/set_as"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/menu_edit"
+        android:icon="@drawable/ic_edit_vector"
+        android:title="@string/edit"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_add_to_favorites"
         android:icon="@drawable/ic_star_off_vector"
@@ -65,63 +111,19 @@
                 android:title="@string/use_default_orientation"/>
         </menu>
     </item>
-    <item
-        android:id="@+id/menu_copy_to"
-        android:title="@string/copy_to"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_move_to"
-        android:title="@string/move_to"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_open_with"
-        android:title="@string/open_with"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_hide"
-        android:title="@string/hide"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_unhide"
-        android:title="@string/unhide"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_edit"
-        android:icon="@drawable/ic_edit_vector"
-        android:title="@string/edit"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/menu_properties"
-        android:icon="@drawable/ic_info"
-        android:title="@string/properties"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/menu_slideshow"
-        android:icon="@drawable/ic_slideshow_vector"
-        android:title="@string/slideshow"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/menu_set_as"
-        android:icon="@drawable/ic_set_as_vector"
-        android:title="@string/set_as"
-        app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/menu_rename"
-        android:icon="@drawable/ic_rename_new"
-        android:title="@string/rename"
-        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_print"
         android:title="@string/print"
         app:showAsAction="never"/>
-    <item
-        android:id="@+id/menu_create_shortcut"
-        android:title="@string/create_shortcut"
-        app:showAsAction="never"/>
     <item
         android:id="@+id/menu_show_on_map"
         android:title="@string/show_on_map"
         app:showAsAction="never"/>
+    <item
+        android:id="@+id/menu_slideshow"
+        android:icon="@drawable/ic_slideshow_vector"
+        android:title="@string/slideshow"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/menu_settings"
         android:title="@string/settings"