diff --git a/resources/js/App.vue b/resources/js/App.vue
index d4e1ffb6..ed3a6d4f 100644
--- a/resources/js/App.vue
+++ b/resources/js/App.vue
@@ -25,7 +25,7 @@ import CookieDisclaimer from './components/Others/CookieDisclaimer'
 import Spinner from './components/FilesView/Spinner'
 import Vignette from './components/Others/Vignette'
 import Alert from './components/FilesView/Alert'
-import RestrictionWarningBar from './RestrictionWarningBar'
+import RestrictionWarningBar from './components/Subscription/RestrictionWarningBar'
 import { mapGetters } from 'vuex'
 import { events } from './bus'
 
diff --git a/resources/js/components/FilesView/InfoSidebar.vue b/resources/js/components/FilesView/InfoSidebar.vue
index 476737aa..316b139f 100644
--- a/resources/js/components/FilesView/InfoSidebar.vue
+++ b/resources/js/components/FilesView/InfoSidebar.vue
@@ -34,17 +34,9 @@
             <!--Location-->
             <ListInfoItem v-if="$checkPermission(['master'])" :title="$t('file_detail.where')">
                 <div @click="$moveFileOrFolder(singleFile)" class="flex cursor-pointer items-center">
-                    <span class="inline-block text-sm font-bold">
-                        {{ singleFile.data.relationships.parent ? singleFile.data.relationships.parent.data.attributes.name : $t('locations.home') }}
-                    </span>
-                    <Edit2Icon size="10" class="ml-2" />
-                </div>
-            </ListInfoItem>
-
-            <!--Team-->
-            <ListInfoItem v-if="singleFile.data.attributes.isTeamFolder" :title="$t('Shared with the Team')">
-                <div class="flex cursor-pointer items-center z-0 relative" @click="$updateTeamFolder(singleFile)">
-                    <TeamMembersPreview :folder="singleFile" :avatar-size="32" />
+                    <b class="inline-block text-sm font-bold">
+                        {{ singleFile.data.relationships.parent ? singleFile.data.relationships.parent.data.attributes.name : $getCurrentLocationName() }}
+                    </b>
                     <Edit2Icon size="10" class="ml-2" />
                 </div>
             </ListInfoItem>
