diff --git a/packages/nc-gui/components/dashboard/settings/UIAcl.vue b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
index b7c85dcba7..a0489d0eaf 100644
--- a/packages/nc-gui/components/dashboard/settings/UIAcl.vue
+++ b/packages/nc-gui/components/dashboard/settings/UIAcl.vue
@@ -221,11 +221,16 @@ const toggleSelectAll = (role: Role) => {
             <div v-if="column.name === 'View Name'">
               <div class="flex items-center gap-1">
                 <div class="min-w-5 flex items-center justify-center">
-                  <GeneralViewIcon :meta="record" class="text-gray-500"></GeneralViewIcon>
+                  <GeneralTableIcon
+                    v-if="record?.meta?.icon"
+                    :meta="{ meta: record.meta, type: 'view' }"
+                    class="text-gray-500 !text-sm children:(!w-5 !h-5)"
+                  />
+                  <GeneralViewIcon v-else :meta="record" class="text-gray-500"></GeneralViewIcon>
                 </div>
                 <NcTooltip class="overflow-ellipsis min-w-0 shrink-1 truncate" show-on-truncate-only>
-                  <template #title>{{ record.title }}</template>
-                  <span>{{ record.title }}</span>
+                  <template #title>{{ record.is_default ? $t('title.defaultView') : record.title }}</template>
+                  <span>{{ record.is_default ? $t('title.defaultView') : record.title }}</span>
                 </NcTooltip>
               </div>
             </div>
diff --git a/packages/nc-gui/components/general/TableIcon.vue b/packages/nc-gui/components/general/TableIcon.vue
index 0f4ea0f2d7..eb7bcad91a 100644
--- a/packages/nc-gui/components/general/TableIcon.vue
+++ b/packages/nc-gui/components/general/TableIcon.vue
@@ -9,7 +9,7 @@ const { meta: tableMeta } = defineProps<{
 
 <template>
   <LazyGeneralEmojiPicker
-    v-if="tableMeta.meta?.icon"
+    v-if="tableMeta?.meta?.icon"
     :data-testid="`nc-emoji-${tableMeta.meta?.icon}`"
     class="text-lg"
     size="small"
diff --git a/packages/nc-gui/components/project/AllTables.vue b/packages/nc-gui/components/project/AllTables.vue
index 43058bcaa6..5dcdbaad1e 100644
--- a/packages/nc-gui/components/project/AllTables.vue
+++ b/packages/nc-gui/components/project/AllTables.vue
@@ -142,7 +142,9 @@ const onCreateBaseClick = () => {
         @click="openTable(table)"
       >
         <div class="flex flex-row w-2/5 items-center gap-x-2" data-testid="proj-view-list__item-title">
-          <GeneralIcon icon="table" class="text-gray-700" />
+          <div class="min-w-5 flex items-center justify-center">
+            <GeneralTableIcon :meta="table" class="text-gray-500" />
+          </div>
           {{ table?.title }}
         </div>
         <div class="w-1/5 text-gray-600" data-testid="proj-view-list__item-type">
diff --git a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
index 4fd776cfd7..880a2ea70d 100644
--- a/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
+++ b/packages/nc-gui/components/smartsheet/expanded-form/Comments.vue
@@ -301,9 +301,21 @@ const onClickAudit = () => {
                 <GeneralUserIcon size="base" :email="log.user" />
 
                 <div class="flex flex-col">
-                  <span class="truncate font-bold max-w-50">
-                    {{ log.display_name ?? log.user.split('@')[0].slice(0, 2) ?? 'Shared source' }}
-                  </span>
+                  <NcTooltip class="truncate max-w-50" show-on-truncate-only>
+                    <template #title>
+                      {{ log.display_name?.trim() || log.user || 'Shared source' }}
+                    </template>
+                    <span
+                      class="text-ellipsis overflow-hidden font-bold"
+                      :style="{
+                        wordBreak: 'keep-all',
+                        whiteSpace: 'nowrap',
+                        display: 'inline',
+                      }"
+                    >
+                      {{ log.display_name?.trim() || log.user || 'Shared source' }}
+                    </span>
+                  </NcTooltip>
                   <div v-if="log.id !== editLog?.id" class="text-xs font-medium text-gray-500">
                     {{ timeAgo(log.created_at) }}
                   </div>