diff --git a/config/language-translations.php b/config/language-translations.php
index 08c38ac0..23cfc4f1 100644
--- a/config/language-translations.php
+++ b/config/language-translations.php
@@ -586,10 +586,10 @@ return [
         'sidebar.favourites'                                 => 'Favourites',
         'sidebar.favourites_empty'                           => 'Drag here your favourite folder.',
         'sidebar.folders_empty'                              => 'Create some new folder.',
-        'sidebar.home'                                       => 'Files',
+        'sidebar.home'                                       => 'My Files',
         'sidebar.latest'                                     => 'Recent Uploads',
         'sidebar.locations_title'                            => 'Base',
-        'sidebar.my_shared'                                  => 'Shared Items',
+        'sidebar.my_shared'                                  => 'Publicly Shared',
         'sidebar.navigator_title'                            => 'Navigator',
         'sidebar.tools_title'                                => 'Tools',
         'storage.audios'                                     => 'Audios',
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 898c88fa..f1734f90 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -12,7 +12,7 @@
     "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=510e6c1b1017a73a40a6",
     "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=90270d0c5aeb5c50dacf",
     "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=892ef3945a5b63ccd634",
-    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=d5b8a88e17de912207cc",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=14818f04811188b965c8",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6177253e847903d63adc",
     "/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=aa284736dda7647d5c9e",
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=6bd4516589f23ec25ae6",
@@ -38,7 +38,7 @@
     "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=6c86916c6c6f679fa86b",
     "/chunks/email-verified.js": "/chunks/email-verified.js?id=253ce639751cc8799458",
     "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=ead3443a6472510c2ea7",
-    "/chunks/files.js": "/chunks/files.js?id=357a135d5a75ba88ce23",
+    "/chunks/files.js": "/chunks/files.js?id=babd50e0bfd6fd3d3b2d",
     "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=d0a2e05e3e243b2e2c4e",
     "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=f89157279e973d299fc7",
     "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js": "/chunks/files~chunks/shared-with-me~chunks/shared/files~chunks/team-folders.js?id=4b8864f9265f55f61cf7",
@@ -57,9 +57,9 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=4b3d3d91faa908b876ac",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=b5017d712135057283c9",
     "/chunks/plans.js": "/chunks/plans.js?id=6fca685daa45f22e4c8f",
-    "/chunks/platform.js": "/chunks/platform.js?id=fe765bee5f683ba2f611",
+    "/chunks/platform.js": "/chunks/platform.js?id=d009f81f708134f5775b",
     "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js": "/chunks/platform~chunks/settings-subscription~chunks/shared~chunks/user-subscription.js?id=8656b69a97cace919251",
-    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=deeb9a69d518ff12d81e",
+    "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=b4b2fd73bdfecb32c067",
     "/chunks/profile.js": "/chunks/profile.js?id=0638997b77c6f1246062",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=58edfb3a35062e1ba4e0",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
@@ -817,5 +817,86 @@
     "/chunks/platform.f6a88786ee5a3bd2b5f1.hot-update.js": "/chunks/platform.f6a88786ee5a3bd2b5f1.hot-update.js",
     "/chunks/platform.4846404e57f725f342f9.hot-update.js": "/chunks/platform.4846404e57f725f342f9.hot-update.js",
     "/chunks/platform.6af4f0f008df9b69a334.hot-update.js": "/chunks/platform.6af4f0f008df9b69a334.hot-update.js",
-    "/chunks/platform.4158f79f7ac36092fb9a.hot-update.js": "/chunks/platform.4158f79f7ac36092fb9a.hot-update.js"
+    "/chunks/platform.4158f79f7ac36092fb9a.hot-update.js": "/chunks/platform.4158f79f7ac36092fb9a.hot-update.js",
+    "/js/main.18388c7ba08156940f1f.hot-update.js": "/js/main.18388c7ba08156940f1f.hot-update.js",
+    "/js/main.09ca27bc05fb08254108.hot-update.js": "/js/main.09ca27bc05fb08254108.hot-update.js",
+    "/chunks/platform~chunks/shared.9f94515696d9066869b4.hot-update.js": "/chunks/platform~chunks/shared.9f94515696d9066869b4.hot-update.js",
+    "/chunks/platform~chunks/shared.292379a5a98712f94fd4.hot-update.js": "/chunks/platform~chunks/shared.292379a5a98712f94fd4.hot-update.js",
+    "/chunks/platform~chunks/shared.71ebd1865597407863bb.hot-update.js": "/chunks/platform~chunks/shared.71ebd1865597407863bb.hot-update.js",
+    "/chunks/platform~chunks/shared.bd85006c731622b06bd1.hot-update.js": "/chunks/platform~chunks/shared.bd85006c731622b06bd1.hot-update.js",
+    "/chunks/platform~chunks/shared.00d6fe5589d9115e1a8d.hot-update.js": "/chunks/platform~chunks/shared.00d6fe5589d9115e1a8d.hot-update.js",
+    "/chunks/platform~chunks/shared.3f9e3815c6471f82bc89.hot-update.js": "/chunks/platform~chunks/shared.3f9e3815c6471f82bc89.hot-update.js",
+    "/chunks/platform~chunks/shared.84ed859c8f42b0222818.hot-update.js": "/chunks/platform~chunks/shared.84ed859c8f42b0222818.hot-update.js",
+    "/chunks/platform~chunks/shared.e9443cda288cfda51905.hot-update.js": "/chunks/platform~chunks/shared.e9443cda288cfda51905.hot-update.js",
+    "/chunks/platform~chunks/shared.0749fe266abd329d0ad7.hot-update.js": "/chunks/platform~chunks/shared.0749fe266abd329d0ad7.hot-update.js",
+    "/chunks/platform~chunks/shared.dd690120a6691fc2172a.hot-update.js": "/chunks/platform~chunks/shared.dd690120a6691fc2172a.hot-update.js",
+    "/chunks/platform~chunks/shared.23bfa1560fcfc4e982d1.hot-update.js": "/chunks/platform~chunks/shared.23bfa1560fcfc4e982d1.hot-update.js",
+    "/chunks/platform~chunks/shared.601bcbf03a924e98a17a.hot-update.js": "/chunks/platform~chunks/shared.601bcbf03a924e98a17a.hot-update.js",
+    "/chunks/platform~chunks/shared.315f1deb9dc145fd47eb.hot-update.js": "/chunks/platform~chunks/shared.315f1deb9dc145fd47eb.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.b73e2277f94065b9ccd5.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.b73e2277f94065b9ccd5.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.73b7a839cc866bc1eaee.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.73b7a839cc866bc1eaee.hot-update.js",
+    "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.b387abd3ba700e53f7e1.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.b387abd3ba700e53f7e1.hot-update.js",
+    "/js/main.d2aac4873f6a91233db8.hot-update.js": "/js/main.d2aac4873f6a91233db8.hot-update.js",
+    "/chunks/admin~chunks/platform.51f01a401444bef1c478.hot-update.js": "/chunks/admin~chunks/platform.51f01a401444bef1c478.hot-update.js",
+    "/chunks/admin~chunks/platform.5cbc393b0517224d84b2.hot-update.js": "/chunks/admin~chunks/platform.5cbc393b0517224d84b2.hot-update.js",
+    "/chunks/platform.82194570aff28659583d.hot-update.js": "/chunks/platform.82194570aff28659583d.hot-update.js",
+    "/js/main.34afd67d49d5481aa408.hot-update.js": "/js/main.34afd67d49d5481aa408.hot-update.js",
+    "/js/main.f45d272e8ee9b2e6c4e2.hot-update.js": "/js/main.f45d272e8ee9b2e6c4e2.hot-update.js",
+    "/chunks/platform.754c5209412c840113c9.hot-update.js": "/chunks/platform.754c5209412c840113c9.hot-update.js",
+    "/chunks/platform.db6a4031195c9953b663.hot-update.js": "/chunks/platform.db6a4031195c9953b663.hot-update.js",
+    "/chunks/files.611c26db87bf4a6a278c.hot-update.js": "/chunks/files.611c26db87bf4a6a278c.hot-update.js",
+    "/chunks/platform.d02ebbbbd6ee58c369fb.hot-update.js": "/chunks/platform.d02ebbbbd6ee58c369fb.hot-update.js",
+    "/chunks/platform.94fb5fa6105dad15e17c.hot-update.js": "/chunks/platform.94fb5fa6105dad15e17c.hot-update.js",
+    "/chunks/platform.e0cd858f1cbb20806ea5.hot-update.js": "/chunks/platform.e0cd858f1cbb20806ea5.hot-update.js",
+    "/chunks/platform.a66f15467d8bdc295930.hot-update.js": "/chunks/platform.a66f15467d8bdc295930.hot-update.js",
+    "/chunks/platform.88155f4c14802b105ef3.hot-update.js": "/chunks/platform.88155f4c14802b105ef3.hot-update.js",
+    "/chunks/platform.5264de670698556768cb.hot-update.js": "/chunks/platform.5264de670698556768cb.hot-update.js",
+    "/chunks/platform.325582e05a299ebc7982.hot-update.js": "/chunks/platform.325582e05a299ebc7982.hot-update.js",
+    "/chunks/platform.11ad59ac57cf6b9c752e.hot-update.js": "/chunks/platform.11ad59ac57cf6b9c752e.hot-update.js",
+    "/chunks/platform.679460cbe26952c71dca.hot-update.js": "/chunks/platform.679460cbe26952c71dca.hot-update.js",
+    "/chunks/platform.d966265262fbe6407bc2.hot-update.js": "/chunks/platform.d966265262fbe6407bc2.hot-update.js",
+    "/chunks/platform.e0fd9805d1a16e3acf89.hot-update.js": "/chunks/platform.e0fd9805d1a16e3acf89.hot-update.js",
+    "/chunks/platform.4eb46935b75f31502ea8.hot-update.js": "/chunks/platform.4eb46935b75f31502ea8.hot-update.js",
+    "/chunks/platform.c58076380dc15df73417.hot-update.js": "/chunks/platform.c58076380dc15df73417.hot-update.js",
+    "/chunks/platform.bd248be89d64f46f10d2.hot-update.js": "/chunks/platform.bd248be89d64f46f10d2.hot-update.js",
+    "/chunks/platform.fff37f33c07e0fcc6941.hot-update.js": "/chunks/platform.fff37f33c07e0fcc6941.hot-update.js",
+    "/chunks/platform.7a0a34fd2a849600d362.hot-update.js": "/chunks/platform.7a0a34fd2a849600d362.hot-update.js",
+    "/chunks/platform.45d27930c9f60a5cce63.hot-update.js": "/chunks/platform.45d27930c9f60a5cce63.hot-update.js",
+    "/chunks/platform.adb825f97d28b22d2ce5.hot-update.js": "/chunks/platform.adb825f97d28b22d2ce5.hot-update.js",
+    "/chunks/platform.2213c33c8dfca6d55b43.hot-update.js": "/chunks/platform.2213c33c8dfca6d55b43.hot-update.js",
+    "/chunks/platform.1affaf5460c4a8db5b43.hot-update.js": "/chunks/platform.1affaf5460c4a8db5b43.hot-update.js",
+    "/chunks/platform.7f427173463b018ad28f.hot-update.js": "/chunks/platform.7f427173463b018ad28f.hot-update.js",
+    "/chunks/platform.7dec9a3b3fe87e919204.hot-update.js": "/chunks/platform.7dec9a3b3fe87e919204.hot-update.js",
+    "/chunks/platform.c4b8176e8d19f80ad89b.hot-update.js": "/chunks/platform.c4b8176e8d19f80ad89b.hot-update.js",
+    "/chunks/platform.0edc481ac9fda84c6227.hot-update.js": "/chunks/platform.0edc481ac9fda84c6227.hot-update.js",
+    "/chunks/platform.39b22434822732aba488.hot-update.js": "/chunks/platform.39b22434822732aba488.hot-update.js",
+    "/chunks/platform.bdefedba5bb2d02bf804.hot-update.js": "/chunks/platform.bdefedba5bb2d02bf804.hot-update.js",
+    "/chunks/platform.b2329f0c618e7a563269.hot-update.js": "/chunks/platform.b2329f0c618e7a563269.hot-update.js",
+    "/chunks/platform.02dc0e05fc64a6bcacd7.hot-update.js": "/chunks/platform.02dc0e05fc64a6bcacd7.hot-update.js",
+    "/chunks/platform.2b461344ed325b883658.hot-update.js": "/chunks/platform.2b461344ed325b883658.hot-update.js",
+    "/chunks/platform.e185a58051d3681f6312.hot-update.js": "/chunks/platform.e185a58051d3681f6312.hot-update.js",
+    "/chunks/platform.57e4a2440d2a5e61f18f.hot-update.js": "/chunks/platform.57e4a2440d2a5e61f18f.hot-update.js",
+    "/chunks/platform.40cdd7790aa7e294e57b.hot-update.js": "/chunks/platform.40cdd7790aa7e294e57b.hot-update.js",
+    "/chunks/platform.f4bfef814cbe8829e7c0.hot-update.js": "/chunks/platform.f4bfef814cbe8829e7c0.hot-update.js",
+    "/chunks/platform.5b63ad93063e541949a2.hot-update.js": "/chunks/platform.5b63ad93063e541949a2.hot-update.js",
+    "/chunks/platform.92d55da7248104369950.hot-update.js": "/chunks/platform.92d55da7248104369950.hot-update.js",
+    "/chunks/platform.da42ff87b2cacffcce59.hot-update.js": "/chunks/platform.da42ff87b2cacffcce59.hot-update.js",
+    "/chunks/platform.8319f153082bb76aea9b.hot-update.js": "/chunks/platform.8319f153082bb76aea9b.hot-update.js",
+    "/chunks/platform.30c28be0aefde0a6340c.hot-update.js": "/chunks/platform.30c28be0aefde0a6340c.hot-update.js",
+    "/chunks/platform.e34f5d6989a8170ba8b0.hot-update.js": "/chunks/platform.e34f5d6989a8170ba8b0.hot-update.js",
+    "/chunks/platform.fc0c7e44d147fbe884f9.hot-update.js": "/chunks/platform.fc0c7e44d147fbe884f9.hot-update.js",
+    "/chunks/platform.ba1e1c0ed5e4d164896f.hot-update.js": "/chunks/platform.ba1e1c0ed5e4d164896f.hot-update.js",
+    "/chunks/platform.0f4d22e36b74c3d128b2.hot-update.js": "/chunks/platform.0f4d22e36b74c3d128b2.hot-update.js",
+    "/chunks/platform.ca8155ad382102d7b3b3.hot-update.js": "/chunks/platform.ca8155ad382102d7b3b3.hot-update.js",
+    "/chunks/platform.b30a702cf6e1b9feac78.hot-update.js": "/chunks/platform.b30a702cf6e1b9feac78.hot-update.js",
+    "/chunks/platform.a46210acbe3311f9e4d2.hot-update.js": "/chunks/platform.a46210acbe3311f9e4d2.hot-update.js",
+    "/chunks/platform.7be3996b0c7e0fdfc405.hot-update.js": "/chunks/platform.7be3996b0c7e0fdfc405.hot-update.js",
+    "/chunks/platform.3945443f25f55017af79.hot-update.js": "/chunks/platform.3945443f25f55017af79.hot-update.js",
+    "/chunks/platform.6d83c40875476b001102.hot-update.js": "/chunks/platform.6d83c40875476b001102.hot-update.js",
+    "/chunks/platform.a9bb06af46cb9f5f7d44.hot-update.js": "/chunks/platform.a9bb06af46cb9f5f7d44.hot-update.js",
+    "/chunks/platform.dcdea60de0e380df9d00.hot-update.js": "/chunks/platform.dcdea60de0e380df9d00.hot-update.js",
+    "/chunks/platform.89eee88d81717926097a.hot-update.js": "/chunks/platform.89eee88d81717926097a.hot-update.js",
+    "/chunks/platform.66880990d6c0c46fc754.hot-update.js": "/chunks/platform.66880990d6c0c46fc754.hot-update.js",
+    "/chunks/platform.d8f080138fcba05877d6.hot-update.js": "/chunks/platform.d8f080138fcba05877d6.hot-update.js",
+    "/chunks/platform.cb3dfe89b682241d18d7.hot-update.js": "/chunks/platform.cb3dfe89b682241d18d7.hot-update.js"
 }
