diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 39bcd4f2..2b666321 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -7,7 +7,7 @@
     "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~5f8db287.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~5f8db287.js?id=07a5f340da451bf2ae5d",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~eeab5771.js?id=319ba6f55c8fb5dca6ac",
     "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/shared/file-browser.js?id=6f6e038b64009a752638",
-    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=e8c676f0b1add89a391f",
+    "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=8ce1dccd140966097677",
     "/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=f34c3f924e632de0bc6e",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=f779d10bf0f57bf3b08c",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js?id=075ff381293e1a20d167",
@@ -34,10 +34,10 @@
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=de64a0ce7c737b106d96",
     "/chunks/files.js": "/chunks/files.js?id=1731c1b3a8bfbbeaa301",
     "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared-files~chunks/shared/file-browser.js?id=a930cc4a4f5af02460bb",
-    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=dcd82a6b80a31f229b5a",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.js?id=f15ebd5d3d14a9cb7549",
     "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser~chunks/sha~8510f6c9.js?id=ac54ac828e9a8667410f",
     "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared/file-browser~chunks/user~9058a49f.js?id=a0dd218c154e83af8dee",
-    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=c5009a3c2463bfb02c36",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.js?id=ed3a03e7c61f1223bf3e",
     "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js?id=7f84c4b09fcf5b890775",
     "/chunks/files~chunks/shared/file-browser.js": "/chunks/files~chunks/shared/file-browser.js?id=ff8043fe2c43e13a74e2",
     "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=daaffc43387587cf4b57",
@@ -53,7 +53,7 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=7a6acca368d11e2a4815",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=260d274a422706d71809",
     "/chunks/plans.js": "/chunks/plans.js?id=6d14bd88ebd6cf82fdc6",
-    "/chunks/platform.js": "/chunks/platform.js?id=97c929acc6aa40ee32cc",
+    "/chunks/platform.js": "/chunks/platform.js?id=1e70df954579133c32ad",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=ffbda8c58183915cb55a",
     "/chunks/profile.js": "/chunks/profile.js?id=bdc92d734851c0d09b8c",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=a5e7ed872d1430177922",
@@ -67,7 +67,7 @@
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=1bffa4ae7d545af08355",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=c6b88005b133268ed88f",
     "/chunks/shared.js": "/chunks/shared.js?id=68165b2df75fd836ec22",
-    "/chunks/shared-files.js": "/chunks/shared-files.js?id=e8961791d642db47b77e",
+    "/chunks/shared-files.js": "/chunks/shared-files.js?id=fdcae9524683fdf7a1a1",
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=aab96d6900885ccb90ed",
     "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=b2fbe95c0ed7074377ce",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=e11f79244629896c95db",
@@ -207,5 +207,38 @@
     "/chunks/platform~chunks/shared.d82c4cbe4bcee26a499a.hot-update.js": "/chunks/platform~chunks/shared.d82c4cbe4bcee26a499a.hot-update.js",
     "/chunks/shared.5ef9810a79a9b9f21044.hot-update.js": "/chunks/shared.5ef9810a79a9b9f21044.hot-update.js",
     "/js/main.7b86ccc4038937e14422.hot-update.js": "/js/main.7b86ccc4038937e14422.hot-update.js",
