diff --git a/packages/nc-gui/components/dashboard/MiniSidebar/Item.vue b/packages/nc-gui/components/dashboard/MiniSidebar/Item.vue
index 454774c41f..7b7dfd210a 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebar/Item.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebar/Item.vue
@@ -56,14 +56,17 @@ const currentIcon = computed(() => {
 </script>
 
 <template>
-  <NcTooltip class="w-full" placement="right" :arrow="false" :disabled="(!isLabelHidden && !!label) || !tooltipText" :hide-on-click="!hideOnClickDisabled">
+  <NcTooltip
+    class="w-full"
+    placement="right"
+    :arrow="false"
+    :disabled="(!isLabelHidden && !!label) || !tooltipText"
+    :hide-on-click="!hideOnClickDisabled"
+  >
     <template #title>{{ tooltipText }}</template>
 
     <div
-      :class="[
-        variant === 'btn' ? 'nc-mini-sidebar-labeled-btn' : 'nc-mini-sidebar-labeled-item',
-        { active, disabled },
-      ]"
+      :class="[variant === 'btn' ? 'nc-mini-sidebar-labeled-btn' : 'nc-mini-sidebar-labeled-item', { active, disabled }]"
       :data-testid="dataTestid"
       @click="!disabled && emits('click')"
     >
diff --git a/packages/nc-gui/components/dashboard/MiniSidebar/Theme.vue b/packages/nc-gui/components/dashboard/MiniSidebar/Theme.vue
index c6f02bce64..18358edfdb 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebar/Theme.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebar/Theme.vue
@@ -51,7 +51,13 @@ const themeIcon = computed(
     </NcTooltip>
 
     <!-- Mini sidebar mode — parent DashboardMiniSidebarItem handles tooltip -->
-    <div v-else v-e="['c:nocodb:theme']" class="h-4.5 flex items-center justify-center" data-testid="nc-sidebar-theme" @click="toggleTheme">
+    <div
+      v-else
+      v-e="['c:nocodb:theme']"
+      class="h-4.5 flex items-center justify-center"
+      data-testid="nc-sidebar-theme"
+      @click="toggleTheme"
+    >
       <GeneralIcon
         :icon="themeIcon"
         :class="{
diff --git a/packages/nc-gui/components/dashboard/MiniSidebarV2/Dock.vue b/packages/nc-gui/components/dashboard/MiniSidebarV2/Dock.vue
index 9d81f46a9d..80361d78fc 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebarV2/Dock.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebarV2/Dock.vue
@@ -249,13 +249,7 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
 </script>
 
 <template>
-  <nav
-    ref="dockRef"
-    class="nc-dock"
-    data-testid="nc-mini-sidebar-v2-dock"
-    @mousemove="onMouseMove"
-    @mouseleave="onMouseLeave"
-  >
+  <nav ref="dockRef" class="nc-dock" data-testid="nc-mini-sidebar-v2-dock" @mousemove="onMouseMove" @mouseleave="onMouseLeave">
     <!-- Logo -->
     <DashboardMiniSidebarV2DockItem
       :ref="(el: any) => setItemRef('logo', el)"
@@ -324,11 +318,11 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
       <DashboardMiniSidebarV2DockItem
         v-if="isThemeEnabled"
         :ref="(el: any) => setItemRef('theme', el)"
+        v-e="['c:nocodb:theme']"
         :label="selectedTheme === 'light' ? 'Light' : selectedTheme === 'dark' ? 'Dark' : 'System'"
         panel-key="theme"
         data-testid="nc-sidebar-theme"
         :scale="getScale('theme')"
-        v-e="['c:nocodb:theme']"
         @click="toggleTheme"
       >
         <GeneralIcon :icon="themeIcon" class="nc-dock-item-icon" />
@@ -348,20 +342,12 @@ useEventListener(document, 'keydown', async (e: KeyboardEvent) => {
 
     <div class="nc-dock-separator" />
 
-    <div
-      :ref="(el: any) => setItemRef('create', el)"
-      class="nc-dock-magnify-wrapper"
-      :style="getMagnifyStyle('create')"
-    >
+    <div :ref="(el: any) => setItemRef('create', el)" class="nc-dock-magnify-wrapper" :style="getMagnifyStyle('create')">
       <DashboardMiniSidebarCreateNewActionMenu />
     </div>
 
     <!-- User Avatar -->
-    <div
-      :ref="(el: any) => setItemRef('user', el)"
-      class="nc-dock-magnify-wrapper"
-      :style="getMagnifyStyle('user')"
-    >
+    <div :ref="(el: any) => setItemRef('user', el)" class="nc-dock-magnify-wrapper" :style="getMagnifyStyle('user')">
       <DashboardSidebarUserInfo />
     </div>
 
diff --git a/packages/nc-gui/components/dashboard/MiniSidebarV2/DockItem.vue b/packages/nc-gui/components/dashboard/MiniSidebarV2/DockItem.vue
index c925b77338..b93c513613 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebarV2/DockItem.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebarV2/DockItem.vue
@@ -35,9 +35,9 @@ const dynamicMargin = computed(() => {
 })
 
 const itemStyle = computed(() => ({
-  'transform': `scale(${props.scale})`,
-  'marginTop': `${dynamicMargin.value}px`,
-  'marginBottom': `${dynamicMargin.value}px`,
+  transform: `scale(${props.scale})`,
+  marginTop: `${dynamicMargin.value}px`,
+  marginBottom: `${dynamicMargin.value}px`,
 }))
 </script>
 
diff --git a/packages/nc-gui/components/dashboard/MiniSidebarV2/Rail.vue b/packages/nc-gui/components/dashboard/MiniSidebarV2/Rail.vue
index df5175a8e3..0a714921ba 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebarV2/Rail.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebarV2/Rail.vue
@@ -61,18 +61,13 @@ const toggleChatSupport = () => {
   window.$chatwoot.toggle(toggleText)
 }
 
-const activePanel = ref('agents')
-
 const isBaseOpen = computed(() => {
   return route.value.name?.toString().startsWith('index-typeOrId-baseId-')
 })
 
-const isWsAdminRoute = computed(() => route.value.name === 'index-typeOrId-settings-page')
-
 // Resolve a base for icon display when not on a base route (e.g. ws-admin)
 const resolvedProject = computed(() => {
   if (openedProject.value) return openedProject.value
-  if (!isWsAdminRoute.value) return undefined
 
   const lastVisitedBaseId = ncLastVisitedBase().get()
   return basesList.value?.find((b) => b.id === lastVisitedBaseId) || basesList.value?.[0]
@@ -84,18 +79,8 @@ const baseIconColor = computed(() => {
   return meta.iconColor
 })
 
-const showBaseIcon = computed(() => (isBaseOpen.value && openedProject.value) || (isWsAdminRoute.value && resolvedProject.value))
-
 const isBaseListModalOpen = ref(false)
 
-const miniSidebarTabs = computed(() => [
-  { key: 'data' as const, icon: 'ncTableOutline', activeIcon: 'ncTableFilled', label: 'Data' },
-  { key: 'automations' as const, icon: 'ncAutomation', activeIcon: 'ncAutomationsFilled', label: 'Automate' },
-  // { key: 'agents' as const, icon: 'ncSupportAgent', activeIcon: 'ncSupportAgent', label: 'Agents' },
-])
-
-const { isUIAllowed } = useRoles()
-
 const navigateToProjectPage = () => {
   if (route.value.name?.toString().startsWith('index-typeOrId-baseId-')) {
     return
@@ -205,19 +190,18 @@ const mainItems = computed<NavItem[]>(() => [
 ])
 
 // ── Bottom items (pushed down by margin-top: auto) ──
-const bottomItems: NavItem[] = [{ key: 'support', icon: 'ncSupportAgent', label: 'Support', onClick: () => toggleChatSupport() }]
-
-const onItemClick = (panel: string) => {
-  activePanel.value = panel
-  emits('switch-panel', panel)
-}
+const bottomItems: NavItem[] = [
+  isChatWootEnabled.value
+    ? { key: 'support', icon: 'ncSupportAgent', label: 'Support', onClick: () => toggleChatSupport() }
+    : null,
+].filter(Boolean) as NavItem[]
 </script>
 
 <template>
   <nav class="nc-rail" data-testid="nc-mini-sidebar-v2-rail">
     <!-- Logo -->
     <div class="nc-rail-logo" title="Home" data-testid="nc-mini-sidebar-v2-logo" @click="isBaseListModalOpen = true">
-      <GeneralProjectIcon class="!h-7 !w-7" />
+      <GeneralProjectIcon class="!h-7 !w-7" :color="baseIconColor" />
     </div>
 
     <div class="nc-rail-divider" />
@@ -277,11 +261,11 @@ const onItemClick = (panel: string) => {
       <!-- Theme toggle -->
       <DashboardMiniSidebarV2RailItem
         v-if="isThemeEnabled"
+        v-e="['c:nocodb:theme']"
         :label="selectedTheme === 'light' ? 'Light' : selectedTheme === 'dark' ? 'Dark' : 'System'"
         :disable-tooltip="true"
         panel-key="theme"
         data-testid="nc-sidebar-theme"
-        v-e="['c:nocodb:theme']"
         @click="toggleTheme"
       >
         <template #icon>
diff --git a/packages/nc-gui/components/dashboard/MiniSidebarV2/UserMenu.vue b/packages/nc-gui/components/dashboard/MiniSidebarV2/UserMenu.vue
index 536c9d7709..a5211fdd41 100644
--- a/packages/nc-gui/components/dashboard/MiniSidebarV2/UserMenu.vue
+++ b/packages/nc-gui/components/dashboard/MiniSidebarV2/UserMenu.vue
@@ -7,11 +7,7 @@ const isDockMode = computed(() => !isRail.value)
 </script>
 
 <template>
-  <NcDropdown
-    v-model:visible="isMenuOpen"
-    placement="topLeft"
-    overlay-class-name="!min-w-60 !left-1"
-  >
+  <NcDropdown v-model:visible="isMenuOpen" placement="topLeft" overlay-class-name="!min-w-60 !left-1">
     <div class="nc-rail-avatar" :class="{ active: isMenuOpen }" title="Account">
       <img src="https://i.pravatar.cc/64?u=gilfoyle" alt="BG" />
     </div>
diff --git a/packages/nc-gui/components/dashboard/Sidebar/HeaderWrapper.vue b/packages/nc-gui/components/dashboard/Sidebar/HeaderWrapper.vue
index 9c482179c9..ae1cd0dc9a 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/HeaderWrapper.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/HeaderWrapper.vue
@@ -19,8 +19,6 @@ const { activeTableId } = storeToRefs(useTablesStore())
 
 const { isMobileMode } = useGlobal()
 
-const { commandPalette } = useCommandPalette()
-
 const { setActiveCmdView } = useCommand()
 
 const showSidebarBtn = computed(() => {
@@ -30,10 +28,6 @@ const showSidebarBtn = computed(() => {
 
   return true
 })
-
-const openSearch = () => {
-  commandPalette.value?.open()
-}
 </script>
 
 <template>
@@ -44,11 +38,7 @@ const openSearch = () => {
       </div>
 
       <div class="flex items-center gap-0.5">
-        <NcTooltip
-          class="flex"
-          placement="bottom"
-          hide-on-click
-        >
+        <NcTooltip class="flex" placement="bottom" hide-on-click>
           <template #title>
             <div class="flex items-center gap-1">{{ $t('labels.quickSearch') }} {{ renderCmdOrCtrlKey(true) }} K</div>
           </template>
diff --git a/packages/nc-gui/components/dashboard/TreeView/Project/BaseSettingsMenu.vue b/packages/nc-gui/components/dashboard/TreeView/Project/BaseSettingsMenu.vue
index 9e5ba2ac47..97def7bb2f 100644
--- a/packages/nc-gui/components/dashboard/TreeView/Project/BaseSettingsMenu.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/Project/BaseSettingsMenu.vue
@@ -103,7 +103,12 @@ onMounted(() => {
       {{ $t('labels.manageSyncs') }}
     </NcSidebarMenuItem>
     <NcSidebarMenuItem
-      v-if="isEeUI && isUIAllowed('baseMiscSettings', { roles: effectiveRoles }) && isUIAllowed('manageSnapshot', { roles: effectiveRoles }) && !isMobileMode"
+      v-if="
+        isEeUI &&
+        isUIAllowed('baseMiscSettings', { roles: effectiveRoles }) &&
+        isUIAllowed('manageSnapshot', { roles: effectiveRoles }) &&
+        !isMobileMode
+      "
       v-e="['c:settings:base:snapshots']"
       icon="camera"
       :active="isSettingsItemActive('snapshots')"
diff --git a/packages/nc-gui/components/dashboard/TreeView/Table/Node.vue b/packages/nc-gui/components/dashboard/TreeView/Table/Node.vue
index 68226c5c08..993b12e5fe 100644
--- a/packages/nc-gui/components/dashboard/TreeView/Table/Node.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/Table/Node.vue
@@ -453,7 +453,11 @@ const enabledOptions = computed(() => {
                       {{ $t('general.changeIcon') }}
                     </template>
 
-                    <component :is="iconMap.ncZap" v-if="table?.synced" class="nc-table-icon w-4 text-sm !text-nc-content-gray-muted" />
+                    <component
+                      :is="iconMap.ncZap"
+                      v-if="table?.synced"
+                      class="nc-table-icon w-4 text-sm !text-nc-content-gray-muted"
+                    />
 
                     <component
                       :is="iconMap.table"
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index 1115c2e2f9..c4e892c59f 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -199,16 +199,16 @@ const { t } = useI18n()
 
 const settingsPageTitle = computed(() => {
   const tabTitles: Record<string, string> = {
-    collaborator: t('labels.addUserToBase'),
-    permissions: t('labels.dataPermissions'),
-    mcp: t('title.mcpServer'),
-    syncs: t('labels.manageSyncs'),
-    snapshots: t('labels.manageSnapshots'),
+    'collaborator': t('labels.addUserToBase'),
+    'permissions': t('labels.dataPermissions'),
+    'mcp': t('title.mcpServer'),
+    'syncs': t('labels.manageSyncs'),
+    'snapshots': t('labels.manageSnapshots'),
     'data-source': t('labels.addDataSource'),
     'base-settings': t('general.general'),
-    audits: t('title.audits'),
-    workflows: t('objects.workflows'),
-    overview: activeSidebarTab.value === 'automations' ? t('general.automate') : t('general.data'),
+    'audits': t('title.audits'),
+    'workflows': t('objects.workflows'),
+    'overview': activeSidebarTab.value === 'automations' ? t('general.automate') : t('general.data'),
   }
   return tabTitles[projectPageTab.value] || ''
 })
@@ -335,7 +335,6 @@ watch(
           <template v-if="props.tab">
             <span class="font-semibold text-sm text-nc-content-gray truncate">
               {{ settingsPageTitle }}
-            
             </span>
           </template>
           <template v-else>
@@ -383,7 +382,11 @@ watch(
         height: 'calc(100% - var(--topbar-height))',
       }"
     >
-      <NcTabs v-model:active-key="projectPageTab" class="w-full h-full" :class="{ 'hide-tabs': props.tab || projectPageTab === 'overview' }">
+      <NcTabs
+        v-model:active-key="projectPageTab"
+        class="w-full h-full"
+        :class="{ 'hide-tabs': props.tab || projectPageTab === 'overview' }"
+      >
         <a-tab-pane
           v-if="!isAdminPanel && !props.tab && isOverviewTabVisible && !isMobileMode"
           key="overview"
@@ -506,7 +509,10 @@ watch(
             <DashboardSettingsBaseMCP />
           </div>
         </a-tab-pane>
-        <a-tab-pane v-if="isEeUI && isUIAllowed('baseMiscSettings') && isUIAllowed('manageSnapshot') && base.id && !isMobileMode" key="snapshots">
+        <a-tab-pane
+          v-if="isEeUI && isUIAllowed('baseMiscSettings') && isUIAllowed('manageSnapshot') && base.id && !isMobileMode"
+          key="snapshots"
+        >
           <template #tab>
             <div class="tab-title" data-testid="proj-view-tab__snapshots">
               <GeneralIcon icon="camera" />
diff --git a/packages/nc-gui/components/workspace/ViewInline.vue b/packages/nc-gui/components/workspace/ViewInline.vue
index 1f4b710707..c44a627031 100644
--- a/packages/nc-gui/components/workspace/ViewInline.vue
+++ b/packages/nc-gui/components/workspace/ViewInline.vue
@@ -367,8 +367,8 @@ onBeforeUnmount(() => {
                 isSettingsSidebar
                   ? '!h-[calc(100vh-var(--topbar-height))]'
                   : btbShouldShow
-                    ? '!h-[calc(100vh-128px)]'
-                    : '!h-[calc(100vh-92px)]'
+                  ? '!h-[calc(100vh-128px)]'
+                  : '!h-[calc(100vh-92px)]'
               "
             />
           </a-tab-pane>
diff --git a/packages/nc-gui/middleware/01.redirect.global.ts b/packages/nc-gui/middleware/01.redirect.global.ts
index ff5d913e0c..9cb69d8f7e 100644
--- a/packages/nc-gui/middleware/01.redirect.global.ts
+++ b/packages/nc-gui/middleware/01.redirect.global.ts
@@ -72,5 +72,4 @@ export default defineNuxtRouteMiddleware(async (to) => {
       return navigateTo({ path: `/${to.params.typeOrId}/${to.params.baseId}/settings/${slug}`, query }, { replace: true })
     }
   }
-
 })
diff --git a/packages/nc-gui/store/base.ts b/packages/nc-gui/store/base.ts
index 66e5d3079e..1043400c20 100644
--- a/packages/nc-gui/store/base.ts
+++ b/packages/nc-gui/store/base.ts
@@ -275,7 +275,7 @@ export const useBase = defineStore('baseStore', () => {
 
     if (projectPage) {
       const slug: Record<string, string> = {
-        collaborator: 'members',
+        'collaborator': 'members',
         'data-source': 'data-sources',
         'base-settings': 'settings',
       }
diff --git a/packages/nc-gui/utils/settingsRouteUtils.ts b/packages/nc-gui/utils/settingsRouteUtils.ts
index 38740cf4e6..ad58cc6fff 100644
--- a/packages/nc-gui/utils/settingsRouteUtils.ts
+++ b/packages/nc-gui/utils/settingsRouteUtils.ts
@@ -7,16 +7,16 @@
 
 // Base settings: internal tab name → URL slug
 export const baseSettingsTabToSlug: Record<string, string> = {
-  collaborator: 'members',
+  'collaborator': 'members',
   'data-source': 'data-sources',
-  permissions: 'permissions',
-  syncs: 'syncs',
+  'permissions': 'permissions',
+  'syncs': 'syncs',
   'base-settings': 'settings',
-  audits: 'audits',
-  workflows: 'workflows',
-  overview: 'overview',
-  mcp: 'mcp',
-  snapshots: 'snapshots',
+  'audits': 'audits',
+  'workflows': 'workflows',
+  'overview': 'overview',
+  'mcp': 'mcp',
+  'snapshots': 'snapshots',
 }
 
 // Workspace settings: internal tab name → URL slug