diff --git a/resources/js/components/FilesView/DesktopToolbar.vue b/resources/js/components/FilesView/DesktopToolbar.vue
index 20444215..53145126 100644
--- a/resources/js/components/FilesView/DesktopToolbar.vue
+++ b/resources/js/components/FilesView/DesktopToolbar.vue
@@ -2,13 +2,13 @@
     <div id="desktop-toolbar" class="lg:block hidden">
         <div class="toolbar-wrapper">
 			<div @click="goBack" class="location">
-				<chevron-left-icon :class="{'is-active': isNotHomepage }" class="icon-back" size="17" />
+				<chevron-left-icon :class="{'opacity-0 -translate-x-3': ! currentFolder, 'opacity-100 translate-x-0': currentFolder }" class="icon-back transform transition-all duration-200" size="17" />
 
-				<span class="location-title">
+				<span :class="{'-translate-x-4': ! currentFolder}" class="location-title transform transition-all duration-200">
 					{{ $getCurrentLocationName() }}
 				</span>
 
-				<span v-show="currentFolder" @click.stop="folderActions" class="location-more group" id="folder-actions">
+				<span :class="{'-translate-x-4 opacity-0': ! currentFolder, 'translate-x-0 opacity-100': currentFolder}" @click.stop="folderActions" class="transform location-more group transition-all duration-200" id="folder-actions">
 					<more-horizontal-icon size="14" class="icon-more group-hover-text-theme" />
 				</span>
 			</div>
