diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 0bc1621c..b5efe9b1 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -9,7 +9,7 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~738b0c2f.js?id=8013b71e5d41ca2752b8",
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~e44242d2.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~e44242d2.js?id=517790f13bf7daccdfe6",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=0e511f0ceaac7257bf25",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=2e2a657a5558940f1bc7",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=2fe563914632c7cbd7a9",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/file-browser.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared/file-browser.js?id=8d039f8ca0a670b99cca",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=5f8d3e698c1fd5b9b5a5",
     "/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=055d17c4463d3ef30218",
@@ -36,7 +36,7 @@
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=1e02112873d0b86eb1ac",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=dc4aa33310fc98be6749",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=a547f8b4e9a83935a777",
-    "/chunks/files.js": "/chunks/files.js?id=008e84b3f4decfc8f3d0",
+    "/chunks/files.js": "/chunks/files.js?id=7f75ce6379e3f7d5fbe9",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared/file-browser~d426c4eb.js?id=c6ab649e67651e0b9f18",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~9a5728b1.js?id=4f10f893c25e398f40bc",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~aaaa339d.js?id=593b877c4ab874ceccfe",
@@ -49,7 +49,7 @@
     "/chunks/homepage.js": "/chunks/homepage.js?id=6f2aac612b4c6eaabf61",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=a5b0819b57321599f235",
     "/chunks/invoices.js": "/chunks/invoices.js?id=f0360ddfb0f1e1a9058b",
-    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=a5841fea1d8baef93903",
+    "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=2066c19bd694455393fd",
     "/chunks/not-found.js": "/chunks/not-found.js?id=8e5c99340188c2a7b215",
     "/chunks/page-edit.js": "/chunks/page-edit.js?id=3d194f15e25dec1c54d3",
     "/chunks/pages.js": "/chunks/pages.js?id=bfd9a2e2c52e60ed025e",
@@ -59,14 +59,14 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=17469545c5b6a16c3bbf",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=0dd0a5efe0e3cb511c48",
     "/chunks/plans.js": "/chunks/plans.js?id=5a3c28288952fcad96e5",
-    "/chunks/platform.js": "/chunks/platform.js?id=68c90a9f0fcc5e2f5e7f",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=631fec4de30947ccb7e5",
+    "/chunks/platform.js": "/chunks/platform.js?id=00aad462a215e1d31166",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=5b1f86a4cb32fc3bb186",
     "/chunks/platform~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared/file-browser.js?id=b142ad8801528b166787",
     "/chunks/platform~chunks/shared~chunks/shared/file-browser.js": "/chunks/platform~chunks/shared~chunks/shared/file-browser.js?id=6ba92eab6a45cbab3af5",
     "/chunks/profile.js": "/chunks/profile.js?id=658aa03af778cc2cc100",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=ddb7be518c092ed392ca",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=4b176796d100a2b24d71",
-    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=debec75125f952172cf6",
+    "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=e473b4223b1b7cf6919b",
     "/chunks/settings.js": "/chunks/settings.js?id=354397b01623d73650d1",
     "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=0656db2b76eaa0de2c58",
     "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=29fbd676788295256ffe",
@@ -76,7 +76,7 @@
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=51b246c660e78c9263b5",
     "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=680f99e2021f19ff1af8",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=8a499266af9527039582",
-    "/chunks/shared.js": "/chunks/shared.js?id=8408b04cd6d5e0a4880b",
+    "/chunks/shared.js": "/chunks/shared.js?id=0c354d7bdc7d1319fbb4",
     "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=30b0b0d1930a1952648a",
     "/chunks/shared/file-browser.js": "/chunks/shared/file-browser.js?id=02bb2b1a5518a1f73b2a",
     "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=453f36d6716f716561bc",
@@ -86,7 +86,7 @@
     "/chunks/stripe-credentials.js": "/chunks/stripe-credentials.js?id=2802cde66f7d12ec8442",
     "/chunks/subscription-plans.js": "/chunks/subscription-plans.js?id=5dbfd83cfacad270a636",
     "/chunks/subscription-service.js": "/chunks/subscription-service.js?id=721e855dff920e5e6996",
-    "/chunks/trash.js": "/chunks/trash.js?id=6e4c0210fc214cd9a886",
+    "/chunks/trash.js": "/chunks/trash.js?id=b098bf0e2f2df3e67539",
     "/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js?id=8879f5c458f08648405a",
     "/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js?id=e365ae16373be9dbd458",
     "/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js?id=fc8183dc546683a9b60f",
@@ -135,10 +135,10 @@
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~cd83f396.js?id=32b7688119a605747ee9",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f23e39b6.js?id=5216516ba11c29601c91",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/shared/single-f~222c7501.js?id=6966f455db86cfa3ac1d",
-    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=bb4aa02e40bf23c6a83b",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.js?id=47333b5619058331b4df",
     "/chunks/platform~chunks/shared/files.js": "/chunks/platform~chunks/shared/files.js?id=a1891e149640c9a838f4",
     "/chunks/platform~chunks/shared~chunks/shared/files.js": "/chunks/platform~chunks/shared~chunks/shared/files.js?id=1ed2d41883a929aa1bc7",