-    "/chunks/platform.610f56f1f5ffe3dd7fdb.hot-update.js": "/chunks/platform.610f56f1f5ffe3dd7fdb.hot-update.js"
+    "/chunks/platform.610f56f1f5ffe3dd7fdb.hot-update.js": "/chunks/platform.610f56f1f5ffe3dd7fdb.hot-update.js",
+    "/chunks/platform.203f79a72ffca603d186.hot-update.js": "/chunks/platform.203f79a72ffca603d186.hot-update.js",
+    "/chunks/admin~chunks/platform.014a49fe92153753288f.hot-update.js": "/chunks/admin~chunks/platform.014a49fe92153753288f.hot-update.js",
+    "/chunks/shared-files.014a49fe92153753288f.hot-update.js": "/chunks/shared-files.014a49fe92153753288f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.bd54170320b7d1c39b6f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.bd54170320b7d1c39b6f.hot-update.js",
+    "/chunks/platform.d973d3298022423ed555.hot-update.js": "/chunks/platform.d973d3298022423ed555.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1c920fd1705027fd0a20.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1c920fd1705027fd0a20.hot-update.js",
+    "/chunks/platform.fd6a1aeef0994b105659.hot-update.js": "/chunks/platform.fd6a1aeef0994b105659.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.7c7bad8d741e9a366c9b.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.7c7bad8d741e9a366c9b.hot-update.js",
+    "/chunks/platform.c570c84c615de98c5c31.hot-update.js": "/chunks/platform.c570c84c615de98c5c31.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.3822ef24c7cc4936246f.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.3822ef24c7cc4936246f.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1a6f54e33a82d82ca249.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1a6f54e33a82d82ca249.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.f5bbc1f9b951275bbfa2.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.f5bbc1f9b951275bbfa2.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.4ee58298b106804727e4.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.4ee58298b106804727e4.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.164eb6082bec2aef548e.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.164eb6082bec2aef548e.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.8f2636aebeabe6e3ca2f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.8f2636aebeabe6e3ca2f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.8c12a4f92ab9b7c0f7d8.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.8c12a4f92ab9b7c0f7d8.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.4fa0dbf4b1797e66940f.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.4fa0dbf4b1797e66940f.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.25731f5e053594470e22.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.25731f5e053594470e22.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.2cc7bdf9a6a58bc865b5.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.2cc7bdf9a6a58bc865b5.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.9e770694c12b9fed0366.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.9e770694c12b9fed0366.hot-update.js",
+    "/js/main.5cc5963e96956b86e601.hot-update.js": "/js/main.5cc5963e96956b86e601.hot-update.js",
+    "/js/main.c3493ffe207e0b9cd353.hot-update.js": "/js/main.c3493ffe207e0b9cd353.hot-update.js",
+    "/chunks/platform.b26d0d54c5e22d4761a0.hot-update.js": "/chunks/platform.b26d0d54c5e22d4761a0.hot-update.js",
+    "/chunks/platform.7bf83251154d750685e5.hot-update.js": "/chunks/platform.7bf83251154d750685e5.hot-update.js",
+    "/chunks/platform.ec4d278cd6ba3f568958.hot-update.js": "/chunks/platform.ec4d278cd6ba3f568958.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.c36c25df5d5bcdf569a6.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.c36c25df5d5bcdf569a6.hot-update.js",
+    "/chunks/files~chunks/shared-files~chunks/shared/file-browser.1dee5f15536201d98851.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared/file-browser.1dee5f15536201d98851.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1ec34399e88f417a65ed.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.1ec34399e88f417a65ed.hot-update.js",
+    "/chunks/platform.1ec34399e88f417a65ed.hot-update.js": "/chunks/platform.1ec34399e88f417a65ed.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8471c87471b1dc8d1d0a.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.8471c87471b1dc8d1d0a.hot-update.js",
+    "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.01363a471b3d05f133f4.hot-update.js": "/chunks/files~chunks/platform~chunks/shared~chunks/shared-files~chunks/shared/file-browser.01363a471b3d05f133f4.hot-update.js",
+    "/chunks/platform.a36c1ff1761f27794e38.hot-update.js": "/chunks/platform.a36c1ff1761f27794e38.hot-update.js",
+    "/chunks/platform.e6bc793bad4299c41fa4.hot-update.js": "/chunks/platform.e6bc793bad4299c41fa4.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/FileActionsMobile.vue b/resources/js/components/FilesView/FileActionsMobile.vue
index da2ffa5a..9a28c7e4 100644
--- a/resources/js/components/FilesView/FileActionsMobile.vue
+++ b/resources/js/components/FilesView/FileActionsMobile.vue
@@ -1,8 +1,72 @@
 <template>
     <div id="mobile-actions-wrapper">
 