@@ -84,7 +84,7 @@
 					</PopoverWrapper>
 
 					<!--Item actions-->
-					<span v-if="! $isMobile()">
+					<span v-if="! $isMobile()" class="whitespace-nowrap">
 						<ToolbarButton v-if="canShowConvertToTeamFolder" @click.native="$convertAsTeamFolder(clipboard[0])" :class="{'is-inactive': ! canCreateTeamFolderInView }" source="user-plus" :action="$t('actions.convert_into_team_folder')" />
 						<ToolbarButton v-if="! $isThisRoute($route, ['SharedWithMe', 'Public'])" @click.native="$shareFileOrFolder(clipboard[0])" :class="{'is-inactive': canShareInView }" source="share" :action="$t('actions.share')" />
 
@@ -291,12 +291,6 @@
 		pointer-events: none;
 		margin-right: 6px;
 		flex-shrink: 0;
-		opacity: 0.15;
-
-		&.is-active {
-			opacity: 1;
-			pointer-events: initial;
-		}
 	}
 
 	.location-title {
@@ -314,7 +308,6 @@
 		padding: 1px 4px;
 		line-height: 0;
 		border-radius: 3px;
-		@include transition(150ms);
 
 		svg circle {
 			@include transition(150ms);
diff --git a/resources/js/components/FilesView/FileFilterMobile.vue b/resources/js/components/FilesView/FileFilterMobile.vue
index 1a28c768..7e6b62e8 100644
--- a/resources/js/components/FilesView/FileFilterMobile.vue
+++ b/resources/js/components/FilesView/FileFilterMobile.vue
@@ -2,7 +2,7 @@
     <MenuMobile name="file-filter">
         <MenuMobileGroup>
             <OptionGroup>
-                <Option @click.native="goToFiles" :title="$t('menu.files')" icon="hard-drive" :is-active="$isThisRoute($route, 'Files')" is-hover-disabled="true" />
+                <Option @click.native="goToFiles" :title="$t('sidebar.home')" icon="hard-drive" :is-active="$isThisRoute($route, 'Files')" is-hover-disabled="true" />
                 <Option @click.native="goToLatest" :title="$t('menu.latest')" icon="upload-cloud" :is-active="$isThisRoute($route, 'RecentUploads')" is-hover-disabled="true" />
                 <Option @click.native="goToShared" :title="$t('sidebar.my_shared')" icon="share" :is-active="$isThisRoute($route, 'MySharedItems')" is-hover-disabled="true" />
                 <Option @click.native="goToTrash" :title="$t('menu.trash')" icon="trash" :is-active="$isThisRoute($route, 'Trash')" is-hover-disabled="true" />
diff --git a/resources/js/components/Spotlight/Spotlight.vue b/resources/js/components/Spotlight/Spotlight.vue
index 3934a439..295ce257 100644
--- a/resources/js/components/Spotlight/Spotlight.vue
+++ b/resources/js/components/Spotlight/Spotlight.vue
@@ -3,7 +3,7 @@
 		v-if="isVisible"
 		@keyup.esc="exit"
 		tabindex="-1"
-		class="md:absolute fixed w-full h-full dark:bg-dark-foreground bg-white md:z-auto z-50"
+		class="md:absolute fixed w-full h-full dark:bg-dark-foreground md:bg-transparent bg-white md:z-auto z-50"
 	>
 		<div class="relative w-full md:max-w-xl z-50 md:rounded-xl mx-auto 2xl:mt-20 md:mt-8 overflow-y-auto bg-white dark:bg-dark-foreground">
 
diff --git a/resources/js/components/Teams/Components/TeamList.vue b/resources/js/components/Teams/Components/TeamList.vue
index 6152c15d..fc108b64 100644
--- a/resources/js/components/Teams/Components/TeamList.vue
+++ b/resources/js/components/Teams/Components/TeamList.vue
@@ -1,10 +1,18 @@
 <template>
-	<ul class="member-list">
-		<li v-if="Object.values(members).length > 0 && entry.id !== user.data.id" v-for="(entry, i) in members" :key="i" class="member-item">
-			<div @click="deleteMember(entry)" class="terminate">
-				<x-icon size="14" class="close-icon" />
+	<ul>
+		<li
+			v-if="Object.values(members).length > 0 && entry.id !== user.data.id"
+			v-for="(entry, i) in members"
+			:key="i"
+			class="flex items-center py-2"
+		>
+			<!--Remove Member-->
+			<div @click="deleteMember(entry)" class="cursor-pointer leading-none py-2 px-1 -ml-1.5">
+				<x-icon size="14" class="vue-feather dark:text-gray-600" />
 			</div>
-			<div class="member-preview">
+
+			<!--Member Preview-->
+			<div class="flex items-center">
 
 				<!--Avatar-->
 				<MemberAvatar
@@ -16,25 +24,28 @@
 
 				<!--Member-->
 				<div v-if="entry.type === 'member'" class="info">
-					<b class="title">
+					<b class="text-sm font-bold block max-w-1 overflow-hidden overflow-ellipsis whitespace-nowrap" style="max-width: 155px;">
 						{{ entry.name }}
 					</b>
-					<span class="subtitle dark:text-gray-500 text-gray-600">
+					<span class="block text-xs dark:text-gray-500 text-gray-600">
 						{{ entry.email }}
 					</span>
 				</div>
 
 				<!--Invitation-->
 				<div v-if="entry.type === 'invitation'" class="info">
-					<b class="title">
+					<b class="text-sm font-bold block max-w-xs overflow-hidden overflow-ellipsis whitespace-nowrap" style="max-width: 155px;">
 						{{ entry.email }}
 					</b>
-					<span v-if="entry.id" class="subtitle">
+					<span v-if="entry.id" class="block text-xs dark:text-gray-500 text-gray-600">
 						{{ $t('Waiting for accept invitation...') }}
 					</span>
 				</div>
 			</div>
-			<div class="action">
+
+
+			<!--Set member permission-->
+			<div class="ml-auto">
 				<PermissionToggleButton @input="updateMemberPermission(entry, $event)" :item="entry" />
 			</div>
 		</li>
@@ -86,62 +97,4 @@
 			this.members = this.value
 		}
 	}
