diff --git a/packages/nc-gui-v2/app.vue b/packages/nc-gui-v2/app.vue
index d56cfb3174..9ca0b862d5 100644
--- a/packages/nc-gui-v2/app.vue
+++ b/packages/nc-gui-v2/app.vue
@@ -41,9 +41,9 @@ const toggleSidebar = () => {
           <span class="prose-xl">NocoDB</span>
         </div>
 
-        <div v-show="state.isLoading.value" class="text-gray-400 ml-3">
+        <div v-show="state.isLoading.value" class="flex items-center gap-2 ml-3">
           {{ $t('general.loading') }}
-          <MdiReload :class="{ 'animate-infinite animate-spin !text-success': state.isLoading.value }" />
+          <MdiReload :class="{ 'animate-infinite animate-spin': state.isLoading.value }" />
         </div>
       </div>
 
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
index e4e800d936..6f8de8eac4 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/index.vue
@@ -2,8 +2,8 @@
 import type { FormType, GalleryType, GridType, KanbanType, ViewTypes } from 'nocodb-sdk'
 import MenuTop from './MenuTop.vue'
 import MenuBottom from './MenuBottom.vue'
-import Toolbar from './Toolbar.vue'
-import { computed, inject, provide, ref, useApi, useViews, watch } from '#imports'
+import Toolbar from './toolbar/index.vue'
+import { computed, inject, provide, ref, useApi, useRoute, useViews, watch } from '#imports'
 import { ActiveViewInj, MetaInj, RightSidebarInj, ViewListInj } from '~/context'
 import MdiXml from '~icons/mdi/xml'
 import MdiHook from '~icons/mdi/hook'
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
similarity index 65%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
index 9e99331042..c75481f2a8 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/AddRow.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/AddRow.vue
@@ -1,11 +1,15 @@
 <script setup lang="ts">
 import MdiAddIcon from '~icons/mdi/plus-outline'
+import { inject, ref } from '#imports'
+import { RightSidebarInj } from '~/context'
 
 const emits = defineEmits(['addRow'])
+
+const sidebarOpen = inject(RightSidebarInj, ref(true))
 </script>
 
 <template>
-  <a-tooltip placement="left">
+  <a-tooltip :placement="sidebarOpen ? 'bottomRight' : 'left'">
     <template #title> {{ $t('activity.addRow') }} </template>
 
     <div class="nc-sidebar-right-item hover:after:bg-primary/75 group">
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/DeleteTable.vue
similarity index 65%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/DeleteTable.vue
index 0a4f7ba450..6f0cdd5a8b 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/DeleteTable.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/DeleteTable.vue
@@ -1,15 +1,17 @@
 <script setup lang="ts">
-import { inject, useTable } from '#imports'
-import { MetaInj } from '~/context'
+import { inject, ref, useTable } from '#imports'
+import { MetaInj, RightSidebarInj } from '~/context'
 import MdiDeleteIcon from '~icons/mdi/delete-outline'
 
 const meta = inject(MetaInj)
 
 const { deleteTable } = useTable()
+
+const sidebarOpen = inject(RightSidebarInj, ref(true))
 </script>
 
 <template>
-  <a-tooltip placement="left">
+  <a-tooltip :placement="sidebarOpen ? 'bottomRight' : 'left'">
     <template #title> {{ $t('activity.deleteTable') }} </template>
 
     <div class="nc-sidebar-right-item hover:after:bg-red-500 group">
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/LockMenu.vue
similarity index 99%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/LockMenu.vue
index 2a216287fd..cfa3b57038 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/LockMenu.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/LockMenu.vue
@@ -54,6 +54,7 @@ const Icon = computed(() => {
     <div class="nc-sidebar-right-item hover:after:bg-indigo-500 group">
       <Icon class="cursor-pointer group-hover:(!text-white)" />
     </div>
+
     <template #overlay>
       <div class="min-w-[350px] max-w-[500px] shadow bg-white">
         <div>
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/Reload.vue
similarity index 65%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/Reload.vue
index 5a7942b884..fc68b3d577 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/Reload.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/Reload.vue
@@ -1,12 +1,15 @@
 <script setup lang="ts">
-import { ReloadViewDataHookInj } from '~/context'
+import { ReloadViewDataHookInj, RightSidebarInj } from '~/context'
 import MdiReloadIcon from '~icons/mdi/reload'
+import { inject, ref } from '#imports'
 
 const reloadTri = inject(ReloadViewDataHookInj)
+
+const sidebarOpen = inject(RightSidebarInj, ref(true))
 </script>
 
 <template>
-  <a-tooltip placement="left">
+  <a-tooltip :placement="sidebarOpen ? 'bottomRight' : 'left'">
     <template #title> {{ $t('general.reload') }} </template>
 
     <div class="nc-sidebar-right-item hover:after:bg-green-500 group">
diff --git a/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/ToggleDrawer.vue
similarity index 91%
rename from packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/ToggleDrawer.vue
index 9854e43b83..4f0c3adf44 100644
--- a/packages/nc-gui-v2/components/smartsheet-toolbar/ToggleDrawer.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/ToggleDrawer.vue
@@ -8,7 +8,7 @@ const sidebarOpen = inject(RightSidebarInj, ref(false))
 </script>
 
 <template>
-  <a-tooltip placement="left">
+  <a-tooltip :placement="sidebarOpen ? 'bottomRight' : 'left'">
     <template #title> {{ $t('tooltip.toggleNavDraw') }} </template>
 
     <div class="nc-sidebar-right-item hover:after:bg-pink-500 group">
diff --git a/packages/nc-gui-v2/components/smartsheet/sidebar/Toolbar.vue b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue
similarity index 53%
rename from packages/nc-gui-v2/components/smartsheet/sidebar/Toolbar.vue
rename to packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue
index 155c46cc6d..ee85df548f 100644
--- a/packages/nc-gui-v2/components/smartsheet/sidebar/Toolbar.vue
+++ b/packages/nc-gui-v2/components/smartsheet/sidebar/toolbar/index.vue
@@ -1,24 +1,32 @@
+<script lang="ts" setup>
+import AddRow from './AddRow.vue'
+import DeleteTable from './DeleteTable.vue'
+import LockMenu from './LockMenu.vue'
+import Reload from './Reload.vue'
+import ToggleDrawer from './ToggleDrawer.vue'
+</script>
+
 <template>
   <div class="flex gap-2">
     <slot name="start" />
 
-    <SmartsheetToolbarLockMenu />
+    <LockMenu />
 
     <div class="dot" />
 
-    <SmartsheetToolbarReload />
+    <Reload />
 
     <div class="dot" />
 
-    <SmartsheetToolbarAddRow />
+    <AddRow />
 
     <div class="dot" />
 
-    <SmartsheetToolbarDeleteTable />
+    <DeleteTable />
 
     <div class="dot" />
 
-    <SmartsheetToolbarToggleDrawer />
+    <ToggleDrawer />
 
     <slot name="end" />
   </div>