diff --git a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
index bc2c18e4fc..5ca70d8f5b 100644
--- a/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/ProjectNode.vue
@@ -657,7 +657,7 @@ const projectDelete = () => {
                             class="source-context flex items-center gap-2 text-gray-800 nc-sidebar-node-title"
                             @contextmenu="setMenuContext('source', source)"
                           >
-                            <GeneralBaseLogo :source-type="source.type" class="min-w-4 !xs:(min-w-4.25 w-4.25 text-sm)" />
+                            <GeneralBaseLogo class="min-w-4 !xs:(min-w-4.25 w-4.25 text-sm)" />
                             {{ $t('general.default') }}
                           </div>
                           <div
@@ -665,7 +665,7 @@ const projectDelete = () => {
                             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 :source-type="source.type" class="min-w-4 !xs:(min-w-4.25 w-4.25 text-sm)" />
+                            <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"
diff --git a/packages/nc-gui/components/dashboard/settings/DataSources.vue b/packages/nc-gui/components/dashboard/settings/DataSources.vue
index 1ba679050d..083e47b273 100644
--- a/packages/nc-gui/components/dashboard/settings/DataSources.vue
+++ b/packages/nc-gui/components/dashboard/settings/DataSources.vue
@@ -315,7 +315,7 @@ const isEditBaseModalOpen = computed({
             <div class="ds-table-col ds-table-enabled cursor-pointer" @dblclick="forceAwaken">{{ $t('general.visibility') }}</div>
             <div class="ds-table-col ds-table-name">{{ $t('general.name') }}</div>
             <div class="ds-table-col ds-table-type">{{ $t('general.type') }}</div>
-            <div class="ds-table-col ds-table-actions pl-2">{{ $t('labels.actions') }}</div>
+            <div class="ds-table-col ds-table-actions -ml-13">{{ $t('labels.actions') }}</div>
             <div class="ds-table-col ds-table-crud"></div>
           </div>
         </div>
@@ -351,58 +351,82 @@ const isEditBaseModalOpen = computed({
 
                 <div class="ds-table-col ds-table-actions">
                   <div class="flex items-center gap-2">
-                    <a-button
-                      v-if="!sources[0].is_meta && !sources[0].is_local"
-                      class="nc-action-btn cursor-pointer outline-0"
-                      type="text"
-                      @click="baseAction(sources[0].id, DataSourcesSubTab.Metadata)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="sync" class="group-hover:text-accent" />
+                    <NcTooltip v-if="!sources[0].is_meta && !sources[0].is_local">
+                      <template #title>
                         {{ $t('tooltip.metaSync') }}
-                      </div>
-                    </a-button>
-                    <a-button
-                      class="nc-action-btn cursor-pointer outline-0"
-                      type="text"
-                      @click="baseAction(sources[0].id, DataSourcesSubTab.ERD)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="erd" class="group-hover:text-accent" />
+                      </template>
+                      <NcButton
+                        class="nc-action-btn cursor-pointer outline-0"
+                        type="text"
+                        data-testid="nc-data-sources-view-meta-sync"
+                        size="small"
+                        @click="baseAction(sources[0].id, DataSourcesSubTab.Metadata)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="sync" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
+                    <NcTooltip>
+                      <template #title>
                         {{ $t('title.relations') }}
-                      </div>
-                    </a-button>
-                    <a-button
-                      class="nc-action-btn cursor-pointer outline-0"
-                      type="text"
-                      @click="baseAction(sources[0].id, DataSourcesSubTab.UIAcl)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="acl" class="group-hover:text-accent" />
+                      </template>
+                      <NcButton
+                        size="small"
+                        class="nc-action-btn cursor-pointer outline-0"
+                        type="text"
+                        data-testid="nc-data-sources-view-erd"
+                        @click="baseAction(sources[0].id, DataSourcesSubTab.ERD)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="erd" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
+                    <NcTooltip>
+                      <template #title>
                         {{ $t('labels.uiAcl') }}
-                      </div>
-                    </a-button>
-                    <a-button
-                      class="nc-action-btn cursor-pointer outline-0"
-                      type="text"
-                      @click="baseAction(sources[0].id, DataSourcesSubTab.Audit)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="book" class="group-hover:text-accent" />
+                      </template>
+                      <NcButton
+                        size="small"
+                        class="nc-action-btn cursor-pointer outline-0"
+                        type="text"
+                        data-testid="nc-data-sources-view-ui-acl"
+                        @click="baseAction(sources[0].id, DataSourcesSubTab.UIAcl)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="acl" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
+                    <NcTooltip>
+                      <template #title>
                         {{ $t('title.audit') }}
-                      </div>
-                    </a-button>
+                      </template>
+                      <NcButton
+                        size="small"
+                        class="nc-action-btn cursor-pointer outline-0"
+                        type="text"
+                        data-testid="nc-data-sources-view-audit"
+                        @click="baseAction(sources[0].id, DataSourcesSubTab.Audit)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="book" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
                   </div>
                 </div>
                 <div class="ds-table-col ds-table-crud">
-                  <a-button
+                  <NcButton
                     v-if="!sources[0].is_meta && !sources[0].is_local"
+                    size="small"
                     class="nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg"
                     type="text"
                     @click="baseAction(sources[0].id, DataSourcesSubTab.Edit)"
                   >
                     <GeneralIcon icon="edit" class="text-gray-600" />
-                  </a-button>
+                  </NcButton>
                 </div>
               </div>
             </template>
@@ -419,12 +443,12 @@ const isEditBaseModalOpen = computed({
                     </a-tooltip>
                   </div>
                 </div>
-                <div class="ds-table-col ds-table-name font-medium">
+                <div class="ds-table-col ds-table-name font-medium w-full">
                   <GeneralIcon v-if="sources.length > 2" icon="dragVertical" small class="ds-table-handle" />
                   <div v-if="source.is_meta || source.is_local">-</div>
-                  <div v-else class="flex items-center gap-1">
+                  <span v-else class="truncate">
                     {{ source.is_meta || source.is_local ? $t('general.base') : source.alias }}
-                  </div>
+                  </span>
                 </div>
 
                 <div class="ds-table-col ds-table-type">
@@ -437,56 +461,86 @@ const isEditBaseModalOpen = computed({
 
                 <div class="ds-table-col ds-table-actions">
                   <div class="flex items-center gap-2">
-                    <a-button
-                      class="nc-action-btn cursor-pointer outline-0"
-                      type="text"
-                      @click="baseAction(source.id, DataSourcesSubTab.ERD)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="erd" class="group-hover:text-accent" />
+                    <NcTooltip>
+                      <template #title>
                         {{ $t('title.relations') }}
-                      </div>
-                    </a-button>
-                    <a-button
-                      type="text"
-                      class="nc-action-btn cursor-pointer outline-0"
-                      @click="baseAction(source.id, DataSourcesSubTab.UIAcl)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="acl" class="group-hover:text-accent" />
+                      </template>
+                      <NcButton
+                        size="small"
+                        class="nc-action-btn cursor-pointer outline-0"
+                        type="text"
+                        data-testid="nc-data-sources-view-erd"
+                        @click="baseAction(source.id, DataSourcesSubTab.ERD)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="erd" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
+                    <NcTooltip>
+                      <template #title>
                         {{ $t('labels.uiAcl') }}
-                      </div>
-                    </a-button>
-                    <a-button
-                      v-if="!source.is_meta && !source.is_local"
-                      type="text"
-                      class="nc-action-btn cursor-pointer outline-0"
-                      @click="baseAction(source.id, DataSourcesSubTab.Metadata)"
-                    >
-                      <div class="flex items-center gap-2 text-gray-600">
-                        <GeneralIcon icon="sync" class="group-hover:text-accent" />
+                      </template>
+                      <NcButton
+                        size="small"
+                        type="text"
+                        class="nc-action-btn cursor-pointer outline-0"
+                        data-testid="nc-data-sources-view-ui-acl"
+                        @click="baseAction(source.id, DataSourcesSubTab.UIAcl)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="acl" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
+                    <NcTooltip>
+                      <template #title>
                         {{ $t('tooltip.metaSync') }}
-                      </div>
-                    </a-button>
+                      </template>
+                      <NcButton
+                        v-if="!source.is_meta && !source.is_local"
+                        size="small"
+                        type="text"
+                        data-testid="nc-data-sources-view-meta-sync"
+                        class="nc-action-btn cursor-pointer outline-0"
+                        @click="baseAction(source.id, DataSourcesSubTab.Metadata)"
+                      >
+                        <div class="flex items-center gap-2 text-gray-600">
+                          <GeneralIcon icon="sync" class="group-hover:text-accent" />
+                        </div>
+                      </NcButton>
+                    </NcTooltip>
                   </div>
                 </div>
                 <div class="ds-table-col ds-table-crud justify-end gap-x-1">
-                  <a-button
-                    v-if="!source.is_meta && !source.is_local"
-                    class="nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg mt-0.5"
-                    type="text"
-                    @click="baseAction(source.id, DataSourcesSubTab.Edit)"
-                  >
-                    <GeneralIcon icon="edit" class="text-gray-600 -mt-0.5" />
-                  </a-button>
-                  <a-button
-                    v-if="!source.is_meta && !source.is_local"
-                    class="nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg mt-0.5"
-                    type="text"
-                    @click="openDeleteBase(source)"
-                  >
-                    <GeneralIcon icon="delete" class="text-red-500 -mt-0.5" />
-                  </a-button>
+                  <NcTooltip>
+                    <template #title>
+                      {{ $t('general.edit') }}
+                    </template>
+                    <NcButton
+                      v-if="!source.is_meta && !source.is_local"
+                      size="small"
+                      class="nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg"
+                      type="text"
+                      @click="baseAction(source.id, DataSourcesSubTab.Edit)"
+                    >
+                      <GeneralIcon icon="edit" class="text-gray-600" />
+                    </NcButton>
+                  </NcTooltip>
+                  <NcTooltip>
+                    <template #title>
+                      {{ $t('general.delete') }}
+                    </template>
+                    <NcButton
+                      v-if="!source.is_meta && !source.is_local"
+                      size="small"
+                      class="nc-action-btn cursor-pointer outline-0 !w-8 !px-1 !rounded-lg"
+                      type="text"
+                      @click="openDeleteBase(source)"
+                    >
+                      <GeneralIcon icon="delete" class="text-red-500" />
+                    </NcButton>
+                  </NcTooltip>
                 </div>
               </div>
             </template>
@@ -550,7 +604,7 @@ const isEditBaseModalOpen = computed({
 
 <style>
 .ds-table-head {
-  @apply flex items-center border-0 text-gray-400;
+  @apply flex items-center border-0 text-gray-500;
 }
 
 .ds-table-body {
@@ -570,15 +624,15 @@ const isEditBaseModalOpen = computed({
 }
 
 .ds-table-name {
-  @apply col-span-6 items-center capitalize;
+  @apply col-span-9 items-center capitalize;
 }
 
 .ds-table-type {
-  @apply col-span-3 items-center;
+  @apply col-span-2 items-center;
 }
 
 .ds-table-actions {
-  @apply col-span-7;
+  @apply col-span-5 flex w-full justify-end;
 }
 
 .ds-table-crud {
diff --git a/packages/nc-gui/components/general/BaseLogo.vue b/packages/nc-gui/components/general/BaseLogo.vue
index 4655de0625..1720d12083 100644
--- a/packages/nc-gui/components/general/BaseLogo.vue
+++ b/packages/nc-gui/components/general/BaseLogo.vue
@@ -6,10 +6,10 @@ import SimpleIconsMicrosoftsqlserver from '~icons/simple-icons/microsoftsqlserve
 import LogosSnowflakeIcon from '~icons/logos/snowflake-icon'
 import MdiDatabaseOutline from '~icons/mdi/database-outline'
 
-const { baseType } = defineProps<{ baseType?: string }>()
+const { sourceType } = defineProps<{ sourceType?: string }>()
 
 const baseIcon = computed(() => {
-  switch (baseType) {
+  switch (sourceType) {
     case ClientType.MYSQL:
       return LogosMysqlIcon
     case ClientType.PG:
diff --git a/packages/nc-gui/components/nc/Tooltip.vue b/packages/nc-gui/components/nc/Tooltip.vue
index 0810b8b3ab..97b159e4a9 100644
--- a/packages/nc-gui/components/nc/Tooltip.vue
+++ b/packages/nc-gui/components/nc/Tooltip.vue
@@ -12,6 +12,7 @@ interface Props {
   disabled?: boolean
   placement?: TooltipPlacement | undefined
   hideOnClick?: boolean
+  overlayClassName?: string
 }
 
 const props = defineProps<Props>()
@@ -36,6 +37,8 @@ const attrs = useAttrs()
 
 const isKeyPressed = ref(false)
 
+const overlayClassName = computed(() => props.overlayClassName)
+
 onKeyStroke(
   (e) => e.key === modifierKey.value,
   (e) => {
@@ -100,7 +103,7 @@ const onClick = () => {
 <template>
   <a-tooltip
     v-model:visible="showTooltip"
-    :overlay-class-name="`nc-tooltip ${showTooltip ? 'visible' : 'hidden'}`"
+    :overlay-class-name="`nc-tooltip ${showTooltip ? 'visible' : 'hidden'} ${overlayClassName}`"
     :overlay-style="tooltipStyle"
     arrow-point-at-center
     :trigger="[]"
diff --git a/packages/nc-gui/components/project/AllTables.vue b/packages/nc-gui/components/project/AllTables.vue
index 4affed1129..abd2d4cd13 100644
--- a/packages/nc-gui/components/project/AllTables.vue
+++ b/packages/nc-gui/components/project/AllTables.vue
@@ -147,8 +147,8 @@ const onCreateBaseClick = () => {
         </div>
         <div class="w-1/5 text-gray-600" data-testid="proj-view-list__item-type">
           <div v-if="table.source_id === defaultBase?.id" class="ml-0.75">-</div>
-          <div v-else>
-            <GeneralBaseLogo :source-type="sources.get(table.source_id!)?.type" class="w-4 mr-1" />
+          <div v-else class="capitalize flex flex-row items-center gap-x-0.5">
+            <GeneralBaseLogo class="w-4 mr-1" />
             {{ sources.get(table.source_id!)?.alias }}
           </div>
         </div>
diff --git a/packages/nc-gui/components/project/View.vue b/packages/nc-gui/components/project/View.vue
index e7d91c927d..00bbdd3079 100644
--- a/packages/nc-gui/components/project/View.vue
+++ b/packages/nc-gui/components/project/View.vue
@@ -3,7 +3,7 @@ import { useTitle } from '@vueuse/core'
 import NcLayout from '~icons/nc-icons/layout'
 const { openedProject } = storeToRefs(useBases())
 const { activeTables } = storeToRefs(useTablesStore())
-const { activeWorkspace } = storeToRefs(useWorkspace())
+const { activeWorkspace, workspaceUserCount } = storeToRefs(useWorkspace())
 
 const { navigateToProjectPage } = useBase()
 
@@ -113,6 +113,16 @@ watch(
             <div class="tab-title" data-testid="proj-view-tab__access-settings">
               <GeneralIcon icon="users" class="!h-3.5 !w-3.5" />
               <div>{{ $t('labels.members') }}</div>
+              <div
+                v-if="workspaceUserCount"
+                class="tab-info"
+                :class="{
+                  'bg-primary-selected': projectPageTab === 'data-source',
+                  'bg-gray-50': projectPageTab !== 'data-source',
+                }"
+              >
+                {{ workspaceUserCount }}
+              </div>
             </div>
           </template>
           <ProjectAccessSettings />
@@ -130,7 +140,7 @@ watch(
                   'bg-gray-50': projectPageTab !== 'data-source',
                 }"
               >
-                {{ base.sources.length - 1 }}
+                {{ base.sources.length }}
               </div>
             </div>
           </template>
diff --git a/tests/playwright/pages/Dashboard/ProjectView/DataSourcePage.ts b/tests/playwright/pages/Dashboard/ProjectView/DataSourcePage.ts
index b8ee201419..5d17bf5c3a 100644
--- a/tests/playwright/pages/Dashboard/ProjectView/DataSourcePage.ts
+++ b/tests/playwright/pages/Dashboard/ProjectView/DataSourcePage.ts
@@ -39,7 +39,7 @@ export class DataSourcePage extends BasePage {
     const row = this.get()
       .locator('.ds-table-row')
       .nth(rowIndex + 1);
-    await row.locator('button.nc-action-btn:has-text("Sync Metadata")').click();
+    await row.getByTestId('nc-data-sources-view-meta-sync').click();
   }
 
   async openERD({ rowIndex }: { rowIndex: number }) {
@@ -47,7 +47,7 @@ export class DataSourcePage extends BasePage {
     const row = this.get()
       .locator('.ds-table-row')
       .nth(rowIndex + 1);
-    await row.locator('button.nc-action-btn:has-text("Relations")').click();
+    await row.getByTestId('nc-data-sources-view-erd').click();
   }
 
   async openAudit({ rowIndex }: { rowIndex: number }) {
@@ -55,6 +55,6 @@ export class DataSourcePage extends BasePage {
     const row = this.get()
       .locator('.ds-table-row')
       .nth(rowIndex + 1);
-    await row.locator('button.nc-action-btn:has-text("Audit")').click();
+    await row.getByTestId('nc-data-sources-view-audit').click();
   }
 }