-</script>
-
-<style lang="scss" scoped>
-    @import "resources/sass/vuefilemanager/_inapp-forms.scss";
-	@import '/resources/sass/vuefilemanager/_forms';
-
-	.member-list {
-		max-height: 270px;
-		overflow-y: scroll;
-	}
-
-	.member-item {
-		display: flex;
-		align-items: center;
-		padding: 8px 0;
-
-		.terminate {
-			line-height: 0;
-			cursor: pointer;
-
-			line {
-				color: $light_text;
-			}
-		}
-
-		.member-preview {
-			display: flex;
-			align-items: center;
-
-			.info {
-
-				.title {
-					@include font-size(15);
-					font-weight: 700;
-					display: block;
-					max-width: 190px;
-					overflow: hidden;
-					text-overflow: ellipsis;
-				}
-
-				.subtitle {
-					@include font-size(12);
-					display: block;
-				}
-			}
-		}
-
-		.action {
-			margin-left: auto;
-		}
-	}
-
-	.dark {
-
-		.member-item .info .email {
-			color: $dark_mode_text_secondary;
-		}
-	}
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/resources/js/components/Teams/EditTeamFolderPopup.vue b/resources/js/components/Teams/EditTeamFolderPopup.vue
index 86761411..09e9060a 100644
--- a/resources/js/components/Teams/EditTeamFolderPopup.vue
+++ b/resources/js/components/Teams/EditTeamFolderPopup.vue
@@ -16,7 +16,19 @@
                 <!--Add Member-->
 				<ValidationProvider tag="div" mode="passive" class="input-wrapper" name="Email" v-slot="{ errors }">
 					<label class="input-label">{{ $t('Add Member') }}:</label>
