diff --git a/app/src/assets/scss/business/_block.scss b/app/src/assets/scss/business/_block.scss
index 3b142c8c3..7c2577304 100644
--- a/app/src/assets/scss/business/_block.scss
+++ b/app/src/assets/scss/business/_block.scss
@@ -107,16 +107,17 @@
   }
 
   &__logo {
-    svg {
-      height: 16px;
-      width: 16px;
-      padding: 4px;
-      flex-shrink: 0;
-    }
-
     white-space: nowrap;
     margin-right: 8px;
     display: flex;
     align-items: center;
   }
+
+  &__logoicon {
+    margin-right: 4px;
+    height: 16px;
+    width: 16px;
+    padding: 4px;
+    flex-shrink: 0;
+  }
 }
diff --git a/app/src/assets/scss/business/_custom.scss b/app/src/assets/scss/business/_custom.scss
index daafeb01b..1584d9598 100644
--- a/app/src/assets/scss/business/_custom.scss
+++ b/app/src/assets/scss/business/_custom.scss
@@ -23,10 +23,6 @@
       transition: var(--b3-transition);
       cursor: pointer;
 
-      svg {
-        margin-right: 4px;
-      }
-
       &:hover {
         opacity: 1;
       }
@@ -42,10 +38,6 @@
     width: 160px;
     color: var(--b3-theme-on-surface);
 