-        <!--Actions for trash location--->
-        <div v-if="trashLocationMenu && ! multiSelectMode" class="mobile-actions">
+        <!--Base location-->
+        <div v-if="$isThisLocation(['base']) && $checkPermission(['master', 'editor']) && ! isSelectMode" class="mobile-actions">
+            <MobileActionButton @click.native="showLocations" icon="filter">
+                {{ filterLocationTitle }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="createFolder" icon="folder-plus">
+                {{ $t('context_menu.add_folder') }}
+            </MobileActionButton>
+            <MobileActionButtonUpload>
+                {{ $t('context_menu.upload') }}
+            </MobileActionButtonUpload>
+            <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
+                {{ $t('context_menu.select') }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
+                {{ $t('preview_sorting.preview_sorting_button') }}
+            </MobileActionButton>
+        </div>
+
+        <!--Base location editor-->
+        <div v-if="$isThisLocation('public') && $checkPermission('editor') && ! isSelectMode" class="mobile-actions">
+            <MobileActionButton @click.native="createFolder" icon="folder-plus">
+                {{ $t('context_menu.add_folder') }}
+            </MobileActionButton>
+            <MobileActionButtonUpload>
+                {{ $t('context_menu.upload') }}
+            </MobileActionButtonUpload>
+            <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
+                {{ $t('context_menu.select') }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
+                {{ $t('preview_sorting.preview_sorting_button') }}
+            </MobileActionButton>
+        </div>
+
+        <!--Base location visitor-->
+        <div v-if="$isThisLocation('public') && $checkPermission('visitor') && ! isSelectMode" class="mobile-actions">
+             <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
+               {{ $t('context_menu.select') }}
+            </MobileActionButton>
+             <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
+                {{ $t('preview_sorting.preview_sorting_button') }}
+            </MobileActionButton>
+        </div>
+
+        <!--Recent uploads location-->
+        <div v-if="$isThisLocation('latest') && ! isSelectMode" class="mobile-actions">
+            <MobileActionButton @click.native="showLocations" icon="filter">
+                {{ filterLocationTitle }}
+            </MobileActionButton>
+            <MobileActionButtonUpload>
+                {{ $t('context_menu.upload') }}
+            </MobileActionButtonUpload>
+            <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
+                {{ $t('context_menu.select') }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
+                {{ $t('preview_sorting.preview_sorting_button') }}
+            </MobileActionButton>
+        </div>
+
+        <!--Trash location--->
+        <div v-if="$isThisLocation(['trash', 'trash-root']) && ! isSelectMode" class="mobile-actions">
+            <MobileActionButton @click.native="showLocations" icon="filter">
+                {{ filterLocationTitle }}
+            </MobileActionButton>
             <MobileActionButton @click.native="$store.dispatch('emptyTrash')" icon="trash">
                 {{ $t('context_menu.empty_trash') }}
             </MobileActionButton>
@@ -14,52 +78,32 @@
             </MobileActionButton>
         </div>
 
-        <!--Actions for Base location-->
-        <transition name="button">
-            <div v-if="baseLocationMasterMenu && ! multiSelectMode" class="mobile-actions">
-                <MobileActionButton @click.native="showLocations" icon="filter">
-                    {{ filterLocationTitle }}
-                </MobileActionButton>
-                <MobileActionButton @click.native="createFolder" icon="folder-plus">
-                    {{ $t('context_menu.add_folder') }}
-                </MobileActionButton>
-                <MobileActionButtonUpload>
-                    {{ $t('context_menu.upload') }}
-                </MobileActionButtonUpload>
-                <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
-                    {{ $t('context_menu.select') }}
-                </MobileActionButton>
-                <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
-                    {{ $t('preview_sorting.preview_sorting_button') }}
-                </MobileActionButton>
-            </div>
-        </transition>
-
-        <!-- Selecting buttons -->
-        <transition name="button">
-            <div v-if="multiSelectMode" class="mobile-actions">
-                <MobileActionButton @click.native="selectAll" icon="check-square">
-                    {{ $t('mobile_selecting.select_all') }}
-                </MobileActionButton>
-                <MobileActionButton @click.native="deselectAll" icon="x-square">
-                    {{ $t('mobile_selecting.deselect_all') }}
-                </MobileActionButton>
-                <MobileActionButton @click.native="disableMultiSelectMode" icon="check">
-                    {{ $t('mobile_selecting.done') }}
-                </MobileActionButton>
-            </div>
-        </transition>
-
-        <!--Actions for Base location in shared folder with visit permission-->
-        <div v-if="baseLocationVisitorMenu && ! multiSelectMode" class="mobile-actions">
-             <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
-               {{ $t('context_menu.select') }}
+        <!--Shared location--->
+        <div v-if="$isThisLocation(['shared', 'participant_uploads']) && ! isSelectMode" class="mobile-actions">
+            <MobileActionButton @click.native="showLocations" icon="filter">
+                {{ filterLocationTitle }}
             </MobileActionButton>
-             <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
+            <MobileActionButton @click.native="enableMultiSelectMode" icon="check-square">
+                {{ $t('context_menu.select') }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="showViewOptions" icon="preview-sorting">
                 {{ $t('preview_sorting.preview_sorting_button') }}
             </MobileActionButton>
         </div>
 
+        <!-- Multi select mode -->
+        <div v-if="isSelectMode" class="mobile-actions">
+            <MobileActionButton @click.native="selectAll" icon="check-square">
+                {{ $t('mobile_selecting.select_all') }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="deselectAll" icon="x-square">
+                {{ $t('mobile_selecting.deselect_all') }}
+            </MobileActionButton>
+            <MobileActionButton @click.native="disableMultiSelectMode" icon="check">
+                {{ $t('mobile_selecting.done') }}
+            </MobileActionButton>
+        </div>
+
         <!--Upload Progressbar-->
         <UploadProgress />
     </div>
@@ -89,15 +133,6 @@
                     ? 'th'
                     : 'th-list'
             },
-            trashLocationMenu() {
-                return this.$isThisLocation(['trash', 'trash-root']) && this.$checkPermission('master')
-            },
-            baseLocationMasterMenu() {
-                return this.$isThisLocation(['base', 'public']) && this.$checkPermission(['master', 'editor'])
-            },
-            baseLocationVisitorMenu() {
-                return (this.$isThisLocation(['base', 'shared', 'public']) && this.$checkPermission('visitor')) || (this.$isThisLocation(['latest', 'shared']) && this.$checkPermission('master'))
-            },
             filterLocationTitle() {
                 return {
                     'base': 'Files',
@@ -112,12 +147,12 @@
         },
         data() {
             return {
-                multiSelectMode: false,
+                isSelectMode: false,
             }
         },
         methods: {
             showLocations() {
-
+                events.$emit('mobile-menu:show', 'file-filter')
             },
             selectAll() {
                 this.$store.commit('SELECT_ALL_FILES')
@@ -126,12 +161,12 @@
                 this.$store.commit('CLEAR_FILEINFO_DETAIL')
             },
             enableMultiSelectMode() {
-                this.multiSelectMode = true
+                this.isSelectMode = true
 
                 events.$emit('mobileSelecting:start')
             },
             disableMultiSelectMode() {
-                this.multiSelectMode = false
+                this.isSelectMode = false
 
                 events.$emit('mobileSelecting:stop')
             },
@@ -143,7 +178,7 @@
             },
         },
         mounted() {
-            events.$on('mobileSelecting:stop', () => this.multiSelectMode = false)
+            events.$on('mobileSelecting:stop', () => this.isSelectMode = false)
         }
     }
 </script>
diff --git a/resources/js/components/FilesView/FileFilterMobile.vue b/resources/js/components/FilesView/FileFilterMobile.vue
new file mode 100644
index 00000000..1a3d861c
--- /dev/null
+++ b/resources/js/components/FilesView/FileFilterMobile.vue
@@ -0,0 +1,64 @@
+<template>
+    <MenuMobile name="file-filter">
+        <MenuMobileGroup>
+            <OptionGroup>
+                <Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" :is-active="$isThisLocation('base')" />
+                <Option @click.native="goToLatest" :title="$t('menu.latest')" icon="upload-cloud" :is-active="$isThisLocation('latest')" />
+                <Option @click.native="goToTrash" :title="$t('menu.trash')" icon="trash" :is-active="$isThisLocation(['trash', 'trash-root'])" />
+            </OptionGroup>
+            <OptionGroup>
+                <Option @click.native="goToShared" :title="$t('sidebar.my_shared')" icon="share" :is-active="$isThisLocation('shared')" />
+                <Option @click.native="goToParticipantUploads" :title="$t('sidebar.participant_uploads')" icon="users" :is-active="$isThisLocation('participant_uploads')" />
+            </OptionGroup>
+        </MenuMobileGroup>
+    </MenuMobile>
+</template>
+
+<script>
+import MenuMobileGroup from '@/components/Mobile/MenuMobileGroup'
+import OptionGroup from '@/components/FilesView/OptionGroup'
+import MenuMobile from '@/components/Mobile/MenuMobile'
+import Option from '@/components/FilesView/Option'
+import {mapGetters} from 'vuex'
+import {events} from '@/bus'
+
+export default {
+    name: 'FileMenuMobile',
+    components: {
+        MenuMobileGroup,
+        OptionGroup,
+        MenuMobile,
+        Option,
+    },
+    computed: {
+        ...mapGetters([
+            'homeDirectory'
+        ]),
+    },
+    methods: {
+        flushBrowseHistory() {
+            this.$store.commit('FLUSH_FOLDER_HISTORY')
+        },
+        goToFiles() {
+            this.$store.dispatch('getFolder', [{folder: this.homeDirectory, back: false, init: true}])
+            this.flushBrowseHistory()
+        },
+        goToLatest() {
+            this.$store.dispatch('getLatest')
+            this.flushBrowseHistory()
+        },
+        goToTrash() {
+            this.$store.dispatch('getTrash')
+            this.flushBrowseHistory()
+        },
+        goToShared() {
+            this.$store.dispatch('getShared', [{back: false, init: false}])
+            this.flushBrowseHistory()
+        },
+        goToParticipantUploads() {
+            this.$store.dispatch('getParticipantUploads')
+            this.flushBrowseHistory()
+        },
+    }
+}
+</script>
diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue
index 922271c8..0c730eba 100644
--- a/resources/js/components/FilesView/Option.vue
+++ b/resources/js/components/FilesView/Option.vue
@@ -1,25 +1,28 @@
 <template>
     <li class="menu-option group">
         <div class="icon group-hover-text-theme">
-            <calendar-icon v-if="icon === 'calendar'" size="17" class="group-hover-text-theme"/>
-            <grid-icon v-if="icon === 'grid'" size="17" class="group-hover-text-theme"/>
-            <list-icon v-if="icon === 'list'" size="17" class="group-hover-text-theme"/>
-            <trash-2-icon v-if="icon === 'trash'" size="17" class="group-hover-text-theme"/>
-            <life-buoy-icon v-if="icon === 'restore'" size="17" class="group-hover-text-theme"/>
-            <trash-icon v-if="icon === 'empty-trash'" size="17" class="group-hover-text-theme"/>
-            <eye-icon v-if="icon ==='detail'" size="17" class="group-hover-text-theme"/>
-            <download-cloud-icon v-if="icon === 'download'" size="17" class="group-hover-text-theme"/>
-            <edit2-icon v-if="icon === 'rename'" size="17" class="group-hover-text-theme"/>
-            <corner-down-right-icon v-if="icon === 'move-item'" size="17" class="group-hover-text-theme"/>
-            <link-icon v-if="icon === 'share'" size="17" class="group-hover-text-theme"/>
-            <star-icon v-if="icon === 'favourites'" size="17" class="group-hover-text-theme"/>
-            <folder-plus-icon v-if="icon === 'create-folder'" size="17" class="group-hover-text-theme"/>
-            <smile-icon v-if="icon === 'no-options'" size="17" class="group-hover-text-theme"/>
-            <paperclip-icon v-if="icon === 'zip-folder'" size="17" class="group-hover-text-theme"/>
-            <alphabet-icon v-if="icon === 'alphabet'" size="17" class="group-hover-text-theme"/>
-            <star-icon v-if="icon === 'star'" size="17" class="group-hover-text-theme"/>
+            <calendar-icon v-if="icon === 'calendar'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <grid-icon v-if="icon === 'grid'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <list-icon v-if="icon === 'list'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <trash-2-icon v-if="icon === 'trash'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <life-buoy-icon v-if="icon === 'restore'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <trash-icon v-if="icon === 'empty-trash'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <eye-icon v-if="icon ==='detail'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <download-cloud-icon v-if="icon === 'download'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <edit2-icon v-if="icon === 'rename'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <corner-down-right-icon v-if="icon === 'move-item'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <link-icon v-if="icon === 'share'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <star-icon v-if="icon === 'favourites'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <folder-plus-icon v-if="icon === 'create-folder'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <smile-icon v-if="icon === 'no-options'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <paperclip-icon v-if="icon === 'zip-folder'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <alphabet-icon v-if="icon === 'alphabet'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <star-icon v-if="icon === 'star'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <hard-drive-icon v-if="icon === 'hard-drive'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <upload-cloud-icon v-if="icon === 'upload-cloud'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
+            <users-icon v-if="icon === 'users'" size="17" class="group-hover-text-theme" :class="{'text-theme': isActive}"/>
         </div>
-        <div class="text-label group-hover-text-theme">
+        <div class="text-label group-hover-text-theme" :class="{'text-theme': isActive}">
             {{ title }}
         </div>
     </li>
@@ -28,6 +31,9 @@
 <script>
 import AlphabetIcon from '@/components/FilesView/Icons/AlphabetIcon'
 import {
+    UsersIcon,
+    UploadCloudIcon,
+    HardDriveIcon,
     CornerDownRightIcon,
     DownloadCloudIcon,
     FolderPlusIcon,
@@ -47,24 +53,31 @@ import {
 
     export default {
         name: 'Option',
-        props:['title' , 'icon'],
+        props:[
+            'isActive',
+            'title',
+            'icon'
+        ],
         components: {
             CornerDownRightIcon,
             DownloadCloudIcon,
+            UploadCloudIcon,
             FolderPlusIcon,
+            HardDriveIcon,
             PaperclipIcon,
             LifeBuoyIcon,
+            CalendarIcon,
             AlphabetIcon,
             Trash2Icon,
             SmileIcon,
+            UsersIcon,
             Edit2Icon,
             TrashIcon,
             LinkIcon,
             StarIcon,
-            EyeIcon,
             GridIcon,
             ListIcon,
-            CalendarIcon,
+            EyeIcon,
         }
     }
 </script>
diff --git a/resources/js/components/Others/MobileNavigation.vue b/resources/js/components/Others/MobileNavigation.vue
index fc7c370b..635e9d9a 100644
--- a/resources/js/components/Others/MobileNavigation.vue
+++ b/resources/js/components/Others/MobileNavigation.vue
@@ -26,7 +26,10 @@
             UserHeadline,
         },
         computed: {
-            ...mapGetters(['user', 'homeDirectory']),
+            ...mapGetters([
+                'user',
+                'homeDirectory'
+            ]),
             navigation() {
                 return [
                     {
@@ -35,24 +38,6 @@
                         routeName: 'Files',
                         isVisible: true,
                     },
-                    /*{
-                        icon: 'latest',
-                        title: this.$t('menu.latest'),
-                        routeName: 'Files',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'share',
-                        title: this.$t('menu.shared'),
-                        routeName: 'SharedFiles',
-                        isVisible: true,
-                    },
-                    {
-                        icon: 'trash',
-                        title: this.$t('menu.trash'),
-                        routeName: 'Files',
-                        isVisible: true,
-                    },*/
                     {
                         icon: 'user',
                         title: this.$t('menu.settings'),
@@ -83,11 +68,11 @@
             action(name) {
 
                 /*if (name === 'latest') {
-                    this.$store.dispatch('getLatest')
+
                 }
 
                 if (name === 'trash') {
-                    this.$store.dispatch('getTrash')
+
                 }*/
 
                 if (name === 'hard-drive') {
diff --git a/resources/js/helpers.js b/resources/js/helpers.js
index ad6cb81f..fdcac0e9 100644
--- a/resources/js/helpers.js
+++ b/resources/js/helpers.js
@@ -347,8 +347,7 @@ const Helpers = {
         // Detect windows
         Vue.prototype.$checkOS = function () {
             if (navigator.userAgent.indexOf('Windows') != -1) {
-                let body = document.body
-                body.classList.add('windows')
+                document.body.classList.add('windows')
             }
         }
 
diff --git a/resources/js/views/FilePages/SharedFiles.vue b/resources/js/views/FilePages/SharedFiles.vue
index 62bb2b04..6ce1c52a 100644
--- a/resources/js/views/FilePages/SharedFiles.vue
+++ b/resources/js/views/FilePages/SharedFiles.vue
@@ -6,7 +6,7 @@
             <!--Navigator-->
             <ContentGroup :title="$t('sidebar.locations_title')">
                 <div class="menu-list-wrapper vertical">
-                    <li class="menu-list-item link" :class="{'is-active': $isThisLocation(['shared'])}" @click="getShared()">
+                    <li class="menu-list-item link" :class="{'is-active': $isThisLocation(['shared'])}" @click="getShared">
                         <div class="icon text-theme">
                             <link-icon size="17"></link-icon>
                         </div>
@@ -14,7 +14,7 @@
                             {{ $t('sidebar.my_shared') }}
                         </div>
                     </li>
-                    <li class="menu-list-item link" :class="{'is-active': $isThisLocation(['participant_uploads'])}" @click="getParticipantUploads()">
+                    <li class="menu-list-item link" :class="{'is-active': $isThisLocation(['participant_uploads'])}" @click="getParticipantUploads">
                         <div class="icon text-theme">
                             <users-icon size="17"></users-icon>
                         </div>
diff --git a/resources/js/views/Platform.vue b/resources/js/views/Platform.vue
index c4311814..8b532ac4 100644
--- a/resources/js/views/Platform.vue
+++ b/resources/js/views/Platform.vue
@@ -18,6 +18,7 @@
 
         <!--Mobile components-->
         <FileSortingMobile />
+        <FileFilterMobile />
         <FileMenuMobile />
 
         <MultiSelectToolbarMobile />
@@ -37,6 +38,7 @@
     import MultiSelectToolbarMobile from '@/components/FilesView/MultiSelectToolbarMobile'
     import FileSortingMobile from '@/components/FilesView/FileSortingMobile'
     import SidebarNavigation from '@/components/Sidebar/SidebarNavigation'
+    import FileFilterMobile from '@/components/FilesView/FileFilterMobile'
     import CreateFolderPopup from '@/components/Others/CreateFolderPopup'
     import ProcessingPopup from '@/components/FilesView/ProcessingPopup'
     import MobileNavigation from '@/components/Others/MobileNavigation'
@@ -58,6 +60,7 @@
             CreateFolderPopup,
             FileSortingMobile,
             SidebarNavigation,
+            FileFilterMobile,
             MobileNavigation,
             ShareCreatePopup,
             ProcessingPopup,