-    "/chunks/shared/files.js": "/chunks/shared/files.js?id=72c40adeb04d35c60de4",
+    "/chunks/shared/files.js": "/chunks/shared/files.js?id=0f216041b7c08a512785",
     "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~efbe7a82.js": "/vendors~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chun~efbe7a82.js?id=9af0690154c8bf6d4ef8",
     "/js/main.d74018fe5b56d003aae4.hot-update.js": "/js/main.d74018fe5b56d003aae4.hot-update.js",
     "/js/main.ba6f6df8b0f4192825fe.hot-update.js": "/js/main.ba6f6df8b0f4192825fe.hot-update.js",
@@ -462,5 +462,68 @@
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.aa8db8b6f70387880eb7.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.aa8db8b6f70387880eb7.hot-update.js",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.9c9d826143d234c501f9.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.9c9d826143d234c501f9.hot-update.js",
     "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.39b5b180656e733e94ed.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.39b5b180656e733e94ed.hot-update.js",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.8c2e6a9cc419893dd2c2.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.8c2e6a9cc419893dd2c2.hot-update.js"
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.8c2e6a9cc419893dd2c2.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.8c2e6a9cc419893dd2c2.hot-update.js",
+    "/chunks/platform~chunks/shared.ba1631aa298e4a9248e8.hot-update.js": "/chunks/platform~chunks/shared.ba1631aa298e4a9248e8.hot-update.js",
+    "/chunks/platform~chunks/shared.8ea1ab78173370489946.hot-update.js": "/chunks/platform~chunks/shared.8ea1ab78173370489946.hot-update.js",
+    "/chunks/platform~chunks/shared.9f874674b2204b490179.hot-update.js": "/chunks/platform~chunks/shared.9f874674b2204b490179.hot-update.js",
+    "/chunks/platform~chunks/shared.17b8e6d0425801abe4df.hot-update.js": "/chunks/platform~chunks/shared.17b8e6d0425801abe4df.hot-update.js",
+    "/chunks/platform~chunks/shared.60692dc21652e6e3698f.hot-update.js": "/chunks/platform~chunks/shared.60692dc21652e6e3698f.hot-update.js",
+    "/chunks/platform~chunks/shared.5efb2973a05d26028ac2.hot-update.js": "/chunks/platform~chunks/shared.5efb2973a05d26028ac2.hot-update.js",
+    "/chunks/platform~chunks/shared.18ceb33c58bdd627f256.hot-update.js": "/chunks/platform~chunks/shared.18ceb33c58bdd627f256.hot-update.js",
+    "/js/main.37325063bbcf18077cca.hot-update.js": "/js/main.37325063bbcf18077cca.hot-update.js",
+    "/chunks/platform.1d69e4da363955188858.hot-update.js": "/chunks/platform.1d69e4da363955188858.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.e9a5f864a3048dfb9c83.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.e9a5f864a3048dfb9c83.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.9e987adaf7964b3a65b7.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.9e987adaf7964b3a65b7.hot-update.js",
+    "/chunks/platform.d36d110bd57ac5d48a29.hot-update.js": "/chunks/platform.d36d110bd57ac5d48a29.hot-update.js",
+    "/chunks/platform.813ba38008b6c5609e01.hot-update.js": "/chunks/platform.813ba38008b6c5609e01.hot-update.js",
+    "/chunks/my-shared-items.020a83387a82a5e93d40.hot-update.js": "/chunks/my-shared-items.020a83387a82a5e93d40.hot-update.js",
+    "/chunks/my-shared-items.4e3570f0571efb82a7df.hot-update.js": "/chunks/my-shared-items.4e3570f0571efb82a7df.hot-update.js",
+    "/chunks/my-shared-items.77cacc6fb0fbc160eb9f.hot-update.js": "/chunks/my-shared-items.77cacc6fb0fbc160eb9f.hot-update.js",
+    "/chunks/my-shared-items.469bc92c4297c81646c9.hot-update.js": "/chunks/my-shared-items.469bc92c4297c81646c9.hot-update.js",
+    "/chunks/my-shared-items.dace92ddeaccd0d46416.hot-update.js": "/chunks/my-shared-items.dace92ddeaccd0d46416.hot-update.js",
+    "/chunks/my-shared-items.b829029469f43b486656.hot-update.js": "/chunks/my-shared-items.b829029469f43b486656.hot-update.js",
+    "/chunks/my-shared-items.aa8d030f586f4395bec8.hot-update.js": "/chunks/my-shared-items.aa8d030f586f4395bec8.hot-update.js",
+    "/chunks/platform.9ad0ef8fee59bb1adc7e.hot-update.js": "/chunks/platform.9ad0ef8fee59bb1adc7e.hot-update.js",
+    "/chunks/platform.df24423bb100d65f95b2.hot-update.js": "/chunks/platform.df24423bb100d65f95b2.hot-update.js",
+    "/chunks/platform.395fb3d3b8655c35d432.hot-update.js": "/chunks/platform.395fb3d3b8655c35d432.hot-update.js",
+    "/chunks/files.aa6095b0ad17288c4e2b.hot-update.js": "/chunks/files.aa6095b0ad17288c4e2b.hot-update.js",
+    "/chunks/platform.aa6095b0ad17288c4e2b.hot-update.js": "/chunks/platform.aa6095b0ad17288c4e2b.hot-update.js",
+    "/chunks/files.cfac46b68565478d49fd.hot-update.js": "/chunks/files.cfac46b68565478d49fd.hot-update.js",
+    "/chunks/files.9116708675f8f771db46.hot-update.js": "/chunks/files.9116708675f8f771db46.hot-update.js",
+    "/chunks/platform.add9ccb830627ecc0053.hot-update.js": "/chunks/platform.add9ccb830627ecc0053.hot-update.js",
+    "/chunks/files.314399fd98e486ddeec8.hot-update.js": "/chunks/files.314399fd98e486ddeec8.hot-update.js",
+    "/chunks/files.195c41ff402d71f78d89.hot-update.js": "/chunks/files.195c41ff402d71f78d89.hot-update.js",
+    "/chunks/files.039620e9e8ac4dceea14.hot-update.js": "/chunks/files.039620e9e8ac4dceea14.hot-update.js",
+    "/chunks/files.43bfd26b5da85d95606c.hot-update.js": "/chunks/files.43bfd26b5da85d95606c.hot-update.js",
+    "/chunks/files.063ef39ea44724ca000e.hot-update.js": "/chunks/files.063ef39ea44724ca000e.hot-update.js",
+    "/chunks/files.8cc8af8ce770aea9af05.hot-update.js": "/chunks/files.8cc8af8ce770aea9af05.hot-update.js",
+    "/chunks/files.36f269e9b4bd36b2a12e.hot-update.js": "/chunks/files.36f269e9b4bd36b2a12e.hot-update.js",
+    "/chunks/files.22047aec9616cb7f6f55.hot-update.js": "/chunks/files.22047aec9616cb7f6f55.hot-update.js",
+    "/chunks/files.92267dec655db5252f56.hot-update.js": "/chunks/files.92267dec655db5252f56.hot-update.js",
+    "/chunks/files.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/files.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/my-shared-items.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/my-shared-items.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/recent-uploads.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/recent-uploads.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/shared.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/shared.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/shared/files.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/shared/files.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/trash.8325f7592bcbf17b6d7d.hot-update.js": "/chunks/trash.8325f7592bcbf17b6d7d.hot-update.js",
+    "/chunks/files.17b842f815cd761c306a.hot-update.js": "/chunks/files.17b842f815cd761c306a.hot-update.js",
+    "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.17b842f815cd761c306a.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared/files~chunks/trash.17b842f815cd761c306a.hot-update.js",
+    "/chunks/my-shared-items.17b842f815cd761c306a.hot-update.js": "/chunks/my-shared-items.17b842f815cd761c306a.hot-update.js",
+    "/chunks/recent-uploads.17b842f815cd761c306a.hot-update.js": "/chunks/recent-uploads.17b842f815cd761c306a.hot-update.js",
+    "/chunks/shared.17b842f815cd761c306a.hot-update.js": "/chunks/shared.17b842f815cd761c306a.hot-update.js",
+    "/chunks/shared/files.17b842f815cd761c306a.hot-update.js": "/chunks/shared/files.17b842f815cd761c306a.hot-update.js",
+    "/chunks/trash.17b842f815cd761c306a.hot-update.js": "/chunks/trash.17b842f815cd761c306a.hot-update.js",
+    "/chunks/files.64656a635ff7b9ced7ef.hot-update.js": "/chunks/files.64656a635ff7b9ced7ef.hot-update.js",
+    "/chunks/files.139b75ccc41ab37438ea.hot-update.js": "/chunks/files.139b75ccc41ab37438ea.hot-update.js",
+    "/chunks/files.a975c769bc6b11718748.hot-update.js": "/chunks/files.a975c769bc6b11718748.hot-update.js",
+    "/chunks/shared/files.9cc897e59f71af0dbe25.hot-update.js": "/chunks/shared/files.9cc897e59f71af0dbe25.hot-update.js",
+    "/chunks/shared/files.5e8039e09c0ccf27a00f.hot-update.js": "/chunks/shared/files.5e8039e09c0ccf27a00f.hot-update.js",
+    "/js/main.14333b3d60f45654b691.hot-update.js": "/js/main.14333b3d60f45654b691.hot-update.js",
+    "/chunks/files.14333b3d60f45654b691.hot-update.js": "/chunks/files.14333b3d60f45654b691.hot-update.js",
+    "/chunks/files~chunks/shared/files.js": "/chunks/files~chunks/shared/files.js?id=5e3e9744678568ca2f0c",
+    "/chunks/shared/files.14333b3d60f45654b691.hot-update.js": "/chunks/shared/files.14333b3d60f45654b691.hot-update.js",
+    "/chunks/shared/files.d967d179d27e7903ddaf.hot-update.js": "/chunks/shared/files.d967d179d27e7903ddaf.hot-update.js",
+    "/chunks/shared/files.5a9af8986ff39f051f1a.hot-update.js": "/chunks/shared/files.5a9af8986ff39f051f1a.hot-update.js",
+    "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js": "/chunks/shared/files.4618b7b0d57385b7f2da.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/CreateListMobile.vue b/resources/js/components/FilesView/CreateListMobile.vue
deleted file mode 100644
index caa383dc..00000000
--- a/resources/js/components/FilesView/CreateListMobile.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-<template>
-    <MenuMobile name="create-list">
-        <MenuMobileGroup>
-			<OptionGroup>
-				<OptionUpload :class="{'is-inactive': canUploadInView || !hasCapacity }" :title="$t('actions.upload')" is-hover-disabled="true" />
-			</OptionGroup>
-			<OptionGroup>
-				<Option @click.stop.native="$createTeamFolder" :title="$t('Create Team Folder')" icon="users" is-hover-disabled="true" />
-				<Option @click.stop.native="createFolder" :class="{'is-inactive': canCreateFolderInView }" :title="$t('actions.create_folder')" icon="folder-plus" is-hover-disabled="true" />
-			</OptionGroup>
-        </MenuMobileGroup>
-    </MenuMobile>
-</template>
-
-<script>
-import MenuMobileGroup from '/resources/js/components/Mobile/MenuMobileGroup'
-import OptionUpload from '/resources/js/components/FilesView/OptionUpload'
-import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
-import MenuMobile from '/resources/js/components/Mobile/MenuMobile'
-import Option from '/resources/js/components/FilesView/Option'
-import {events} from '/resources/js/bus'
-
-export default {
-    name: 'MobileContextMenu',
-    components: {
-        MenuMobileGroup,
-		OptionUpload,
-        OptionGroup,
-        MenuMobile,
-        Option,
-    },
-	computed: {
-		canUploadInView() {
-			return !this.$isThisRoute(this.$route, ['Files', 'Public'])
-		},
-		hasCapacity() {
-			// Check if storage limitation is set
-			if (!this.$store.getters.config.storageLimit) return true
-
-			// Check if user is loaded
-			if (!this.$store.getters.user) return true
-
-			// Check if user has storage
-			return this.$store.getters.user.data.attributes.storage.used <= 100
-		},
-		canCreateFolderInView() {
-			return !this.$isThisRoute(this.$route, ['Files', 'Public'])
-		},
-	},
-    methods: {
-		createFolder() {
-			events.$emit('popup:open', {name: 'create-folder'})
-		},
-    }
-}
-</script>
diff --git a/resources/js/components/FilesView/MobileCreateMenu.vue b/resources/js/components/FilesView/MobileCreateMenu.vue
new file mode 100644
index 00000000..b0d9d06b
--- /dev/null
+++ b/resources/js/components/FilesView/MobileCreateMenu.vue
@@ -0,0 +1,26 @@
+<template>
+    <MenuMobile @click.native.capture="closeMenu" name="create-list">
+        <MenuMobileGroup>
+			<slot />
+        </MenuMobileGroup>
+    </MenuMobile>
+</template>
+
+<script>
+import MenuMobileGroup from '/resources/js/components/Mobile/MenuMobileGroup'
+import MenuMobile from '/resources/js/components/Mobile/MenuMobile'
+import {events} from '/resources/js/bus'
+
+export default {
+    name: 'MobileContextMenu',
+    components: {
+        MenuMobileGroup,
+        MenuMobile,
+    },
+    methods: {
+    	closeMenu() {
+    		events.$emit('mobile-menu:hide')
+		},
+    }
+}
+</script>
diff --git a/resources/js/components/FilesView/MultiSelectToolbar.vue b/resources/js/components/FilesView/MobileMultiSelectToolbar.vue
similarity index 98%
rename from resources/js/components/FilesView/MultiSelectToolbar.vue
rename to resources/js/components/FilesView/MobileMultiSelectToolbar.vue
index af7ce3eb..c1af248a 100644
--- a/resources/js/components/FilesView/MultiSelectToolbar.vue
+++ b/resources/js/components/FilesView/MobileMultiSelectToolbar.vue
@@ -16,7 +16,7 @@ import {events} from '/resources/js/bus'
 import {mapGetters} from 'vuex'
 
 export default {
-    name: 'MultiSelectToolbar',
+    name: 'MobileMultiSelectToolbar',
     components: {
 		ToolbarButton,
 	},
diff --git a/resources/js/components/Others/Popup/PopupContent.vue b/resources/js/components/Others/Popup/PopupContent.vue
index 0f2c77c4..9ac6e067 100644
--- a/resources/js/components/Others/Popup/PopupContent.vue
+++ b/resources/js/components/Others/Popup/PopupContent.vue
@@ -32,6 +32,8 @@
             left: 0;
             right: 0;
             height: initial;
+			overflow-y: auto;
+			overflow-x: hidden;
         }
     }
 
