diff --git a/packages/nc-gui/assets/nc-icons/record.svg b/packages/nc-gui/assets/nc-icons/record.svg
index 7515f62243..d4180461e4 100644
--- a/packages/nc-gui/assets/nc-icons/record.svg
+++ b/packages/nc-gui/assets/nc-icons/record.svg
@@ -1,12 +1,13 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_1613_80692)">
-<path d="M11.8571 5.96903L4.14285 10.4225" stroke="#374151" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<rect x="1.15184" width="9.06208" height="9.06208" rx="1.335" transform="matrix(0.866044 -0.499967 0.866044 0.499967 -0.845705 8.77156)" stroke="#374151" stroke-width="1.33"/>
-<path d="M3.5 6.34009L11.2143 10.7935" stroke="#374151" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
-</g>
-<defs>
-<clipPath id="clip0_1613_80692">
-<rect width="16" height="16" fill="white"/>
-</clipPath>
-</defs>
+    <path
+        d="M1.21396 7.35265C0.928679 7.19673 0.928679 6.80327 1.21396 6.64735L7.7893 3.05351C7.91986 2.98216 8.08012 2.98216 8.21067 3.05351L14.786 6.64735C15.0713 6.80327 15.0713 7.19673 14.786 7.35265L8.21067 10.9465C8.08012 11.0178 7.91986 11.0178 7.7893 10.9465L1.21396 7.35265Z"
+        stroke="currentColor" stroke-width="1.33" />
+    <path
+        d="M8.21067 13.9465L14.786 10.3527C14.9287 10.2747 15 10.1374 15 10V7.3702C15 7.2939 14.918 7.24571 14.8513 7.28284L8.04867 11.0729C8.01841 11.0897 7.98159 11.0897 7.95133 11.0729L1.14867 7.28284C1.08202 7.24571 1 7.2939 1 7.3702V10C1 10.1374 1.07132 10.2747 1.21396 10.3527L7.7893 13.9465C7.91986 14.0179 8.08012 14.0179 8.21067 13.9465Z"
+        stroke="currentColor" stroke-width="1.33" />
+    <path d="M4.5 5.02069L11.5 9.06179" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round"
+        stroke-linejoin="round" />
+    <path d="M4.5 9.06152L11.5 5.02042" stroke="currentColor" stroke-width="1.33333" stroke-linecap="round"
+        stroke-linejoin="round" />
+    <line x1="7.995" y1="11" x2="7.995" y2="14" stroke="currentColor" stroke-width="1.33" />
 </svg>
\ No newline at end of file
diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 718be11a0b..b00c4bcbaf 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -720,12 +720,20 @@ input[type='number'] {
   .nc-sidebar-node-btn:not(.nc-sidebar-expand) {
     @apply !xs:(hidden);
   }
+
+  .nc-sidebar-node-btn.nc-sidebar-expand {
+    @apply !xs:(flex-none border-1 border-gray-200 w-6.5 h-6.5 mr-1);
+  }
 }
 
 .nc-button.ant-btn.nc-sidebar-node-btn {
   @apply opacity-0 group-hover:(opacity-100) text-gray-600 hover:(bg-gray-400 bg-opacity-20 text-gray-900) duration-100;
 }
 