-    svg {
-      margin-right: 4px;
-    }
-
     span {
       text-overflow: ellipsis;
       white-space: nowrap;
diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts
index 5ddea7521..9a30a7231 100644
--- a/app/src/card/openCard.ts
+++ b/app/src/card/openCard.ts
@@ -45,7 +45,7 @@ export const genCardHTML = (options: {
     /// #else
     iconsHTML = `<div class="block__icons">
         ${options.isTab ? '<div class="fn__flex-1"></div>' : `<div class="block__logo">
-            <svg><use xlink:href="#iconRiffCard"></use></svg>${window.siyuan.languages.riffCard}
+            <svg class="block__logoicon"><use xlink:href="#iconRiffCard"></use></svg>${window.siyuan.languages.riffCard}
         </div>`}
         <span class="fn__flex-1 resize__move" style="min-height: 100%"></span>
         <div data-type="count" class="ft__on-surface ft__smaller fn__flex-center${options.cardsData.cards.length === 0 ? " fn__none" : " fn__flex"}">${genCardCount(options.cardsData.unreviewedNewCardCount, options.cardsData.unreviewedOldCardCount)}</span></div>
diff --git a/app/src/layout/dock/Backlink.ts b/app/src/layout/dock/Backlink.ts
index 93dfd0703..a6f451cfb 100644
--- a/app/src/layout/dock/Backlink.ts
+++ b/app/src/layout/dock/Backlink.ts
@@ -81,8 +81,7 @@ export class Backlink extends Model {
         this.element.classList.add("fn__flex-column", "file-tree", "sy__backlink");
         this.element.innerHTML = `<div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconLink"></use></svg>
-        ${window.siyuan.languages.backlinks}
+        <svg class="block__logoicon"><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.backlinks}
     </div>
     <span class="counter listCount" style="margin-left: 0"></span>
     <span class="fn__flex-1"></span>
@@ -107,8 +106,7 @@ export class Backlink extends Model {
 <div class="backlinkList fn__flex-1"></div>
 <div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconLink"></use></svg>
-        ${window.siyuan.languages.mentions}
+        <svg class="block__logoicon"><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.mentions}
     </div>
     <span class="counter listMCount" style="margin-left: 0;"></span>
     <span class="fn__flex-1"></span>
diff --git a/app/src/layout/dock/Bookmark.ts b/app/src/layout/dock/Bookmark.ts
index 3989fd599..0b0d0c5a7 100644
--- a/app/src/layout/dock/Bookmark.ts
+++ b/app/src/layout/dock/Bookmark.ts
@@ -56,8 +56,7 @@ export class Bookmark extends Model {
         this.element.classList.add("fn__flex-column", "file-tree", "sy__bookmark");
         this.element.innerHTML = `<div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconBookmark"></use></svg>
-        ${window.siyuan.languages.bookmark}
+        <svg class="block__logoicon"><use xlink:href="#iconBookmark"></use></svg>${window.siyuan.languages.bookmark}
     </div>
     <span class="fn__flex-1"></span>
     <span class="fn__space"></span>
diff --git a/app/src/layout/dock/Files.ts b/app/src/layout/dock/Files.ts
index 22007aee8..cabb43b41 100644
--- a/app/src/layout/dock/Files.ts
+++ b/app/src/layout/dock/Files.ts
@@ -86,8 +86,7 @@ export class Files extends Model {
         options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__file");
         options.tab.panelElement.innerHTML = `<div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconFiles"></use></svg>
-        ${window.siyuan.languages.fileTree}
+        <svg class="block__logoicon"><use xlink:href="#iconFiles"></use></svg>${window.siyuan.languages.fileTree}
     </div>
     <span class="fn__flex-1 fn__space"></span>
     <span data-type="focus" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.selectOpen1} ${updateHotkeyTip(window.siyuan.config.keymap.general.selectOpen1.custom)}"><svg><use xlink:href='#iconFocus'></use></svg></span>
diff --git a/app/src/layout/dock/Graph.ts b/app/src/layout/dock/Graph.ts
index f2991a94d..f1d92c823 100644
--- a/app/src/layout/dock/Graph.ts
+++ b/app/src/layout/dock/Graph.ts
@@ -258,8 +258,7 @@ export class Graph extends Model {
         this.element.innerHTML = `
 <div class="block__icons"> 
     <div class="block__logo">
-        <svg><use xlink:href="#icon${this.type === "global" ? "GlobalGraph" : "Graph"}"></use></svg>
-        ${this.type === "global" ? window.siyuan.languages.globalGraph : window.siyuan.languages.graphView}
+        <svg class="block__logoicon"><use xlink:href="#icon${this.type === "global" ? "GlobalGraph" : "Graph"}"></use></svg>${this.type === "global" ? window.siyuan.languages.globalGraph : window.siyuan.languages.graphView}
     </div>
     <span class="fn__flex-1"></span>
     <span class="fn__space"></span>
diff --git a/app/src/layout/dock/Inbox.ts b/app/src/layout/dock/Inbox.ts
index 646035a13..2405584a5 100644
--- a/app/src/layout/dock/Inbox.ts
+++ b/app/src/layout/dock/Inbox.ts
@@ -55,9 +55,8 @@ export class Inbox extends Model {
         this.element.classList.add("fn__flex-column", "file-tree", "sy__inbox");
         this.element.innerHTML = `<div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconInbox"></use></svg>
-        ${window.siyuan.languages.inbox}&nbsp;
-         <span class="inboxSelectCount"></span>
+        <svg class="block__logoicon"><use xlink:href="#iconInbox"></use></svg>${window.siyuan.languages.inbox}&nbsp;
+        <span class="inboxSelectCount"></span>
     </div>
     <span class="fn__flex-1"></span>
     <span class="fn__space"></span>
@@ -210,7 +209,7 @@ ${data.shorthandContent}
         }
         return `<div class="block__icons">
     <div class="block__logo fn__pointer fn__flex-1" data-type="back">
-        <svg><use xlink:href="#iconLeft"></use></svg><span class="ft__breakword">${data.shorthandTitle}</span>
+        <svg class="block__logoicon"><use xlink:href="#iconLeft"></use></svg><span class="ft__breakword">${data.shorthandTitle}</span>
     </div>
     ${linkHTML}
 </div>
diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts
index 801c806bd..533ffac5a 100644
--- a/app/src/layout/dock/Outline.ts
+++ b/app/src/layout/dock/Outline.ts
@@ -84,8 +84,7 @@ export class Outline extends Model {
         options.tab.panelElement.classList.add("fn__flex-column", "file-tree", "sy__outline");
         options.tab.panelElement.innerHTML = `<div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconAlignCenter"></use></svg>
-        ${window.siyuan.languages.outline}
+        <svg class="block__logoicon"><use xlink:href="#iconAlignCenter"></use></svg>${window.siyuan.languages.outline}
     </div>
     <span class="fn__flex-1 fn__space"></span>
     <span data-type="expand" class="block__icon b3-tooltips b3-tooltips__sw" aria-label="${window.siyuan.languages.stickOpen} ${updateHotkeyTip(window.siyuan.config.keymap.editor.general.expand.custom)}">
diff --git a/app/src/layout/dock/Tag.ts b/app/src/layout/dock/Tag.ts
index 2595e13fe..0c6b63684 100644
--- a/app/src/layout/dock/Tag.ts
+++ b/app/src/layout/dock/Tag.ts
@@ -53,8 +53,7 @@ export class Tag extends Model {
 
         this.element.innerHTML = `<div class="block__icons">
     <div class="block__logo">
-        <svg><use xlink:href="#iconTags"></use></svg>
-        ${window.siyuan.languages.tag}
+        <svg class="block__logoicon"><use xlink:href="#iconTags"></use></svg>${window.siyuan.languages.tag}
     </div>
     <span class="fn__flex-1"></span>
     <span class="fn__space"></span>
diff --git a/app/src/protyle/render/av/blockAttr.ts b/app/src/protyle/render/av/blockAttr.ts
index b31a400ff..31abf350a 100644
--- a/app/src/protyle/render/av/blockAttr.ts
+++ b/app/src/protyle/render/av/blockAttr.ts
@@ -4,6 +4,7 @@ import {escapeAttr} from "../../../util/escape";
 import * as dayjs from "dayjs";
 import {popTextCell} from "./cell";
 import {hasClosestBlock} from "../../util/hasClosest";
+import {unicode2Emoji} from "../../../emoji";
 
 const genAVRollupHTML = (value: IAVCellValue) => {
     let html = "";
@@ -133,6 +134,7 @@ export const renderAVAttribute = (element: HTMLElement, id: string, protyle: IPr
                 key: {
                     type: TAVCol,
                     name: string,
+                    icon: string,
                     options?: {
                         name: string,
                         color: string
@@ -152,16 +154,16 @@ export const renderAVAttribute = (element: HTMLElement, id: string, protyle: IPr
             html += `<div data-av-id="${table.avID}" data-node-id="${id}" data-type="NodeAttributeView">
 <div class="fn__flex custom-attr__avheader">
     <div class="block__logo popover__block" data-id='${JSON.stringify(table.blockIDs)}'>
-        <svg><use xlink:href="#iconDatabase"></use></svg>
-        <span>${table.avName || window.siyuan.languages.database}</span>
+        <svg class="block__logoicon"><use xlink:href="#iconDatabase"></use></svg><span>${table.avName || window.siyuan.languages.database}</span>
     </div>
     <div class="fn__flex-1"></div>
     <button data-type="addColumn" class="b3-button b3-button--outline"><svg><use xlink:href="#iconAdd"></use></svg>${window.siyuan.languages.addAttr}</button>
 </div>`;
             table.keyValues?.forEach(item => {
                 html += `<div class="block__icons av__row" data-id="${id}">
-    <div class="block__logo">
-        <svg><use xlink:href="#${getColIconByType(item.key.type)}"></use></svg>
+    <div class="block__icon"><svg><use xlink:href="#iconDrag"></use></svg></div>
+    <div class="block__logo ariaLabel" aria-label="${escapeAttr(item.key.name)}"">
+        ${item.key.icon ? unicode2Emoji(item.key.icon, "block__logoicon", true) : `<svg class="block__logoicon"><use xlink:href="#${getColIconByType(item.key.type)}"></use></svg>`}
         <span>${item.key.name}</span>
     </div>
     <div data-av-id="${table.avID}" data-col-id="${item.values[0].keyID}" data-block-id="${item.values[0].blockID}" data-id="${item.values[0].id}" data-type="${item.values[0].type}"