-					<input @keypress.enter.stop.prevent="addMember" ref="email" v-model="email" :class="{'is-error': errors[0]}" type="email" class="focus-border-theme" :placeholder="$t('Type member email...')">
+
+					<div class="relative">
+						<span
+							v-if="email"
+							@click="addMember"
+							class="button-base theme absolute right-2 px-3 py-2 font-bold text-sm rounded-lg top-1/2 transform -translate-y-1/2 cursor-pointer"
+						>
+							Add
+						</span>
+
+                		<!--TODO: Fix !pr-20 after JIT official release-->
+						<input @keypress.enter.stop.prevent="addMember" ref="email" v-model="email" :class="{'is-error': errors[0]}" type="email" class="focus-border-theme !pr-20" :placeholder="$t('Type member email...')">
+					</div>
 					<span class="error-message" v-if="errors[0]">{{ errors[0] }}</span>
 				</ValidationProvider>
 
@@ -26,7 +38,10 @@
 					<span v-if="errors[0]" class="error-message" style="margin-top: -5px">{{ $t('Please add at least one member.') }}</span>
 					<TeamList v-model="members" />
 					<TeamList v-model="invitations" />
-					<p v-if="Object.values(members).length === 0 && Object.values(invitations).length === 0" class="input-help">{{ $t('Please add at least one member into your Team Folder.') }}</p>
+
+					<p v-if="Object.values(members).length === 0 && Object.values(invitations).length === 0" class="text-xs dark:text-gray-500">
+						{{ $t('Please add at least one member into your Team Folder.') }}
+					</p>
 				</ValidationProvider>
             </ValidationObserver>
 
diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js
index 37295e91..e1e061e8 100644
--- a/resources/js/helpers/functionHelpers.js
+++ b/resources/js/helpers/functionHelpers.js
@@ -206,11 +206,11 @@ const FunctionHelpers = {
                 return store.getters.currentFolder.data.attributes.name
             } else {
                 return {
-                    'RecentUploads': this.$t('Recent'),
-                    'MySharedItems': this.$t('Shared'),
+                    'RecentUploads': this.$t('Recent Uploads'),
+                    'MySharedItems': this.$t('sidebar.my_shared'),
                     'Trash': this.$t('Trash'),
                     'Public': this.$t('Files'),
-                    'Files': this.$t('Files'),
+                    'Files': this.$t('sidebar.home'),
                     'TeamFolders': this.$t('Team Folders'),
                     'SharedWithMe': this.$t('Shared With Me'),
                 }[this.$route.name]
@@ -219,11 +219,11 @@ const FunctionHelpers = {
 
         Vue.prototype.$getCurrentSectionName = function () {
             return {
-                'RecentUploads': this.$t('Recent'),
-                'MySharedItems': this.$t('Shared'),
+                'RecentUploads': this.$t('Recent Uploads'),
+                'MySharedItems': this.$t('sidebar.my_shared'),
                 'Trash': this.$t('Trash'),
                 'Public': this.$t('Files'),
-                'Files': this.$t('Files'),
+                'Files': this.$t('sidebar.home'),
                 'TeamFolders': this.$t('Team Folders'),
                 'SharedWithMe': this.$t('Shared With Me'),
             }[this.$route.name]
diff --git a/resources/js/views/FileView/Files.vue b/resources/js/views/FileView/Files.vue
index a838e2f3..23f7f637 100644
--- a/resources/js/views/FileView/Files.vue
+++ b/resources/js/views/FileView/Files.vue
@@ -12,7 +12,7 @@
 			</OptionGroup>
 			<OptionGroup v-if="item">
 				<Option @click.native="$shareFileOrFolder(item)" :title="item.data.relationships.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" />
+				<Option @click.native="$convertAsTeamFolder(item)" v-if="isFolder" :title="$t('Convert as Team Folder')" icon="users" />
 			</OptionGroup>
 
             <OptionGroup v-if="item">