+.nc-button.ant-btn.nc-sidebar-node-btn:not(.nc-sidebar-expand):not(.nc-sidebar-view-node-context-btn) {
+  @apply hidden group-hover:(inline-block);
+}
+
 .nc-button.ant-btn.nc-sidebar-node-btn.nc-sidebar-expand {
   @apply xs:(opacity-100 hover:bg-gray-50);
 
diff --git a/packages/nc-gui/components/dashboard/Sidebar/Header.vue b/packages/nc-gui/components/dashboard/Sidebar/Header.vue
index 3c8be28dc6..c11d24b3dc 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/Header.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/Header.vue
@@ -49,7 +49,7 @@ const showSidebarBtn = computed(() => !(isMobileMode.value && !activeViewTitleOr
             <GeneralIcon
               v-else
               icon="doubleLeftArrow"
-              class="duration-150 transition-all !text-lg -mt-0.5"
+              class="duration-150 transition-all !text-lg -mt-0.5 !text-gray-500/75"
               :class="{
                 'transform rotate-180': !isLeftSidebarOpen,
               }"
diff --git a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
index f997ac3d89..e5f1b109a4 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
@@ -54,17 +54,17 @@ onMounted(() => {
 </script>
 
 <template>
-  <div class="flex w-full flex-col p-1 border-gray-200 gap-y-1">
+  <div class="flex w-full flex-col py-0.9 px-1  border-gray-200 gap-y-1">
     <NcDropdown v-model:visible="isMenuOpen" placement="topLeft" overlay-class-name="!min-w-64">
       <div
-        class="flex flex-row py-2 px-3 gap-x-2 items-center hover:bg-gray-200 rounded-lg cursor-pointer h-10"
+        class="flex flex-row py-1 px-3 gap-x-2 items-center hover:bg-gray-200 rounded-lg cursor-pointer h-8"
         data-testid="nc-sidebar-userinfo"
       >
-        <GeneralUserIcon :email="user?.email" size="base" :name="user?.display_name" />
+        <GeneralUserIcon :email="user?.email" size="auto" :name="user?.display_name" />
         <div class="flex truncate">
           {{ name ? name : user?.email }}
         </div>
-        <GeneralIcon icon="arrowUp" class="!min-w-5" />
+        <GeneralIcon icon="chevronDown" class="flex-none !min-w-5 transform rotate-180 !text-gray-500" />
       </div>
       <template #overlay>
         <NcMenu data-testid="nc-sidebar-userinfo">
@@ -175,8 +175,7 @@ onMounted(() => {
       </template>
     </NcDropdown>
 
-    <template v-if="isMobileMode"></template>
-    <div v-else-if="appInfo.ee" class="text-gray-500 text-xs pl-3 mt-1">© 2023 NocoDB. Inc</div>
+    <template v-if="isMobileMode || appInfo.ee"></template>
     <div v-else class="flex flex-row w-full justify-between pt-0.5 truncate">
       <GeneralJoinCloud />
     </div>
@@ -189,7 +188,6 @@ onMounted(() => {
 }
 .menu-icon {
   @apply w-4 h-4;
-  line-height: 1rem;
   font-size: 1rem;
 }
 
diff --git a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
index 43fa1ef1a5..46ed56456c 100644
--- a/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/CreateViewBtn.vue
@@ -163,7 +163,7 @@ async function onOpenModal({
             </div>
 
             <GeneralLoader v-if="toBeCreateType === ViewTypes.CALENDAR && isViewListLoading" />
-            <GeneralIcon v-else class="text-brand-400" icon="plus" />
+            <GeneralIcon v-else class="plus" icon="plus" />
           </div>
         </NcMenuItem>
       </NcMenu>
@@ -181,7 +181,7 @@ async function onOpenModal({
 }
 
 .plus {
-  @apply text-brand-400;
+  @apply text-gray-500;
 }
 </style>
 
diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index fc795d3ff0..ad0789a010 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -134,6 +134,10 @@ const enableEditMode = () => {
 }
 
 const updateProjectTitle = async () => {
+  if (tempTitle.value) {
+    tempTitle.value = tempTitle.value.trim()
+  }
+
   if (!tempTitle.value) return
 
   try {
@@ -431,22 +435,8 @@ const onTableIdCopy = async () => {
             'hover:bg-gray-200': !(activeProjectId === base.id && baseViewOpen),
           }"
           :data-testid="`nc-sidebar-base-title-${base.title}`"
-          class="nc-sidebar-node base-title-node h-7.25 flex-grow rounded-md group flex items-center w-full pr-1"
+          class="nc-sidebar-node base-title-node h-7.25 flex-grow rounded-md group flex items-center w-full pr-1 pl-1.5"
         >
-          <NcButton
-            v-e="['c:base:expand']"
-            type="text"
-            size="xxsmall"
-            class="nc-sidebar-node-btn nc-sidebar-expand ml-0.75 !xs:visible"
-            @click="onProjectClick(base, true, true)"
-          >
-            <GeneralIcon
-              icon="triangleFill"
-              class="group-hover:visible cursor-pointer transform transition-transform duration-500 h-1.5 w-1.75 rotate-90 !xs:visible"
-              :class="{ '!rotate-180': base.isExpanded, '!visible': isOptionsOpen }"
-            />
-          </NcButton>
-
           <div class="flex items-center mr-1" @click="onProjectClick(base)">
             <div class="flex items-center select-none w-6 h-full">
               <a-spin v-if="base.isLoading" class="!ml-1.25 !flex !flex-row !items-center !my-0.5 w-8" :indicator="indicator" />
@@ -469,7 +459,7 @@ const onTableIdCopy = async () => {
             v-if="editMode"
             ref="input"
             v-model="tempTitle"
-            class="flex-grow leading-1 outline-0 ring-none capitalize !text-inherit !bg-transparent w-4/5"
+            class="flex-grow leading-1 outline-0 ring-none capitalize !text-inherit !bg-transparent flex-1 mr-4"
             :class="{ 'text-black font-semibold': activeProjectId === base.id && baseViewOpen && !isMobileMode }"
             @click.stop
             @keyup.enter="updateProjectTitle"
@@ -478,154 +468,176 @@ const onTableIdCopy = async () => {
           />
           <NcTooltip
             v-else
-            class="nc-sidebar-node-title capitalize text-ellipsis overflow-hidden select-none"
+            class="nc-sidebar-node-title capitalize text-ellipsis overflow-hidden select-none flex-1"
             :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
             :class="{ 'text-black font-semibold': activeProjectId === base.id && baseViewOpen }"
             show-on-truncate-only
+            @click="onProjectClick(base)"
           >
             <template #title>{{ base.title }}</template>
-            <span @click="onProjectClick(base)">
+            <span>
               {{ base.title }}
             </span>
           </NcTooltip>
-          <div :class="{ 'flex flex-grow h-full': !editMode }" @click="onProjectClick(base)"></div>
 
-          <NcDropdown v-if="!isSharedBase" v-model:visible="isOptionsOpen" :trigger="['click']">
-            <NcButton
-              v-e="['c:base:options']"
-              class="nc-sidebar-node-btn"
-              :class="{ '!text-black !opacity-100': isOptionsOpen }"
-              data-testid="nc-sidebar-context-menu"
-              type="text"
-              size="xxsmall"
-              @click.stop
-            >
-              <GeneralIcon icon="threeDotHorizontal" class="text-xl w-4.75" />
-            </NcButton>
-            <template #overlay>
-              <NcMenu
-                class="nc-scrollbar-md"
-                :style="{
-                  maxHeight: '70vh',
-                  overflow: 'overlay',
-                }"
-                :data-testid="`nc-sidebar-base-${base.title}-options`"
-                @click="isOptionsOpen = false"
+          <template v-if="!editMode">
+            <NcDropdown v-if="!isSharedBase" v-model:visible="isOptionsOpen" :trigger="['click']">
+              <NcButton
+                v-e="['c:base:options']"
+                class="nc-sidebar-node-btn"
+                :class="{ '!text-black !opacity-100 !inline-block': isOptionsOpen }"
+                data-testid="nc-sidebar-context-menu"
+                type="text"
+                size="xxsmall"
+                @click.stop
               >
-                <template v-if="!isSharedBase">
-                  <NcMenuItem v-if="isUIAllowed('baseRename')" data-testid="nc-sidebar-project-rename" @click="enableEditMode">
-                    <div v-e="['c:base:rename']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="rename" class="group-hover:text-black" />
-                      {{ $t('general.rename') }}
-                    </div>
-                  </NcMenuItem>
+                <GeneralIcon icon="threeDotHorizontal" class="text-xl w-4.75" />
+              </NcButton>
+              <template #overlay>
+                <NcMenu
+                  class="nc-scrollbar-md"
+                  :style="{
+                    maxHeight: '70vh',
+                    overflow: 'overlay',
+                  }"
+                  :data-testid="`nc-sidebar-base-${base.title}-options`"
+                  @click="isOptionsOpen = false"
+                >
+                  <template v-if="!isSharedBase">
+                    <NcMenuItem v-if="isUIAllowed('baseRename')" data-testid="nc-sidebar-project-rename" @click="enableEditMode">
+                      <div v-e="['c:base:rename']" class="flex gap-2 items-center">
+                        <GeneralIcon icon="rename" class="group-hover:text-black" />
+                        {{ $t('general.rename') }}
+                      </div>
+                    </NcMenuItem>
+
+                    <NcMenuItem
+                      v-if="isUIAllowed('baseDuplicate', { roles: [stringifyRolesObj(orgRoles), baseRole].join() })"
+                      data-testid="nc-sidebar-base-duplicate"
+                      @click="duplicateProject(base)"
+                    >
+                      <div v-e="['c:base:duplicate']" class="flex gap-2 items-center">
+                        <GeneralIcon icon="duplicate" class="text-gray-700" />
+                        {{ $t('general.duplicate') }}
+                      </div>
+                    </NcMenuItem>
+
+                    <NcDivider v-if="['baseDuplicate', 'baseRename'].some((permission) => isUIAllowed(permission))" />
+
+                    <!-- Copy Project Info -->
+                    <NcMenuItem
+                      v-if="!isEeUI"
+                      key="copy"
+                      data-testid="nc-sidebar-base-copy-base-info"
+                      @click.stop="copyProjectInfo"
+                    >
+                      <div v-e="['c:base:copy-proj-info']" class="flex gap-2 items-center">
+                        <GeneralIcon icon="copy" class="group-hover:text-black" />
+                        {{ $t('activity.account.projInfo') }}
+                      </div>
+                    </NcMenuItem>
+
+                    <!-- ERD View -->
+                    <NcMenuItem
+                      v-if="base?.sources?.[0]?.enabled"
+                      key="erd"
+                      data-testid="nc-sidebar-base-relations"
+                      @click="openErdView(base?.sources?.[0])"
+                    >
+                      <div v-e="['c:base:erd']" class="flex gap-2 items-center">
+                        <GeneralIcon icon="erd" />
+                        {{ $t('title.relations') }}
+                      </div>
+                    </NcMenuItem>
+
+                    <!-- Swagger: Rest APIs -->
+                    <NcMenuItem
+                      v-if="isUIAllowed('apiDocs')"
+                      key="api"
+                      data-testid="nc-sidebar-base-rest-apis"
+                      @click.stop="
+                        () => {
+                          $e('c:base:api-docs')
+                          openLink(`/api/v2/meta/bases/${base.id}/swagger`, appInfo.ncSiteUrl)
+                        }
+                      "
+                    >
+                      <div v-e="['c:base:api-docs']" class="flex gap-2 items-center">
+                        <GeneralIcon icon="snippet" class="group-hover:text-black !max-w-3.9" />
+                        {{ $t('activity.account.swagger') }}
+                      </div>
+                    </NcMenuItem>
+                  </template>
 
-                  <NcMenuItem
-                    v-if="isUIAllowed('baseDuplicate', { roles: [stringifyRolesObj(orgRoles), baseRole].join() })"
-                    data-testid="nc-sidebar-base-duplicate"
-                    @click="duplicateProject(base)"
-                  >
-                    <div v-e="['c:base:duplicate']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="duplicate" class="text-gray-700" />
-                      {{ $t('general.duplicate') }}
-                    </div>
-                  </NcMenuItem>
+                  <template v-if="base?.sources?.[0]?.enabled && showBaseOption">
+                    <NcDivider />
+                    <DashboardTreeViewBaseOptions v-model:base="base" :source="base.sources[0]" />
+                  </template>
 
-                  <NcDivider v-if="['baseDuplicate', 'baseRename'].some((permission) => isUIAllowed(permission))" />
+                  <NcDivider v-if="['baseMiscSettings', 'baseDelete'].some((permission) => isUIAllowed(permission))" />
 
-                  <!-- Copy Project Info -->
                   <NcMenuItem
-                    v-if="!isEeUI"
-                    key="copy"
-                    data-testid="nc-sidebar-base-copy-base-info"
-                    @click.stop="copyProjectInfo"
+                    v-if="isUIAllowed('baseMiscSettings')"
+                    key="teamAndSettings"
+                    data-testid="nc-sidebar-base-settings"
+                    class="nc-sidebar-base-base-settings"
+                    @click="toggleDialog(true, 'teamAndAuth', undefined, base.id)"
                   >
-                    <div v-e="['c:base:copy-proj-info']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="copy" class="group-hover:text-black" />
-                      {{ $t('activity.account.projInfo') }}
+                    <div v-e="['c:base:settings']" class="flex gap-2 items-center">
+                      <GeneralIcon icon="settings" class="group-hover:text-black" />
+                      {{ $t('activity.settings') }}
                     </div>
                   </NcMenuItem>
-
-                  <!-- ERD View -->
                   <NcMenuItem
-                    v-if="base?.sources?.[0]?.enabled"
-                    key="erd"
-                    data-testid="nc-sidebar-base-relations"
-                    @click="openErdView(base?.sources?.[0])"
+                    v-if="isUIAllowed('baseDelete', { roles: [stringifyRolesObj(orgRoles), baseRole].join() })"
+                    data-testid="nc-sidebar-base-delete"
+                    class="!text-red-500 !hover:bg-red-50"
+                    @click="projectDelete"
                   >
-                    <div v-e="['c:base:erd']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="erd" />
-                      {{ $t('title.relations') }}
+                    <div class="flex gap-2 items-center">
+                      <GeneralIcon icon="delete" class="w-4" />
+                      {{ $t('general.delete') }}
                     </div>
                   </NcMenuItem>
+                </NcMenu>
+              </template>
+            </NcDropdown>
 
-                  <!-- Swagger: Rest APIs -->
-                  <NcMenuItem
-                    v-if="isUIAllowed('apiDocs')"
-                    key="api"
-                    data-testid="nc-sidebar-base-rest-apis"
-                    @click.stop="
-                      () => {
-                        $e('c:base:api-docs')
-                        openLink(`/api/v2/meta/bases/${base.id}/swagger`, appInfo.ncSiteUrl)
-                      }
-                    "
-                  >
-                    <div v-e="['c:base:api-docs']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="snippet" class="group-hover:text-black !max-w-3.9" />
-                      {{ $t('activity.account.swagger') }}
-                    </div>
-                  </NcMenuItem>
-                </template>
-
-                <template v-if="base?.sources?.[0]?.enabled && showBaseOption">
-                  <NcDivider />
-                  <DashboardTreeViewBaseOptions v-model:base="base" :source="base.sources[0]" />
-                </template>
-
-                <NcDivider v-if="['baseMiscSettings', 'baseDelete'].some((permission) => isUIAllowed(permission))" />
+            <NcButton
+              v-if="isUIAllowed('tableCreate', { roles: baseRole })"
+              v-e="['c:base:create-table']"
+              :disabled="!base?.sources?.[0]?.enabled"
+              class="nc-sidebar-node-btn"
+              size="xxsmall"
+              type="text"
+              data-testid="nc-sidebar-add-base-entity"
+              :class="{
+                '!text-black !inline-block !opacity-100': isAddNewProjectChildEntityLoading,
+                '!inline-block !opacity-100': isOptionsOpen,
+              }"
+              :loading="isAddNewProjectChildEntityLoading"
+              @click.stop="addNewProjectChildEntity"
+            >
+              <GeneralIcon icon="plus" class="text-xl leading-5" style="-webkit-text-stroke: 0.15px" />
+            </NcButton>
 
-                <NcMenuItem
-                  v-if="isUIAllowed('baseMiscSettings')"
-                  key="teamAndSettings"
-                  data-testid="nc-sidebar-base-settings"
-                  class="nc-sidebar-base-base-settings"
-                  @click="toggleDialog(true, 'teamAndAuth', undefined, base.id)"
-                >
-                  <div v-e="['c:base:settings']" class="flex gap-2 items-center">
-                    <GeneralIcon icon="settings" class="group-hover:text-black" />
-                    {{ $t('activity.settings') }}
-                  </div>
-                </NcMenuItem>
-                <NcMenuItem
-                  v-if="isUIAllowed('baseDelete', { roles: [stringifyRolesObj(orgRoles), baseRole].join() })"
-                  data-testid="nc-sidebar-base-delete"
-                  class="!text-red-500 !hover:bg-red-50"
-                  @click="projectDelete"
-                >
-                  <div class="flex gap-2 items-center">
-                    <GeneralIcon icon="delete" class="w-4" />
-                    {{ $t('general.delete') }}
-                  </div>
-                </NcMenuItem>
-              </NcMenu>
-            </template>
-          </NcDropdown>
-
-          <NcButton
-            v-if="isUIAllowed('tableCreate', { roles: baseRole })"
-            v-e="['c:base:create-table']"
-            :disabled="!base?.sources?.[0]?.enabled"
-            class="nc-sidebar-node-btn"
-            size="xxsmall"
-            type="text"
-            data-testid="nc-sidebar-add-base-entity"
-            :class="{ '!text-black !visible': isAddNewProjectChildEntityLoading, '!visible': isOptionsOpen }"
-            :loading="isAddNewProjectChildEntityLoading"
-            @click.stop="addNewProjectChildEntity"
-          >
-            <GeneralIcon icon="plus" class="text-xl leading-5" style="-webkit-text-stroke: 0.15px" />
-          </NcButton>
+            <NcButton
+              v-e="['c:base:expand']"
+              type="text"
+              size="xxsmall"
+              class="nc-sidebar-node-btn nc-sidebar-expand !xs:opacity-100"
+              :class="{
+                '!opacity-100': isOptionsOpen,
+              }"
+              @click="onProjectClick(base, true, true)"
+            >
+              <GeneralIcon
+                icon="chevronDown"
+                class="group-hover:visible cursor-pointer transform transition-transform duration-500 rotate-270"
+                :class="{ '!rotate-180': base.isExpanded }"
+              />
+            </NcButton>
+          </template>
         </div>
       </div>
 
@@ -658,25 +670,29 @@ const onTableIdCopy = async () => {
                     ghost
                   >
                     <template #expandIcon="{ isActive }">
-                      <div
-                        class="nc-sidebar-expand nc-sidebar-node-btn flex flex-row items-center -mt-2 xs:(mt-3 border-1 border-gray-200 px-2.25 py-0.5 rounded-md !mr-0.25)"
+                      <NcButton
+                        v-e="['c:external:base:expand']"
+                        type="text"
+                        size="xxsmall"
+                        class="nc-sidebar-node-btn nc-sidebar-expand !xs:opacity-100"
+                        :class="{ '!opacity-100 !inline-block': isBasesOptionsOpen[source!.id!] }"
                       >
                         <GeneralIcon
-                          icon="triangleFill"
-                          class="nc-sidebar-source-node-btns -mt-0.75 invisible xs:visible cursor-pointer transform transition-transform duration-500 h-1.5 w-1.5 text-gray-500 rotate-90"
+                          icon="chevronDown"
+                          class="flex-none cursor-pointer transform transition-transform duration-500 rotate-270"
                           :class="{ '!rotate-180': isActive }"
                         />
-                      </div>
+                      </NcButton>
                     </template>
                     <a-collapse-panel :key="`collapse-${source.id}`">
                       <template #header>
-                        <div class="nc-sidebar-node min-w-20 w-full flex flex-row group py-0.25">
+                        <div class="nc-sidebar-node min-w-20 w-full h-full flex flex-row group py-0.25 pr-6.5 !mr-0">
                           <div
                             v-if="sourceIndex === 0"
                             class="source-context flex items-center gap-2 text-gray-800 nc-sidebar-node-title"
                             @contextmenu="setMenuContext('source', source)"
                           >
-                            <GeneralBaseLogo class="min-w-4 !xs:(min-w-4.25 w-4.25 text-sm)" />
+                            <GeneralBaseLogo class="flex-none min-w-4 !xs:(min-w-4.25 w-4.25 text-sm)" />
                             {{ $t('general.default') }}
                           </div>
                           <div
@@ -684,22 +700,29 @@ const onTableIdCopy = async () => {
                             class="source-context flex flex-grow items-center gap-1.75 text-gray-800 min-w-1/20 max-w-full"
                             @contextmenu="setMenuContext('source', source)"
                           >
-                            <GeneralBaseLogo class="min-w-4 !xs:(min-w-4.25 w-4.25 text-sm)" />
-                            <div
-                              :data-testid="`nc-sidebar-base-${source.alias}`"
-                              class="nc-sidebar-node-title flex capitalize text-ellipsis overflow-hidden select-none"
+                            <GeneralBaseLogo
+                              class="flex-none min-w-4 !xs:(min-w-4.25 w-4.25 text-sm) !text-gray-600 !group-hover:text-gray-800"
+                            />
+                            <NcTooltip
+                              class="nc-sidebar-node-title capitalize text-ellipsis overflow-hidden select-none"
                               :style="{ wordBreak: 'keep-all', whiteSpace: 'nowrap', display: 'inline' }"
+                              :class="{
+                                'text-black font-semibold': activeProjectId === base.id && baseViewOpen && !isMobileMode,
+                              }"
+                              show-on-truncate-only
                             >
-                              {{ source.alias || '' }}
-                            </div>
-                            <a-tooltip class="xs:(hidden)">
+                              <template #title> {{ source.alias || '' }}</template>
+                              <span :data-testid="`nc-sidebar-base-${source.alias}`">
+                                {{ source.alias || '' }}
+                              </span>
+                            </NcTooltip>
+                            <NcTooltip class="xs:(hidden) flex items-center mr-1">
                               <template #title>{{ $t('objects.externalDb') }}</template>
-                              <div>
-                                <GeneralIcon icon="info" class="text-gray-400 -mt-0.5 hover:text-gray-700 mr-1" />
-                              </div>
-                            </a-tooltip>
+
+                              <GeneralIcon icon="info" class="flex-none text-gray-400 hover:text-gray-700 mr-1" />
+                            </NcTooltip>
                           </div>
-                          <div class="flex flex-row items-center gap-x-0.25 w-12.25">
+                          <div class="flex flex-row items-center gap-x-0.25">
                             <NcDropdown
                               :visible="isBasesOptionsOpen[source!.id!]"
                               :trigger="['click']"
@@ -708,7 +731,7 @@ const onTableIdCopy = async () => {
                               <NcButton
                                 v-e="['c:source:options']"
                                 class="nc-sidebar-node-btn"
-                                :class="{ '!text-black !opacity-100': isBasesOptionsOpen[source!.id!] }"
+                                :class="{ '!text-black !opacity-100 !inline-block': isBasesOptionsOpen[source!.id!] }"
                                 type="text"
                                 size="xxsmall"
                                 @click.stop="isBasesOptionsOpen[source!.id!] = !isBasesOptionsOpen[source!.id!]"
@@ -743,6 +766,7 @@ const onTableIdCopy = async () => {
                               type="text"
                               size="xxsmall"
                               class="nc-sidebar-node-btn"
+                              :class="{ '!opacity-100 !inline-block': isBasesOptionsOpen[source!.id!] }"
                               @click.stop="openTableCreateDialog(sourceIndex)"
                             >
                               <GeneralIcon icon="plus" class="text-xl leading-5" style="-webkit-text-stroke: 0.15px" />
@@ -770,7 +794,7 @@ const onTableIdCopy = async () => {
       <NcMenu
         class="!py-0 rounded text-sm"
         :class="{
-          '!min-w-70': contextMenuTarget.type === 'table',
+          '!min-w-62.5': contextMenuTarget.type === 'table',
         }"
       >
         <template v-if="contextMenuTarget.type === 'base' && base.type === 'database'"></template>
@@ -845,7 +869,11 @@ const onTableIdCopy = async () => {
 
 <style lang="scss" scoped>
 :deep(.ant-collapse-header) {
-  @apply !mx-0 !pl-8.75 !xs:(pl-8) !pr-0.5 !py-0.5 hover:bg-gray-200 xs:(hover:bg-gray-50 ) !rounded-md;
+  @apply !mx-0 !pl-8.75 h-7.1 !xs:(pl-7 h-[3rem]) !pr-0.5 !py-0 hover:bg-gray-200 xs:(hover:bg-gray-50) !rounded-md;
+
+  .ant-collapse-arrow {
+    @apply !right-1 !xs:(flex-none border-1 border-gray-200 w-6.5 h-6.5 mr-1);
+  }
 }
 
 :deep(.ant-collapse-item) {
@@ -856,7 +884,13 @@ const onTableIdCopy = async () => {
   @apply !px-0 !pb-0 !pt-0.25;
 }
 
-:deep(.ant-collapse-header:hover .nc-sidebar-source-node-btns) {
-  @apply visible;
+:deep(.ant-collapse-header:hover) {
+  .nc-sidebar-node-btn {
+    @apply !opacity-100 !inline-block;
+
+    &:not(.nc-sidebar-expand) {
+      @apply !xs:hidden;
+    }
+  }
 }
 </style>
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableList.vue b/packages/nc-gui/components/dashboard/TreeView/TableList.vue
index 2c651bbdea..adfa30fc60 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableList.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableList.vue
@@ -137,8 +137,8 @@ const availableTables = computed(() => {
         v-if="availableTables.length === 0"
         class="py-0.5 text-gray-500"
         :class="{
-          'ml-13.55': sourceIndex === 0,
-          'ml-19.25': sourceIndex !== 0,
+          'ml-8.5': sourceIndex === 0,
+          'ml-14.5 xs:(ml-15.25)': sourceIndex !== 0,
         }"
       >
         {{ $t('general.empty') }}
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 9dc16726f5..fe0101ed6a 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -46,7 +46,7 @@ const { copy } = useCopy()
 const baseRole = inject(ProjectRoleInj)
 provide(SidebarTableInj, table)
 
-const { setMenuContext, openRenameTableDialog, duplicateTable } = inject(TreeViewInj)!
+const { setMenuContext, openRenameTableDialog: _openRenameTableDialog, duplicateTable: _duplicateTable } = inject(TreeViewInj)!
 
 const { loadViews: _loadViews } = useViewsStore()
 const { activeView, activeViewTitleOrId, viewsByTable } = storeToRefs(useViewsStore())
@@ -60,6 +60,8 @@ const openedTableId = computed(() => route.params.viewId)
 
 const isTableDeleteDialogVisible = ref(false)
 
+const isOptionsOpen = ref(false)
+
 const setIcon = async (icon: string, table: TableType) => {
   try {
     table.meta = {
@@ -190,6 +192,21 @@ watch(openedTableId, () => {
     }, 10000)
   }
 })
+
+const duplicateTable = (table: SidebarTableNode) => {
+  isOptionsOpen.value = false
+  _duplicateTable(table)
+}
+
+const openRenameTableDialog = (table: SidebarTableNode, sourceId: string) => {
+  isOptionsOpen.value = false
+  _openRenameTableDialog(table, !!sourceId)
+}
+
+const deleteTable = () => {
+  isOptionsOpen.value = false
+  isTableDeleteDialogVisible.value = true
+}
 </script>
 
 <template>
@@ -198,16 +215,16 @@ watch(openedTableId, () => {
     :data-order="table.order"
     :data-id="table.id"
     :data-table-id="table.id"
-    :class="[`nc-base-tree-tbl nc-base-tree-tbl-${table.title}`]"
+    :class="[`nc-base-tree-tbl nc-base-tree-tbl-${table.title?.replaceAll(' ', '')}`]"
     :data-active="openedTableId === table.id"
   >
     <div
       v-e="['a:table:open']"
-      class="table-context flex items-center gap-1 h-full nc-tree-item-inner nc-sidebar-node pl-11 pr-0.75 mb-0.25 rounded-md h-7.1 w-full group cursor-pointer hover:bg-gray-200"
+      class="table-context flex items-center gap-1 h-full nc-tree-item-inner nc-sidebar-node pr-0.75 mb-0.25 rounded-md h-7.1 w-full group cursor-pointer hover:bg-gray-200"
       :class="{
         'hover:bg-gray-200': openedTableId !== table.id,
-        'pl-12 xs:(pl-14)': sourceIndex !== 0,
-        'pl-6.5': sourceIndex === 0,
+        'pl-13.5': sourceIndex !== 0,
+        'pl-7.5 xs:(pl-6)': sourceIndex === 0,
         '!bg-primary-selected': isTableOpened,
       }"
       :data-testid="`nc-tbl-side-node-${table.title}`"
@@ -215,30 +232,10 @@ watch(openedTableId, () => {
       @click="onOpenTable"
     >
       <div class="flex flex-row h-full items-center">
-        <NcButton
-          v-e="['c:table:toggle-expand']"
-          type="text"
-          size="xxsmall"
-          class="nc-sidebar-node-btn nc-sidebar-expand"
-          @click.stop="onExpand"
-        >
-          <GeneralLoader
-            v-if="table.isViewsLoading"
-            class="flex w-4 h-4 !text-gray-600 !mt-0.75"
-            :class="{
-              '!visible': !isExpanded,
-            }"
-          />
-          <GeneralIcon
-            v-else
-            icon="triangleFill"
-            class="nc-sidebar-source-node-btns group-hover:visible invisible cursor-pointer transform transition-transform duration-500 h-1.5 w-1.5 !text-gray-600 rotate-90"
-            :class="{ '!rotate-180': isExpanded }"
-          />
-        </NcButton>
-
         <div class="flex w-auto" :data-testid="`tree-view-table-draggable-handle-${table.title}`">
+          <GeneralLoader v-if="table.isViewsLoading" class="flex items-center w-6 h-full !text-gray-600" />
           <div
+            v-else
             v-e="['c:table:emoji-picker']"
             class="flex items-center nc-table-icon"
             :class="{
@@ -262,10 +259,11 @@ watch(openedTableId, () => {
                   <component
                     :is="iconMap.table"
                     v-if="table.type === 'table'"
-                    class="flex w-5 !text-gray-500 text-sm"
+                    class="w-4 text-sm"
                     :class="{
-                      'group-hover:text-gray-500': isUIAllowed('tableSort', { roles: baseRole }),
-                      '!text-black': openedTableId === table.id,
+                      '!group-hover:text-gray-700': isUIAllowed('tableSort', { roles: baseRole }),
+                      '!text-gray-700': openedTableId === table.id,
+                      '!text-gray-600/75': openedTableId !== table.id,
                     }"
                   />
 
@@ -284,7 +282,7 @@ watch(openedTableId, () => {
         </div>
       </div>
       <NcTooltip
-        class="nc-tbl-title nc-sidebar-node-title text-ellipsis w-full overflow-hidden select-none"
+        class="nc-tbl-title nc-sidebar-node-title text-ellipsis overflow-hidden select-none !flex-1"
         show-on-truncate-only
       >
         <template #title>{{ table.title }}</template>
@@ -298,88 +296,110 @@ watch(openedTableId, () => {
           {{ table.title }}
         </span>
       </NcTooltip>
-      <div class="flex flex-grow h-full"></div>
-      <div class="flex flex-row items-center">
-        <div v-e="['c:table:option']">
-          <NcDropdown :trigger="['click']" class="nc-sidebar-node-btn" @click.stop>
-            <MdiDotsHorizontal
-              data-testid="nc-sidebar-table-context-menu"
-              class="min-w-5.75 min-h-5.75 mt-0.2 mr-0.25 px-0.5 !text-gray-600 transition-opacity opacity-0 group-hover:opacity-100 nc-tbl-context-menu outline-0 rounded-md hover:(bg-gray-500 bg-opacity-15 !text-black)"
-            />
-
-            <template #overlay>
-              <NcMenu class="!min-w-70" :data-testid="`sidebar-table-context-menu-list-${table.title}`">
-                <NcTooltip>
-                  <template #title> {{ $t('labels.clickToCopyTableID') }} </template>
-                  <div
-                    class="flex items-center justify-between p-2 mx-1.5 rounded-md cursor-pointer hover:bg-gray-100 group"
-                    @click.stop="onTableIdCopy"
-                  >
-                    <div class="flex text-xs font-bold text-gray-500 ml-1">
-                      {{
-                        $t('labels.tableIdColon', {
-                          tableId: table?.id,
-                        })
-                      }}
-                    </div>
-                    <NcButton class="!group-hover:bg-gray-100" size="xsmall" type="secondary">
-                      <GeneralIcon v-if="isTableIdCopied" class="max-h-4 min-w-4" icon="check" />
-                      <GeneralIcon v-else class="max-h-4 min-w-4" else icon="copy" />
-                    </NcButton>
-                  </div>
-                </NcTooltip>
 
-                <template
-                  v-if="
-                    !isSharedBase &&
-                    (isUIAllowed('tableRename', { roles: baseRole }) || isUIAllowed('tableDelete', { roles: baseRole }))
-                  "
-                >
-                  <NcDivider />
-                  <NcMenuItem
-                    v-if="isUIAllowed('tableRename', { roles: baseRole })"
-                    :data-testid="`sidebar-table-rename-${table.title}`"
-                    @click="openRenameTableDialog(table, base.sources[sourceIndex].id)"
-                  >
-                    <div v-e="['c:table:rename']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="rename" class="text-gray-700" />
-                      {{ $t('general.rename') }} {{ $t('objects.table') }}
-                    </div>
-                  </NcMenuItem>
-
-                  <NcMenuItem
-                    v-if="
-                      isUIAllowed('tableDuplicate') &&
-                      base.sources?.[sourceIndex] &&
-                      (base.sources[sourceIndex].is_meta || base.sources[sourceIndex].is_local)
-                    "
-                    :data-testid="`sidebar-table-duplicate-${table.title}`"
-                    @click="duplicateTable(table)"
-                  >
-                    <div v-e="['c:table:duplicate']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="duplicate" class="text-gray-700" />
-                      {{ $t('general.duplicate') }} {{ $t('objects.table') }}
-                    </div>
-                  </NcMenuItem>
-
-                  <NcDivider />
-                  <NcMenuItem
-                    v-if="isUIAllowed('tableDelete', { roles: baseRole })"
-                    :data-testid="`sidebar-table-delete-${table.title}`"
-                    class="!text-red-500 !hover:bg-red-50"
-                    @click="isTableDeleteDialogVisible = true"
-                  >
-                    <div v-e="['c:table:delete']" class="flex gap-2 items-center">
-                      <GeneralIcon icon="delete" />
-                      {{ $t('general.delete') }} {{ $t('objects.table') }}
-                    </div>
-                  </NcMenuItem>
-                </template>
-              </NcMenu>
+      <NcDropdown v-model:visible="isOptionsOpen" :trigger="['click']" @click.stop>
+        <NcButton
+          v-e="['c:table:option']"
+          class="nc-sidebar-node-btn nc-tbl-context-menu text-gray-600"
+          :class="{
+            '!opacity-100 !inline-block': isOptionsOpen,
+          }"
+          data-testid="nc-sidebar-table-context-menu"
+          type="text"
+          size="xxsmall"
+          @click.stop
+        >
+          <MdiDotsHorizontal class="!text-gray-600" />
+        </NcButton>
+
+        <template #overlay>
+          <NcMenu class="!min-w-62.5" :data-testid="`sidebar-table-context-menu-list-${table.title}`">
+            <NcTooltip>
+              <template #title> {{ $t('labels.clickToCopyTableID') }} </template>
+              <div
+                class="flex items-center justify-between p-2 mx-1.5 rounded-md cursor-pointer hover:bg-gray-100 group"
+                @click.stop="onTableIdCopy"
+              >
+                <div class="flex text-xs font-bold text-gray-500 ml-1">
+                  {{
+                    $t('labels.tableIdColon', {
+                      tableId: table?.id,
+                    })
+                  }}
+                </div>
+                <NcButton class="!group-hover:bg-gray-100" size="xsmall" type="secondary">
+                  <GeneralIcon v-if="isTableIdCopied" class="max-h-4 min-w-4" icon="check" />
+                  <GeneralIcon v-else class="max-h-4 min-w-4" else icon="copy" />
+                </NcButton>
+              </div>
+            </NcTooltip>
+
+            <template
+              v-if="
+                !isSharedBase &&
+                (isUIAllowed('tableRename', { roles: baseRole }) || isUIAllowed('tableDelete', { roles: baseRole }))
+              "
+            >
+              <NcDivider />
+              <NcMenuItem
+                v-if="isUIAllowed('tableRename', { roles: baseRole })"
+                :data-testid="`sidebar-table-rename-${table.title}`"
+                @click="openRenameTableDialog(table, base.sources[sourceIndex].id)"
+              >
+                <div v-e="['c:table:rename']" class="flex gap-2 items-center">
+                  <GeneralIcon icon="rename" class="text-gray-700" />
+                  {{ $t('general.rename') }} {{ $t('objects.table') }}
+                </div>
+              </NcMenuItem>
+
+              <NcMenuItem
+                v-if="
+                  isUIAllowed('tableDuplicate') &&
+                  base.sources?.[sourceIndex] &&
+                  (base.sources[sourceIndex].is_meta || base.sources[sourceIndex].is_local)
+                "
+                :data-testid="`sidebar-table-duplicate-${table.title}`"
+                @click="duplicateTable(table)"
+              >
+                <div v-e="['c:table:duplicate']" class="flex gap-2 items-center">
+                  <GeneralIcon icon="duplicate" class="text-gray-700" />
+                  {{ $t('general.duplicate') }} {{ $t('objects.table') }}
+                </div>
+              </NcMenuItem>
+
+              <NcDivider />
+              <NcMenuItem
+                v-if="isUIAllowed('tableDelete', { roles: baseRole })"
+                :data-testid="`sidebar-table-delete-${table.title}`"
+                class="!text-red-500 !hover:bg-red-50"
+                @click="deleteTable"
+              >
+                <div v-e="['c:table:delete']" class="flex gap-2 items-center">
+                  <GeneralIcon icon="delete" />
+                  {{ $t('general.delete') }} {{ $t('objects.table') }}
+                </div>
+              </NcMenuItem>
             </template>
-          </NcDropdown>
-        </div>
-      </div>
+          </NcMenu>
+        </template>
+      </NcDropdown>
+
+      <NcButton
+        v-e="['c:table:toggle-expand']"
+        type="text"
+        size="xxsmall"
+        class="nc-sidebar-node-btn nc-sidebar-expand"
+        :class="{
+          '!opacity-100 !visible': isOptionsOpen,
+        }"
+        @click.stop="onExpand"
+      >
+        <GeneralIcon
+          icon="chevronDown"
+          class="nc-sidebar-source-node-btns cursor-pointer transform transition-transform duration-500 !text-gray-600 rotate-270"
+          :class="{ '!rotate-180': isExpanded }"
+        />
+      </NcButton>
     </div>
     <DlgTableDelete
       v-if="table.id && base?.id"
diff --git a/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue b/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue
index a5083c4aac..cc2d1cd502 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ViewsList.vue
@@ -413,8 +413,8 @@ function onOpenModal({
       v-if="isUIAllowed('viewCreateOrEdit')"
       :align-left-level="isDefaultSource ? 1 : 2"
       :class="{
-        '!pl-18 !xs:(pl-19.75)': isDefaultSource,
-        '!pl-23.5 !xs:(pl-27)': !isDefaultSource,
+        '!pl-13.3 !xs:(pl-13.5)': isDefaultSource,
+        '!pl-18.6 !xs:(pl-20)': !isDefaultSource,
       }"
     >
       <div
diff --git a/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue b/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
index 2714435815..c9a990a1c1 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ViewsNode.vue
@@ -158,6 +158,10 @@ async function onRename() {
   isDropdownOpen.value = false
   if (!isEditing.value) return
 
+  if (_title.value) {
+    _title.value = _title.value.trim()
+  }
+
   const isValid = props.onValidate({ ...vModel.value, title: _title.value! })
 
   if (isValid !== true) {
@@ -217,8 +221,8 @@ watch(isDropdownOpen, async () => {
   <a-menu-item
     class="nc-sidebar-node !min-h-7 !max-h-7 !mb-0.25 select-none group text-gray-700 !flex !items-center !mt-0 hover:(!bg-gray-200 !text-gray-900) cursor-pointer"
     :class="{
-      '!pl-18 !xs:(pl-19.75)': isDefaultBase,
-      '!pl-23.5 !xs:(pl-27)': !isDefaultBase,
+      '!pl-13.5 !xs:(pl-12)': isDefaultBase,
+      '!pl-19 ': !isDefaultBase,
     }"
     :data-testid="`view-sidebar-view-${vModel.alias || vModel.title}`"
     @dblclick.stop="onDblClick"
@@ -248,7 +252,7 @@ watch(isDropdownOpen, async () => {
         v-if="isEditing"
         :ref="focusInput"
         v-model:value="_title"
-        class="!bg-transparent !border-0 !ring-0 !outline-transparent !border-transparent !pl-0"
+        class="!bg-transparent !border-0 !ring-0 !outline-transparent !border-transparent !pl-0 !flex-1 mr-4"
         :class="{
           'font-medium': activeView?.id === vModel.id,
         }"
@@ -267,7 +271,6 @@ watch(isDropdownOpen, async () => {
           {{ vModel.alias || vModel.title }}
         </div>
       </NcTooltip>
-      <div class="flex-1" />
 
       <template v-if="!isEditing && !isLocked">
         <NcDropdown v-model:visible="isDropdownOpen" overlay-class-name="!rounded-lg">
@@ -275,11 +278,12 @@ watch(isDropdownOpen, async () => {
             v-e="['c:view:option']"
             type="text"
             size="xxsmall"
-            class="nc-sidebar-node-btn invisible !group-hover:visible nc-sidebar-view-node-context-btn"
+            class="nc-sidebar-node-btn invisible !group-hover:(visible opacity-100) nc-sidebar-view-node-context-btn"
             :class="{
-              '!visible': isDropdownOpen,
+              '!visible !opacity-100': isDropdownOpen,
             }"
             @click.stop="isDropdownOpen = !isDropdownOpen"
+            @dblclick.stop
           >
             <GeneralIcon icon="threeDotHorizontal" class="text-xl w-4.75" />
           </NcButton>
diff --git a/packages/nc-gui/components/dashboard/View.vue b/packages/nc-gui/components/dashboard/View.vue
index e5b781937f..64c85f1364 100644
--- a/packages/nc-gui/components/dashboard/View.vue
+++ b/packages/nc-gui/components/dashboard/View.vue
@@ -143,8 +143,8 @@ function onResize(widthPercent: any) {
     sideBarSize.value.old = ((16 * fontSize) / viewportWidth.value) * 100
     if (isLeftSidebarOpen.value) sideBarSize.value.current = sideBarSize.value.old
     return
-  } else if (widthRem > 23.5) {
-    sideBarSize.value.old = ((23.5 * fontSize) / viewportWidth.value) * 100
+  } else if (widthRem > 35) {
+    sideBarSize.value.old = ((35 * fontSize) / viewportWidth.value) * 100
     if (isLeftSidebarOpen.value) sideBarSize.value.current = sideBarSize.value.old
 
     return
@@ -155,7 +155,7 @@ function onResize(widthPercent: any) {
 }
 
 const normalizedWidth = computed(() => {
-  const maxSize = remToPx(23.5)
+  const maxSize = remToPx(35)
   const minSize = remToPx(16)
   if (sidebarWidth.value > maxSize) {
     return maxSize
@@ -178,15 +178,15 @@ const normalizedWidth = computed(() => {
     <Pane
       min-size="15%"
       :size="mobileNormalizedSidebarSize"
-      max-size="40%"
-      class="nc-sidebar-splitpane !sm:max-w-94 relative !overflow-visible flex"
+      max-size="60%"
+      class="nc-sidebar-splitpane !sm:max-w-140 relative !overflow-visible flex"
       :style="{
         width: `${mobileNormalizedSidebarSize}%`,
       }"
     >
       <div
         ref="wrapperRef"
-        class="nc-sidebar-wrapper relative flex flex-col h-full justify-center !sm:(max-w-94) absolute overflow-visible"
+        class="nc-sidebar-wrapper relative flex flex-col h-full justify-center !sm:(max-w-140) absolute overflow-visible"
         :class="{
           'mobile': isMobileMode,
           'minimized-height': !isLeftSidebarOpen,
diff --git a/packages/nc-gui/components/dlg/TableCreate.vue b/packages/nc-gui/components/dlg/TableCreate.vue
index 43826b1787..22dab76900 100644
--- a/packages/nc-gui/components/dlg/TableCreate.vue
+++ b/packages/nc-gui/components/dlg/TableCreate.vue
@@ -139,7 +139,7 @@ onMounted(() => {
   <NcModal v-model:visible="dialogShow" :header="$t('activity.createTable')" size="small" @keydown.esc="dialogShow = false">
     <template #header>
       <div class="flex flex-row items-center gap-x-2">
-        <GeneralIcon icon="table" />
+        <GeneralIcon icon="table" class="!text-gray-600/75" />
         {{ $t('activity.createTable') }}
       </div>
     </template>
diff --git a/packages/nc-gui/components/dlg/TableRename.vue b/packages/nc-gui/components/dlg/TableRename.vue
index ab7739c41d..f302d01745 100644
--- a/packages/nc-gui/components/dlg/TableRename.vue
+++ b/packages/nc-gui/components/dlg/TableRename.vue
@@ -87,11 +87,10 @@ const validators = computed(() => {
       {
         validator: (rule: any, value: any) => {
           return new Promise<void>((resolve, reject) => {
-            if (/^\s+|\s+$/.test(value)) {
-              return reject(new Error('Leading or trailing whitespace not allowed in table name'))
-            }
             if (
-              !(tables?.value || []).every((t) => t.id === tableMeta.id || t.title.toLowerCase() !== (value || '').toLowerCase())
+              !(tables?.value || []).every(
+                (t) => t.id === tableMeta.id || t.title.toLowerCase() !== (value?.trim() || '').toLowerCase(),
+              )
             ) {
               return reject(new Error('Duplicate table alias'))
             }
@@ -123,6 +122,11 @@ watchEffect(
 
 const renameTable = async (undo = false, disableTitleDiffCheck?: boolean | undefined) => {
   if (!tableMeta) return
+
+  if (formState.title) {
+    formState.title = formState.title.trim()
+  }
+
   if (formState.title === tableMeta.title && !disableTitleDiffCheck) return
 
   loading.value = true
@@ -216,7 +220,7 @@ const renameTable = async (undo = false, disableTitleDiffCheck?: boolean | undef
         <NcButton
           key="submit"
           type="primary"
-          :disabled="validateInfos.title.validateStatus === 'error' || formState.title === tableMeta.title"
+          :disabled="validateInfos.title.validateStatus === 'error' || formState.title?.trim() === tableMeta.title"
           label="Rename Table"
           loading-label="Renaming Table"
           :loading="loading"
diff --git a/packages/nc-gui/components/dlg/ViewCreate.vue b/packages/nc-gui/components/dlg/ViewCreate.vue
index 3459f7c0ef..2e6fb4786e 100644
--- a/packages/nc-gui/components/dlg/ViewCreate.vue
+++ b/packages/nc-gui/components/dlg/ViewCreate.vue
@@ -162,6 +162,10 @@ async function onSubmit() {
     console.error(e)
   }
 
+  if (form.title) {
+    form.title = form.title.trim()
+  }
+
   if (isValid && form.type) {
     if (!tableId.value) return
 
diff --git a/packages/nc-gui/components/erd/HistogramPanel.vue b/packages/nc-gui/components/erd/HistogramPanel.vue
index 2b1e834753..05757ebaa6 100644
--- a/packages/nc-gui/components/erd/HistogramPanel.vue
+++ b/packages/nc-gui/components/erd/HistogramPanel.vue
@@ -10,7 +10,7 @@ import { iconMap } from '#imports'
   >
     <div class="flex flex-col">
       <div class="flex items-center gap-1.5 p-2">
-        <component :is="iconMap.table" />
+        <component :is="iconMap.table" class="!text-gray-600/75" />
         <div>{{ $t('objects.table') }}</div>
       </div>
 
diff --git a/packages/nc-gui/components/general/OpenLeftSidebarBtn.vue b/packages/nc-gui/components/general/OpenLeftSidebarBtn.vue
index 777dc78984..f5508815a2 100644
--- a/packages/nc-gui/components/general/OpenLeftSidebarBtn.vue
+++ b/packages/nc-gui/components/general/OpenLeftSidebarBtn.vue
@@ -32,7 +32,7 @@ const onClick = () => {
       >
         <div class="flex items-center text-inherit">
           <GeneralIcon v-if="isMobileMode" icon="menu" class="text-lg -mt-0.25" />
-          <GeneralIcon v-else icon="doubleRightArrow" class="duration-150 transition-all !text-lg -mt-0.25" />
+          <GeneralIcon v-else icon="doubleRightArrow" class="duration-150 transition-all !text-lg -mt-0.25 !text-gray-500/75" />
         </div>
       </NcButton>
     </NcTooltip>
diff --git a/packages/nc-gui/components/general/TableIcon.vue b/packages/nc-gui/components/general/TableIcon.vue
index eb7bcad91a..dca555a210 100644
--- a/packages/nc-gui/components/general/TableIcon.vue
+++ b/packages/nc-gui/components/general/TableIcon.vue
@@ -17,6 +17,6 @@ const { meta: tableMeta } = defineProps<{
     readonly
   />
 
-  <component :is="iconMap.eye" v-else-if="tableMeta?.type === 'view'" class="w-5 mx-0.75" />
-  <component :is="iconMap.table" v-else class="w-5 mx-0.5" />
+  <component :is="iconMap.eye" v-else-if="tableMeta?.type === 'view'" class="w-4 mx-0.75" />
+  <component :is="iconMap.table" v-else class="w-4 mx-0.5 !text-gray-600/75" />
 </template>
diff --git a/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue b/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
index 3ebee777f8..9ab9f9cb75 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/GroupByMenu.vue
@@ -234,7 +234,7 @@ watch(meta, async () => {
           <component :is="iconMap.group" class="h-4 w-4" />
 
           <!-- Group By -->
-          <span v-if="!isMobileMode" class="text-capitalize !text-sm font-medium">{{ $t('activity.groupBy') }}</span>
+          <span v-if="!isMobileMode" class="text-capitalize !text-sm font-medium">{{ $t('activity.group') }}</span>
 
           <span v-if="groupedByColumnIds?.length" class="bg-brand-50 text-brand-500 py-1 px-2 text-md rounded-md">{{
             groupedByColumnIds.length
diff --git a/packages/nc-gui/components/smartsheet/toolbar/LockType.vue b/packages/nc-gui/components/smartsheet/toolbar/LockType.vue
index e48363d3b6..8d2cc44060 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/LockType.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/LockType.vue
@@ -33,8 +33,20 @@ const selectedView = inject(ActiveViewInj)
     <div :class="{ 'show-tick': !hideTick }">
       <div class="flex flex-col gap-y-1">
         <div class="flex items-center gap-2 flex-grow">
-          <component :is="types[type].icon" class="!w-4 !min-w-4 text-inherit !h-4" />
-          <div class="flex">
+          <component
+            :is="types[type].icon"
+            class="flex-none"
+            :class="{
+              '!w-3 h-3': hideTick,
+              '!w-4 h-4': !hideTick,
+            }"
+          />
+          <div
+            class="flex"
+            :class="{
+              'text-xs py-0.7': hideTick,
+            }"
+          >
             {{ $t(types[type].title) }}
           </div>
           <div v-if="!hideTick" class="flex flex-grow"></div>
diff --git a/packages/nc-gui/components/workspace/CreateProjectDlg.vue b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
index 9809f582f7..8da7f2526a 100644
--- a/packages/nc-gui/components/workspace/CreateProjectDlg.vue
+++ b/packages/nc-gui/components/workspace/CreateProjectDlg.vue
@@ -55,6 +55,10 @@ const formState = ref({
 const creating = ref(false)
 
 const createProject = async () => {
+  if (formState.value.title) {
+    formState.value.title = formState.value.title.trim()
+  }
+
   creating.value = true
   try {
     const base = await _createProject({
diff --git a/packages/nc-gui/composables/useTableNew.ts b/packages/nc-gui/composables/useTableNew.ts
index 01c74800d5..73d88fb89d 100644
--- a/packages/nc-gui/composables/useTableNew.ts
+++ b/packages/nc-gui/composables/useTableNew.ts
@@ -146,6 +146,11 @@ export function useTableNew(param: { onTableCreate?: (tableMeta: TableType) => v
 
   const createTable = async () => {
     const { onTableCreate, baseId } = param
+
+    if (table.title) {
+      table.title = table.title.trim()
+    }
+
     let { sourceId } = param
 
     if (!(baseId in bases.value)) {
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index f84b0d56c3..b0164345ec 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -946,7 +946,8 @@
       "hidden": "Hide pre-filled fields",
       "lockedFieldTooltip": "Pre-filled value"
     },
-    "getPreFilledLink": "Get Pre-filled Link"
+    "getPreFilledLink": "Get Pre-filled Link",
+    "group": "Group"
   },
   "tooltip": {
     "reachedSourceLimit": "Limited to only one data source for the moment",
diff --git a/tests/playwright/pages/Dashboard/Sidebar/ProjectNode/index.ts b/tests/playwright/pages/Dashboard/Sidebar/ProjectNode/index.ts
index 13c2f3bc91..07b652fb42 100644
--- a/tests/playwright/pages/Dashboard/Sidebar/ProjectNode/index.ts
+++ b/tests/playwright/pages/Dashboard/Sidebar/ProjectNode/index.ts
@@ -12,7 +12,7 @@ export class SidebarProjectNodeObject extends BasePage {
   }
 
   get({ baseTitle }: { baseTitle: string }) {
-    return this.sidebar.get().getByTestId(`nc-sidebar-base-${baseTitle}`);
+    return this.sidebar.get().getByTestId(`nc-sidebar-base-title-${baseTitle}`);
   }
 
   async click({ baseTitle }: { baseTitle: string }) {
@@ -22,6 +22,10 @@ export class SidebarProjectNodeObject extends BasePage {
   }
 
   async clickOptions({ baseTitle }: { baseTitle: string }) {
+    await this.get({
+      baseTitle,
+    }).hover();
+
     await this.get({
       baseTitle,
     })
@@ -30,14 +34,21 @@ export class SidebarProjectNodeObject extends BasePage {
   }
 
   async verifyTableAddBtn({ baseTitle, visible }: { baseTitle: string; visible: boolean }) {
-    const addBtn = await this.get({
+    await this.get({
+      baseTitle,
+    }).waitFor({ state: 'visible' });
+    await this.get({
+      baseTitle,
+    }).scrollIntoViewIfNeeded();
+    await this.get({
+      baseTitle,
+    }).hover();
+
+    const addBtn = this.get({
       baseTitle,
     }).getByTestId('nc-sidebar-add-base-entity');
 
     if (visible) {
-      await addBtn.hover({
-        force: true,
-      });
       await expect(addBtn).toBeVisible();
     } else await expect(addBtn).toHaveCount(0);
   }
@@ -65,6 +76,16 @@ export class SidebarProjectNodeObject extends BasePage {
     deleteVisible?: boolean;
     copyProjectInfoVisible?: boolean;
   }) {
+    await this.get({
+      baseTitle,
+    }).waitFor({ state: 'visible' });
+    await this.get({
+      baseTitle,
+    }).scrollIntoViewIfNeeded();
+    await this.get({
+      baseTitle,
+    }).hover();
+
     const renameLocator = await this.rootPage
       .getByTestId(`nc-sidebar-base-${baseTitle}-options`)
       .getByTestId('nc-sidebar-base-rename');
diff --git a/tests/playwright/pages/Dashboard/TreeView.ts b/tests/playwright/pages/Dashboard/TreeView.ts
index 42fd5539da..4f87867e5e 100644
--- a/tests/playwright/pages/Dashboard/TreeView.ts
+++ b/tests/playwright/pages/Dashboard/TreeView.ts
@@ -27,11 +27,14 @@ export class TreeViewPage extends BasePage {
       .locator('[data-testid="nc-sidebar-add-base-entity"]');
   }
 
-  private getProjectContextMenu({ baseTitle }: { baseTitle: string }) {
-    return this.dashboard
+  private async openProjectContextMenu({ baseTitle }: { baseTitle: string }) {
+    await this.dashboard.get().getByTestId(`nc-sidebar-base-title-${baseTitle}`).hover();
+
+    await this.dashboard
       .get()
       .getByTestId(`nc-sidebar-base-title-${baseTitle}`)
-      .locator('[data-testid="nc-sidebar-context-menu"]');
+      .locator('[data-testid="nc-sidebar-context-menu"]')
+      .click();
   }
 
   async isVisible() {
@@ -61,7 +64,9 @@ export class TreeViewPage extends BasePage {
   }
 
   async focusTable({ title }: { title: string }) {
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).focus();
+    await this.get()
+      .locator(`.nc-base-tree-tbl-${title.replace(/ /g, '')}`)
+      .focus();
   }
 
   async openBase({ title }: { title: string }) {
@@ -78,6 +83,16 @@ export class TreeViewPage extends BasePage {
     return this.get().locator('.nc-tree-item').nth(index);
   }
 
+  async waitForTableOptions({ title }: { title: string }) {
+    const tableTitle = title.replace(/ /g, '');
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).waitFor({ state: 'visible' });
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).scrollIntoViewIfNeeded();
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).getByTestId(`nc-tbl-title-${title}`).hover();
+  }
+
   // assumption: first view rendered is always GRID
   //
   async openTable({
@@ -164,10 +179,11 @@ export class TreeViewPage extends BasePage {
   }
 
   async deleteTable({ title }: { title: string }) {
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).waitFor({ state: 'visible' });
+    const tableTitle = title.replace(/ /g, '');
 
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).scrollIntoViewIfNeeded();
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).locator('.nc-tbl-context-menu').click();
+    await this.waitForTableOptions({ title });
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).locator('.nc-tbl-context-menu').click();
     await this.rootPage.locator('.ant-dropdown').locator('.nc-menu-item:has-text("Delete")').click();
 
     await this.waitForResponse({
@@ -186,9 +202,11 @@ export class TreeViewPage extends BasePage {
   }
 
   async renameTable({ title, newTitle }: { title: string; newTitle: string }) {
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).waitFor({ state: 'visible' });
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).scrollIntoViewIfNeeded();
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).locator('.nc-tbl-context-menu').click();
+    const tableTitle = title.replace(/ /g, '');
+
+    await this.waitForTableOptions({ title });
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).locator('.nc-tbl-context-menu').click();
     await this.rootPage.locator('.ant-dropdown').locator('.nc-menu-item:has-text("Rename")').click();
 
     await this.dashboard.get().locator('[placeholder="Enter table name"]').fill(newTitle);
@@ -204,8 +222,7 @@ export class TreeViewPage extends BasePage {
   }
 
   async baseSettings({ title }: { title?: string }) {
-    await this.getProjectContextMenu({ baseTitle: title }).hover();
-    await this.getProjectContextMenu({ baseTitle: title }).click();
+    await this.openProjectContextMenu({ baseTitle: title });
     const settingsMenu = this.dashboard.get().locator('.ant-dropdown-menu.nc-scrollbar-md');
     await settingsMenu.locator(`.nc-sidebar-base-base-settings`).click();
   }
@@ -213,8 +230,7 @@ export class TreeViewPage extends BasePage {
   async quickImport({ title, baseTitle, context }: { title: string; baseTitle: string; context: NcContext }) {
     baseTitle = this.scopedProjectTitle({ title: baseTitle, context });
 
-    await this.getProjectContextMenu({ baseTitle }).hover();
-    await this.getProjectContextMenu({ baseTitle }).click();
+    await this.openProjectContextMenu({ baseTitle });
     const importMenu = this.dashboard.get().locator('.ant-dropdown-menu');
     await importMenu.locator(`.nc-sub-menu:has-text("Import Data")`).click();
     await this.rootPage.locator(`.ant-dropdown-menu-item:has-text("${title}")`).waitFor();
@@ -222,18 +238,24 @@ export class TreeViewPage extends BasePage {
   }
 
   async changeTableIcon({ title, icon, iconDisplay }: { title: string; icon: string; iconDisplay?: string }) {
-    await this.get().locator(`.nc-base-tree-tbl-${title} .nc-table-icon`).click();
+    const tableTitle = title.replace(/ /g, '');
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle} .nc-table-icon`).click();
 
     await this.rootPage.locator('.emoji-mart-search > input').fill(icon);
     const emojiList = this.rootPage.locator('[id="emoji-mart-list"]');
     await emojiList.locator('button').first().click();
     await expect(
-      this.get().locator(`.nc-base-tree-tbl-${title}`).locator(`.nc-table-icon:has-text("${iconDisplay}")`)
+      this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).locator(`.nc-table-icon:has-text("${iconDisplay}")`)
     ).toHaveCount(1);
   }
 
   async duplicateTable(title: string, includeData = true, includeViews = true) {
-    await this.get().locator(`.nc-base-tree-tbl-${title}`).locator('.nc-icon.ant-dropdown-trigger').click();
+    const tableTitle = title.replace(/ /g, '');
+
+    await this.waitForTableOptions({ title });
+
+    await this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).locator('.nc-icon.ant-dropdown-trigger').click();
     await this.dashboard.get().locator('div.nc-base-menu-item:has-text("Duplicate")').click();
 
     // Find the checkbox element with the label "Include data"
@@ -261,9 +283,11 @@ export class TreeViewPage extends BasePage {
   async verifyTabIcon({ title, icon, iconDisplay }: { title: string; icon: string; iconDisplay?: string }) {
     await new Promise(resolve => setTimeout(resolve, 1000));
 
-    await this.rootPage.locator(`.nc-base-tree-tbl-${title}`).waitFor({ state: 'visible' });
+    const tableTitle = title.replace(/ /g, '');
+
+    await this.rootPage.locator(`.nc-base-tree-tbl-${tableTitle}`).waitFor({ state: 'visible' });
     await expect(
-      this.get().locator(`.nc-base-tree-tbl-${title}`).locator(`.nc-table-icon:has-text("${iconDisplay}")`)
+      this.get().locator(`.nc-base-tree-tbl-${tableTitle}`).locator(`.nc-table-icon:has-text("${iconDisplay}")`)
     ).toHaveCount(1);
   }
 
@@ -322,8 +346,7 @@ export class TreeViewPage extends BasePage {
     param.title = this.scopedProjectTitle({ title: param.title, context: param.context });
     param.newTitle = this.scopedProjectTitle({ title: param.newTitle, context: param.context });
 
-    await this.getProjectContextMenu({ baseTitle: param.title }).hover();
-    await this.getProjectContextMenu({ baseTitle: param.title }).click();
+    await this.openProjectContextMenu({ baseTitle: param.title });
     const contextMenu = this.dashboard.get().locator('.ant-dropdown-menu.nc-scrollbar-md:visible').last();
     await contextMenu.waitFor();
     await contextMenu.locator(`.ant-dropdown-menu-item:has-text("Rename")`).click();
@@ -337,8 +360,7 @@ export class TreeViewPage extends BasePage {
   async deleteProject(param: { title: string; context: NcContext }) {
     param.title = this.scopedProjectTitle({ title: param.title, context: param.context });
 
-    await this.getProjectContextMenu({ baseTitle: param.title }).hover();
-    await this.getProjectContextMenu({ baseTitle: param.title }).click();
+    await this.openProjectContextMenu({ baseTitle: param.title });
     const contextMenu = this.dashboard.get().locator('.ant-dropdown-menu.nc-scrollbar-md:visible').last();
     await contextMenu.waitFor();
     await contextMenu.locator(`.ant-dropdown-menu-item:has-text("Delete")`).click();
@@ -349,8 +371,7 @@ export class TreeViewPage extends BasePage {
   async duplicateProject(param: { title: string; context: NcContext }) {
     param.title = this.scopedProjectTitle({ title: param.title, context: param.context });
 
-    await this.getProjectContextMenu({ baseTitle: param.title }).hover();
-    await this.getProjectContextMenu({ baseTitle: param.title }).click();
+    await this.openProjectContextMenu({ baseTitle: param.title });
     const contextMenu = this.dashboard.get().locator('.ant-dropdown-menu.nc-scrollbar-md:visible');
     await contextMenu.waitFor();
     await contextMenu.locator(`.ant-dropdown-menu-item:has-text("Duplicate")`).click();
diff --git a/tests/playwright/pages/Dashboard/index.ts b/tests/playwright/pages/Dashboard/index.ts
index 5e98c142c3..adf8201aeb 100644
--- a/tests/playwright/pages/Dashboard/index.ts
+++ b/tests/playwright/pages/Dashboard/index.ts
@@ -33,7 +33,6 @@ import { CalendarPage } from './Calendar';
 export class DashboardPage extends BasePage {
   readonly base: any;
   readonly tablesSideBar: Locator;
-  readonly baseMenuLink: Locator;
   readonly workspaceMenuLink: Locator;
   readonly tabBar: Locator;
   readonly treeView: TreeViewPage;
@@ -69,10 +68,6 @@ export class DashboardPage extends BasePage {
     this.base = base;
     this.tablesSideBar = rootPage.locator('.nc-treeview-container');
     this.workspaceMenuLink = rootPage.getByTestId('nc-base-menu');
-    this.baseMenuLink = rootPage
-      .locator(`.base-title-node:has-text("${base.title}")`)
-      .locator('[data-testid="nc-sidebar-context-menu"]')
-      .first();
     this.tabBar = rootPage.locator('.nc-tab-bar');
     this.treeView = new TreeViewPage(this, base);
     this.grid = new GridPage(this);
@@ -114,27 +109,37 @@ export class DashboardPage extends BasePage {
     return this.rootPage.locator(`div.nc-base-menu-item:has-text("${title}")`);
   }
 
+  async clickOnBaseMenuLink() {
+    const baseMenuLocator = this.rootPage.locator(`.base-title-node:has-text("${this.base.title}")`).first();
+
+    await baseMenuLocator.waitFor({ state: 'visible' });
+    await baseMenuLocator.scrollIntoViewIfNeeded();
+    await baseMenuLocator.hover();
+
+    await baseMenuLocator.locator('[data-testid="nc-sidebar-context-menu"]').first().click();
+  }
+
   async verifyTeamAndSettingsLinkIsVisible() {
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
     const teamAndSettingsLink = this.getProjectMenuLink({ title: ' Team & Settings' });
     await expect(teamAndSettingsLink).toBeVisible();
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
   }
 
   async verifyTeamAndSettingsLinkIsNotVisible() {
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
     const teamAndSettingsLink = this.getProjectMenuLink({ title: ' Team & Settings' });
     await expect(teamAndSettingsLink).not.toBeVisible();
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
   }
 
   async gotoSettings() {
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
     await this.rootPage.locator('.ant-dropdown').locator(`.nc-menu-item:has-text("Settings")`).click();
   }
 
   async gotoProjectSubMenu({ title }: { title: string }) {
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
     await this.rootPage.locator(`div.nc-base-menu-item:has-text("${title}")`).click();
   }
 
@@ -179,10 +184,10 @@ export class DashboardPage extends BasePage {
   // When a tab is opened, it is not always immediately visible.
 
   async toggleMobileMode() {
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
     const projMenu = this.rootPage.locator('.nc-dropdown-base-menu');
     await projMenu.locator('[data-menu-id="mobile-mode"]:visible').click();
-    await this.baseMenuLink.click();
+    await this.clickOnBaseMenuLink();
   }
 
   async signOut() {