diff --git a/app/src/main/res/drawable/ic_files_vector.xml b/app/src/main/res/drawable/ic_files_vector.xml
new file mode 100644
index 000000000..8968b527a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_files_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="48" android:viewportHeight="48">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M18.75 29.15H35.3q0.5 0 0.7-0.4 0.2-0.4-0.1-0.8l-4.85-6.55q-0.25-0.3-0.6-0.3t-0.6 0.3l-4.55 5.95-2.8-3.6q-0.25-0.3-0.6-0.3t-0.6 0.35l-3.15 4.15q-0.3 0.4-0.075 0.8 0.225 0.4 0.675 0.4zM13 38q-1.2 0-2.1-0.9Q10 36.2 10 35V7q0-1.2 0.9-2.1Q11.8 4 13 4h28q1.2 0 2.1 0.9Q44 5.8 44 7v28q0 1.2-0.9 2.1Q42.2 38 41 38zm-6 6q-1.2 0-2.1-0.9Q4 42.2 4 41V11.5q0-0.65 0.425-1.075Q4.85 10 5.5 10q0.65 0 1.075 0.425Q7 10.85 7 11.5V41h29.5q0.65 0 1.075 0.425Q38 41.85 38 42.5q0 0.65-0.425 1.075Q37.15 44 36.5 44z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_folders_vector.xml b/app/src/main/res/drawable/ic_folders_vector.xml
new file mode 100644
index 000000000..f607e6d1f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folders_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="48" android:viewportHeight="48">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M5 42q-1.25 0-2.125-0.875T2 39V12q0-0.65 0.425-1.075Q2.85 10.5 3.5 10.5q0.65 0 1.075 0.425Q5 11.35 5 12v27h35q0.65 0 1.075 0.425Q41.5 39.85 41.5 40.5q0 0.65-0.425 1.075Q40.65 42 40 42zm6-6q-1.25 0-2.125-0.875T8 33V7q0-1.25 0.875-2.125T11 4h11.75q0.6 0 1.175 0.25Q24.5 4.5 24.9 4.9L27 7h16q1.25 0 2.125 0.875T46 10v23q0 1.25-0.875 2.125T43 36z"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 89b718f99..2271f7606 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -8,11 +8,16 @@
         android:icon="@drawable/ic_camera_vector"
         android:title="@string/open_camera"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/show_all"
+        android:icon="@drawable/ic_files_vector"
+        android:title="@string/show_all"
+        app:showAsAction="always" />
     <item
         android:id="@+id/sort"
         android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter_vector"
@@ -43,11 +48,6 @@
         android:showAsAction="never"
         android:title="@string/stop_showing_excluded"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/show_all"
-        android:showAsAction="never"
-        android:title="@string/show_all"
-        app:showAsAction="never" />
     <item
         android:id="@+id/set_as_default_folder"
         android:showAsAction="never"
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index 06ca81531..089a0f779 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -8,11 +8,16 @@
         android:icon="@drawable/ic_label_vector"
         android:title="@string/toggle_filename"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/folder_view"
+        android:icon="@drawable/ic_folders_vector"
+        android:title="@string/folder_view"
+        app:showAsAction="always" />
     <item
         android:id="@+id/sort"
         android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter_vector"
@@ -48,11 +53,6 @@
         android:showAsAction="never"
         android:title="@string/restore_all_files"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/folder_view"
-        android:showAsAction="never"
-        android:title="@string/folder_view"
-        app:showAsAction="never" />
     <item
         android:id="@+id/open_camera"
         android:icon="@drawable/ic_camera_vector"