diff --git a/resources/js/components/Others/TreeMenuNavigator.vue b/resources/js/components/Others/TreeMenuNavigator.vue
index 83a3a1e4..46507229 100644
--- a/resources/js/components/Others/TreeMenuNavigator.vue
+++ b/resources/js/components/Others/TreeMenuNavigator.vue
@@ -46,6 +46,9 @@
 			...mapGetters([
 				'clipboard'
 			]),
+			isSelected() {
+				return this.$route.params.id === this.nodes.id
+			},
 			disabledFolder() {
 				let disableFolder = false
 				if (this.draggedItem.length > 0) {
@@ -82,7 +85,6 @@
 		data() {
 			return {
 				disableChildren: false,
-				isSelected: false,
 				isVisible: false,
 				draggedItem: [],
 				area: false,
diff --git a/resources/js/views/FileView/Components/PanelNavigationFiles.vue b/resources/js/views/FileView/Components/PanelNavigationFiles.vue
index a2866357..078015ed 100644
--- a/resources/js/views/FileView/Components/PanelNavigationFiles.vue
+++ b/resources/js/views/FileView/Components/PanelNavigationFiles.vue
@@ -84,7 +84,7 @@
 
 					<router-link :to="{name: 'Files', params: {id: folder.id}}" v-for="folder in favourites" :key="folder.id" class="menu-list-item">
 						<div class="text-theme">
-							<folder-icon size="17" class="folder-icon text-theme" />
+							<folder-icon size="17" class="folder-icon" />
 							<span class="label text-theme">{{ folder.name }}</span>
 						</div>
 						<x-icon @click.stop="$removeFavourite(folder)" size="17" class="delete-icon" />
diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue
index b59c5dea..c10d36e0 100644
--- a/resources/js/views/FileView/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -1,5 +1,41 @@
 <template>
 	<div>
+		<MobileContextMenu>
+			<OptionGroup v-if="item && isFolder">
+				<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
+            </OptionGroup>
+
+			<OptionGroup v-if="item">
+				<Option @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
+				<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
+				<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
+			</OptionGroup>
+			<OptionGroup v-if="item">
+				<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+				<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
+			</OptionGroup>
+
+            <OptionGroup v-if="item">
+                <Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
+            </OptionGroup>
+		</MobileContextMenu>
+
+		<MobileCreateMenu>
+			<OptionGroup>
+				<OptionUpload :class="{'is-inactive': !hasCapacity }" :title="$t('actions.upload')" is-hover-disabled="true" />
+			</OptionGroup>
+			<OptionGroup>
+				<Option @click.stop.native="$createTeamFolder" :title="$t('Create Team Folder')" icon="users" is-hover-disabled="true" />
+				<Option @click.stop.native="createFolder" :title="$t('actions.create_folder')" icon="folder-plus" is-hover-disabled="true" />
+			</OptionGroup>
+		</MobileCreateMenu>
+
+		<MobileMultiSelectToolbar>
+			<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive' : clipboard.length < 1}" />
+			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
+            <ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
+		</MobileMultiSelectToolbar>
+
 		<ContextMenu>
 			<template v-slot:empty-select>
 				<OptionGroup>
@@ -40,26 +76,6 @@
 			</template>
 		</ContextMenu>
 
-		<MobileContextMenu>
-			<OptionGroup v-if="item && isFolder">
-				<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
-            </OptionGroup>
-
-			<OptionGroup v-if="item">
-				<Option @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
-				<Option @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
-				<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
-			</OptionGroup>
-			<OptionGroup v-if="item">
-				<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
-				<Option @click.native="$updateTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
-			</OptionGroup>
-
-            <OptionGroup v-if="item">
-                <Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
-            </OptionGroup>
-		</MobileContextMenu>
-
 		<FileBrowser>
 			<template v-slot:file-actions-mobile>
 				<MobileActionButton @click.native="$openSpotlight" icon="search">
@@ -91,22 +107,18 @@
                 </ButtonUpload>
 			</template>
 		</FileBrowser>
-
-		<MultiSelectToolbar>
-			<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive' : clipboard.length < 1}" />
-			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
-            <ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
-		</MultiSelectToolbar>
 	</div>
 </template>
 
 <script>
     import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
-	import MultiSelectToolbar from "/resources/js/components/FilesView/MultiSelectToolbar"
+	import MobileMultiSelectToolbar from "/resources/js/components/FilesView/MobileMultiSelectToolbar"
 	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
 	import MobileContextMenu from "/resources/js/components/FilesView/MobileContextMenu"
+	import MobileCreateMenu from '/resources/js/components/FilesView/MobileCreateMenu'
     import ButtonUpload from '/resources/js/components/FilesView/ButtonUpload'
 	import ToolbarButton from '/resources/js/components/FilesView/ToolbarButton'
+	import OptionUpload from '/resources/js/components/FilesView/OptionUpload'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
 	import OptionGroup from '/resources/js/components/FilesView/OptionGroup'
@@ -118,11 +130,13 @@
 		name: 'Files',
 		components: {
 			MobileActionButtonUpload,
-			MultiSelectToolbar,
+			MobileMultiSelectToolbar,
 			MobileActionButton,
 			MobileContextMenu,
+			MobileCreateMenu,
 			ToolbarButton,
 			ButtonUpload,
+			OptionUpload,
 			OptionGroup,
 			FileBrowser,
 			ContextMenu,
@@ -131,8 +145,16 @@
 		computed: {
 			...mapGetters([
 				'clipboard',
+				'config',
 				'user',
 			]),
+			hasCapacity() {
+				// Check if storage limitation is set
+				if (!this.config.storageLimit) return true
+
+				// Check if user has storage
+				return this.user && this.user.data.attributes.storage.used <= 100
+			},
 			isFolder() {
 				return this.item && this.item.type === 'folder'
 			},
@@ -180,6 +202,9 @@
 					this.$store.dispatch('removeFromFavourites', this.item)
 				}
 			},
+			createFolder() {
+				events.$emit('popup:open', {name: 'create-folder'})
+			},
 		},
 		created() {
 			this.$store.dispatch('getFolder', this.$route.params.id)
diff --git a/resources/js/views/FileView/MySharedItems.vue b/resources/js/views/FileView/MySharedItems.vue
index e46dc5bc..1dcce3ee 100644
--- a/resources/js/views/FileView/MySharedItems.vue
+++ b/resources/js/views/FileView/MySharedItems.vue
@@ -32,7 +32,7 @@
 			</template>
 		</ContextMenu>
 
-		<MobileContextMenu v-if="item">
+		<MobileContextMenu>
 			<OptionGroup v-if="isFolder">
 				<Option @click.native="addToFavourites" :title="isInFavourites ? $t('context_menu.remove_from_favourites') : $t('context_menu.add_to_favourites')" icon="favourites" />
 			</OptionGroup>
@@ -41,7 +41,7 @@
 				<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
 			</OptionGroup>
 			<OptionGroup>
-				<Option @click.native="$shareFileOrFolder(item)" :title="item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+				<Option @click.native="$shareFileOrFolder(item)" :title="item && item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
 			</OptionGroup>
 			<OptionGroup>
 				<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
@@ -69,17 +69,17 @@
 			</template>
 		</FileBrowser>
 
-		<MultiSelectToolbar>
+		<MobileMultiSelectToolbar>
 			<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
 			<ToolbarButton @click.native="$shareCancel" class="action-btn" source="shared-off" />
-		</MultiSelectToolbar>
+		</MobileMultiSelectToolbar>
 	</div>
 </template>
 
 <script>
     import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
 	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
-	import MultiSelectToolbar from "/resources/js/components/FilesView/MultiSelectToolbar"
+	import MobileMultiSelectToolbar from "/resources/js/components/FilesView/MobileMultiSelectToolbar"
 	import MobileContextMenu from "/resources/js/components/FilesView/MobileContextMenu"
 	import ToolbarButton from '/resources/js/components/FilesView/ToolbarButton'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
@@ -94,7 +94,7 @@
 		components: {
 			MobileActionButtonUpload,
 			MobileActionButton,
-			MultiSelectToolbar,
+			MobileMultiSelectToolbar,
 			MobileContextMenu,
 			ToolbarButton,
 			OptionGroup,
diff --git a/resources/js/views/FileView/Public.vue b/resources/js/views/FileView/Public.vue
index ba806d01..0bd26de1 100644
--- a/resources/js/views/FileView/Public.vue
+++ b/resources/js/views/FileView/Public.vue
@@ -1,5 +1,43 @@
 <template>
 	<div>
+		<MobileContextMenu>
+			<template v-slot:editor>
+				<OptionGroup>
+					<Option v-if="item" @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
+					<Option v-if="item" @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
+					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
+				</OptionGroup>
+				<OptionGroup>
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
+				</OptionGroup>
+			</template>
+			<template v-slot:visitor>
+				<OptionGroup>
+					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
+				</OptionGroup>
+			</template>
+		</MobileContextMenu>
+
+		<MobileCreateMenu>
+			<OptionGroup>
+				<OptionUpload :title="$t('actions.upload')" is-hover-disabled="true" />
+			</OptionGroup>
+			<OptionGroup>
+				<Option @click.stop.native="createFolder" :title="$t('actions.create_folder')" icon="folder-plus" is-hover-disabled="true" />
+			</OptionGroup>
+		</MobileCreateMenu>
+
+		<MobileMultiSelectToolbar>
+			<template v-slot:visitor>
+				<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
+			</template>
+			<template v-slot:editor>
+				<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive': clipboard.length < 1}" />
+				<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive': clipboard.length < 1}" :action="$t('actions.delete')" />
+				<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
+			</template>
+		</MobileMultiSelectToolbar>
+
 		<ContextMenu>
 			<template v-slot:empty-select v-if="$checkPermission('editor')">
 				<OptionGroup>
@@ -30,24 +68,6 @@
 			</template>
 		</ContextMenu>
 
-		<MobileContextMenu>
-			<template v-slot:editor>
-				<OptionGroup>
-					<Option v-if="item" @click.native="$renameFileOrFolder(item)" :title="$t('context_menu.rename')" icon="rename" />
-					<Option v-if="item" @click.native="$moveFileOrFolder(item)" :title="$t('context_menu.move')" icon="move-item" />
-					<Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
-				</OptionGroup>
-				<OptionGroup>
-					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
-				</OptionGroup>
-			</template>
-			<template v-slot:visitor>
-				<OptionGroup>
-					<Option @click.native="$downloadSelection(item)" :title="$t('context_menu.download')" icon="download" />
-				</OptionGroup>
-			</template>
-		</MobileContextMenu>
-
 		<FileBrowser>
 			<template v-slot:file-actions-mobile>
 				<template v-if="$checkPermission('editor')">
@@ -96,25 +116,16 @@
 				</template>
 			</template>
 		</FileBrowser>
-
-		<MultiSelectToolbar>
-			<template v-slot:visitor>
-				<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
-			</template>
-			<template v-slot:editor>
-				<ToolbarButton @click.native="$moveFileOrFolder(clipboard)" class="action-btn" source="move" :action="$t('actions.move')" :class="{'is-inactive': clipboard.length < 1}" />
-				<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive': clipboard.length < 1}" :action="$t('actions.delete')" />
-				<ToolbarButton @click.native="downloadItem" class="action-btn" source="download" :action="$t('actions.download')" />
-			</template>
-		</MultiSelectToolbar>
 	</div>
 </template>
 
 <script>
-	import MultiSelectToolbar from "/resources/js/components/FilesView/MultiSelectToolbar"
+	import MobileMultiSelectToolbar from "/resources/js/components/FilesView/MobileMultiSelectToolbar"
 	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
 	import MobileContextMenu from "/resources/js/components/FilesView/MobileContextMenu"
+	import MobileCreateMenu from '/resources/js/components/FilesView/MobileCreateMenu'
 	import ToolbarButton from '/resources/js/components/FilesView/ToolbarButton'
+	import OptionUpload from '/resources/js/components/FilesView/OptionUpload'
     import ButtonUpload from '/resources/js/components/FilesView/ButtonUpload'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
 	import ContextMenu from '/resources/js/components/FilesView/ContextMenu'
@@ -126,10 +137,12 @@
 	export default {
 		name: 'Files',
 		components: {
+			MobileMultiSelectToolbar,
 			MobileActionButton,
-			MultiSelectToolbar,
 			MobileContextMenu,
+			MobileCreateMenu,
 			ToolbarButton,
+			OptionUpload,
 			ButtonUpload,
 			OptionGroup,
 			FileBrowser,
@@ -146,6 +159,11 @@
 				item: undefined,
 			}
 		},
+		methods: {
+			createFolder() {
+				events.$emit('popup:open', {name: 'create-folder'})
+			},
+		},
 		created() {
 			this.$store.dispatch('getSharedFolder', this.$route.params.id)
 
diff --git a/resources/js/views/FileView/RecentUploads.vue b/resources/js/views/FileView/RecentUploads.vue
index 331b9558..2d47ba96 100644
--- a/resources/js/views/FileView/RecentUploads.vue
+++ b/resources/js/views/FileView/RecentUploads.vue
@@ -59,17 +59,17 @@
 			</template>
 		</FileBrowser>
 
-		<MultiSelectToolbar>
+		<MobileMultiSelectToolbar>
 			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
 			<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
-		</MultiSelectToolbar>
+		</MobileMultiSelectToolbar>
 	</div>
 </template>
 
 <script>
     import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
 	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
-	import MultiSelectToolbar from "/resources/js/components/FilesView/MultiSelectToolbar"
+	import MobileMultiSelectToolbar from "/resources/js/components/FilesView/MobileMultiSelectToolbar"
 	import MobileContextMenu from "/resources/js/components/FilesView/MobileContextMenu"
 	import ToolbarButton from '/resources/js/components/FilesView/ToolbarButton'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
@@ -83,7 +83,7 @@
 		name: 'RecentUploads',
 		components: {
 			MobileActionButtonUpload,
-			MultiSelectToolbar,
+			MobileMultiSelectToolbar,
 			MobileActionButton,
 			MobileContextMenu,
 			ToolbarButton,
diff --git a/resources/js/views/FileView/Trash.vue b/resources/js/views/FileView/Trash.vue
index 31b72e37..e2bb20aa 100644
--- a/resources/js/views/FileView/Trash.vue
+++ b/resources/js/views/FileView/Trash.vue
@@ -66,17 +66,17 @@
 			</template>
 		</FileBrowser>
 
-		<MultiSelectToolbar>
+		<MobileMultiSelectToolbar>
 			<ToolbarButton @click.native="$deleteFileOrFolder(clipboard)" class="action-btn" source="trash" :class="{'is-inactive' : clipboard.length < 1}" :action="$t('actions.delete')" />
 			<ToolbarButton @click.native="$downloadSelection(item)" class="action-btn" source="download" :action="$t('actions.download')" />
-		</MultiSelectToolbar>
+		</MobileMultiSelectToolbar>
 	</div>
 </template>
 
 <script>
     import MobileActionButtonUpload from '/resources/js/components/FilesView/MobileActionButtonUpload'
 	import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
-	import MultiSelectToolbar from "/resources/js/components/FilesView/MultiSelectToolbar"
+	import MobileMultiSelectToolbar from "/resources/js/components/FilesView/MobileMultiSelectToolbar"
 	import MobileContextMenu from "/resources/js/components/FilesView/MobileContextMenu"
 	import ToolbarButton from '/resources/js/components/FilesView/ToolbarButton'
 	import FileBrowser from '/resources/js/components/FilesView/FileBrowser'
@@ -90,7 +90,7 @@
 		name: 'Trash',
 		components: {
 			MobileActionButtonUpload,
-			MultiSelectToolbar,
+			MobileMultiSelectToolbar,
 			MobileActionButton,
 			MobileContextMenu,
 			ToolbarButton,
diff --git a/resources/js/views/Platform.vue b/resources/js/views/Platform.vue
index 82793afa..1cbeb6c6 100644
--- a/resources/js/views/Platform.vue
+++ b/resources/js/views/Platform.vue
@@ -22,8 +22,6 @@
         <FileSortingMobile />
         <FileFilterMobile />
 
-		<CreateListMobile />
-
         <!--Navigations-->
         <MobileNavigation />
 
@@ -45,7 +43,6 @@
     import FileSortingMobile from '/resources/js/components/FilesView/FileSortingMobile'
     import SidebarNavigation from '/resources/js/components/Sidebar/SidebarNavigation'
     import FileFilterMobile from '/resources/js/components/FilesView/FileFilterMobile'
-    import CreateListMobile from '/resources/js/components/FilesView/CreateListMobile'
     import CreateFolderPopup from '/resources/js/components/Others/CreateFolderPopup'
     import ProcessingPopup from '/resources/js/components/FilesView/ProcessingPopup'
     import MobileNavigation from '/resources/js/components/Others/MobileNavigation'
@@ -66,15 +63,14 @@
         name: 'Platform',
         components: {
 			CreateTeamFolderPopup,
+			PanelNavigationFiles,
             CreateFolderPopup,
             FileSortingMobile,
             SidebarNavigation,
-			CreateListMobile,
             FileFilterMobile,
             MobileNavigation,
             ShareCreatePopup,
             ProcessingPopup,
-			PanelNavigationFiles,
             RenameItemPopup,
             ShareEditPopup,
 			DesktopToolbar,
diff --git a/resources/js/views/Shared.vue b/resources/js/views/Shared.vue
index 6abc7d88..f541a565 100644
--- a/resources/js/views/Shared.vue
+++ b/resources/js/views/Shared.vue
@@ -17,7 +17,7 @@
 
         <!-- Mobile components -->
         <FileSortingMobile />
-        <MultiSelectToolbar />
+        <MobileMultiSelectToolbar />
 
         <!--Others-->
         <Vignette />
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-    import MultiSelectToolbar from '/resources/js/components/FilesView/MultiSelectToolbar'
+    import MobileMultiSelectToolbar from '/resources/js/components/FilesView/MobileMultiSelectToolbar'
     import FileSortingMobile from '/resources/js/components/FilesView/FileSortingMobile'
     import CreateFolderPopup from '/resources/js/components/Others/CreateFolderPopup'
     import ProcessingPopup from '/resources/js/components/FilesView/ProcessingPopup'
@@ -55,7 +55,7 @@
         name: 'Shared',
         components: {
 			NavigationSharePanel,
-            MultiSelectToolbar,
+            MobileMultiSelectToolbar,
             CreateFolderPopup,
             FileSortingMobile,
             ProcessingPopup,
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index cc6dafe0..ce7939b0 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -169,6 +169,10 @@
       margin-right: 9px;
       vertical-align: middle;
       margin-top: -1px;
+
+      path {
+        color: inherit;
+      }
     }
 
     .delete-icon {