diff --git a/resources/js/components/FilesView/ItemList.vue b/resources/js/components/FilesView/ItemList.vue
index 96540b4b..8aa694dc 100644
--- a/resources/js/components/FilesView/ItemList.vue
+++ b/resources/js/components/FilesView/ItemList.vue
@@ -179,12 +179,14 @@ export default {
         this.itemName = this.entry.data.attributes.name
 
         // Change item name
-        events.$on('change:name', (item) => {
-            if (this.entry.data.id === item.id) this.itemName = item.name
+        events.$on('change:name', item => {
+            if (this.entry.data.id === item.id) {
+				this.itemName = item.name
+			}
         })
 
         // Autofocus after newly created folder
-        events.$on('newFolder:focus', (id) => {
+        events.$on('newFolder:focus', id => {
             if (!this.$isMobile() && this.entry.data.id === id) {
                 this.$refs.name.focus()
                 document.execCommand('selectAll')
diff --git a/resources/js/components/FilesView/Option.vue b/resources/js/components/FilesView/Option.vue
index 865accbd..3d80b538 100644
--- a/resources/js/components/FilesView/Option.vue
+++ b/resources/js/components/FilesView/Option.vue
@@ -1,6 +1,6 @@
 <template>
     <li
-        class="flex items-center justify-between py-4 px-5 lg:py-2.5 xl:py-3 2xl:py-4"
+        class="flex items-center justify-between py-4 px-5 lg:py-3 2xl:py-4"
         :class="{
             'group cursor-pointer hover:bg-light-background dark:hover:bg-4x-dark-foreground': !isHoverDisabled,
         }"
diff --git a/resources/js/components/FilesView/TitlePreview.vue b/resources/js/components/FilesView/TitlePreview.vue
index 2fd8ac03..81c90c08 100644
--- a/resources/js/components/FilesView/TitlePreview.vue
+++ b/resources/js/components/FilesView/TitlePreview.vue
@@ -8,7 +8,7 @@
             <file-icon v-if="icon === 'file'" class="text-theme vue-feather" size="19" />
         </div>
         <div>
-            <b class="inline-block w-52 overflow-hidden text-ellipsis whitespace-nowrap text-base font-bold leading-3 2xl:w-72">
+            <b class="inline-block w-52 overflow-hidden text-ellipsis whitespace-nowrap text-base font-bold 2xl:w-72">
                 {{ title }}
             </b>
             <small class="block text-xs font-bold text-gray-400">
diff --git a/resources/js/components/Others/TreeMenu.vue b/resources/js/components/Others/TreeMenu.vue
index b02b4c29..e0e0a172 100644
--- a/resources/js/components/Others/TreeMenu.vue
+++ b/resources/js/components/Others/TreeMenu.vue
@@ -32,7 +32,7 @@
             <!--Item label-->
             <b
                 @click="getFolder"
-                class="ml-3 inline-block overflow-x-hidden text-ellipsis whitespace-nowrap text-sm font-bold transition-all duration-150"
+                class="ml-3 inline-block overflow-x-hidden text-ellipsis whitespace-nowrap text-xs font-bold transition-all duration-150"
                 :class="{ 'text-theme': isSelectedItem }"
             >
                 {{ nodes.name }}
@@ -59,7 +59,7 @@ export default {
         UserPlusIcon,
         FolderIcon,
         UsersIcon,
-        'tree-node': () => import('./TreeMenuNavigator'),
+        'tree-node': () => import('./TreeMenu'),
     },
     computed: {
         ...mapGetters(['clipboard']),
diff --git a/resources/js/RestrictionWarningBar.vue b/resources/js/components/Subscription/RestrictionWarningBar.vue
similarity index 100%
rename from resources/js/RestrictionWarningBar.vue
rename to resources/js/components/Subscription/RestrictionWarningBar.vue
diff --git a/resources/js/store/modules/fileBrowser.js b/resources/js/store/modules/fileBrowser.js
index 702500a3..fb55ea79 100644
--- a/resources/js/store/modules/fileBrowser.js
+++ b/resources/js/store/modules/fileBrowser.js
@@ -143,12 +143,12 @@ const mutations = {
             if (item.data.id === id) item.data.relationships.shared = undefined
         })
     },
-    CHANGE_ITEM_NAME(state, updatedFile) {
-        state.entries.find((item) => {
-            if (item.data.id === updatedFile.data.id) {
-                item.data.attributes.name = updatedFile.data.attributes.name
-                item.data.attributes.color = updatedFile.data.attributes.color ? updatedFile.data.attributes.color : null
-                item.data.attributes.emoji = updatedFile.data.attributes.emoji ? updatedFile.data.attributes.emoji : null
+    CHANGE_ITEM_NAME(state, file) {
+        state.entries.find(item => {
+            if (item.data.id === file.data.id) {
+                item.data.attributes.name = file.data.attributes.name
+                item.data.attributes.color = file.data.attributes.color ? file.data.attributes.color : null
+                item.data.attributes.emoji = file.data.attributes.emoji ? file.data.attributes.emoji : null
             }
         })
     },
diff --git a/resources/js/views/FileView/MySharedItems.vue b/resources/js/views/FileView/MySharedItems.vue
index 17025426..118bb1d1 100644
--- a/resources/js/views/FileView/MySharedItems.vue
+++ b/resources/js/views/FileView/MySharedItems.vue
@@ -57,7 +57,7 @@
                 <Option @click.native="$deleteFileOrFolder(item)" :title="$t('context_menu.delete')" icon="trash" />
             </OptionGroup>
             <OptionGroup>
-                <Option @click.native="$shareFileOrFolder(item)" :title="item && item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+                <Option @click.native="$shareFileOrFolder(item)" :title="item && item.data.relationships.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" />
diff --git a/resources/js/views/FileView/RecentUploads.vue b/resources/js/views/FileView/RecentUploads.vue
index a784764c..1d073ac2 100644
--- a/resources/js/views/FileView/RecentUploads.vue
+++ b/resources/js/views/FileView/RecentUploads.vue
@@ -36,7 +36,7 @@
                 <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" />
-                <Option @click.native="$shareFileOrFolder(item)" :title="item && item.shared ? $t('context_menu.share_edit') : $t('context_menu.share')" icon="share" />
+                <Option @click.native="$shareFileOrFolder(item)" :title="item && item.data.relationships.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" />
diff --git a/src/Domain/Items/Controllers/RenameFileOrFolderController.php b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
index 3f3407f3..99e7f707 100644
--- a/src/Domain/Items/Controllers/RenameFileOrFolderController.php
+++ b/src/Domain/Items/Controllers/RenameFileOrFolderController.php
@@ -7,6 +7,7 @@ use Domain\Folders\Resources\FolderResource;
 use Domain\Items\Requests\RenameItemRequest;
 use Domain\Items\Actions\RenameFileOrFolderAction;
 use Domain\Folders\Actions\UpdateFolderPropertyAction;
+use Illuminate\Auth\Access\AuthorizationException;
 use Support\Demo\Actions\FakeRenameFileOrFolderAction;
 
 class RenameFileOrFolderController extends Controller
@@ -20,6 +21,8 @@ class RenameFileOrFolderController extends Controller
 
     /**
      * Rename item for authenticated master|editor user
+     *
+     * @throws AuthorizationException
      */
     public function __invoke(
         RenameItemRequest $request,
@@ -30,13 +33,15 @@ class RenameFileOrFolderController extends Controller
         }
 
         // If request contain icon or color, then change it
-        if ($request->has('emoji') || $request->has('color')) {
+        if ($request->input('type') === 'folder' && $request->hasAny(['emoji', 'color'])) {
             ($this->updateFolderProperty)($request, $id);
         }
 
+        // Rename item
         $item = ($this->renameFileOrFolder)($request, $id);
 
         if ($request->input('type') === 'folder') {
+
             return new FolderResource($item);
         }