diff --git a/models/controlled-documents/src/index.ts b/models/controlled-documents/src/index.ts
index 18e7e26817..dd0f319167 100644
--- a/models/controlled-documents/src/index.ts
+++ b/models/controlled-documents/src/index.ts
@@ -394,6 +394,10 @@ export function createModel (builder: Builder): void {
     presenter: documents.component.DocumentMetaPresenter
   })
 
+  builder.mixin(documents.class.DocumentMeta, core.class.Class, view.mixin.ObjectTitle, {
+    titleProvider: documents.function.DocumentMetaTitleProvider
+  })
+
   builder.mixin(documents.class.DocumentMeta, core.class.Class, view.mixin.LinkProvider, {
     encode: documents.function.GetDocumentMetaLinkFragment
   })
diff --git a/models/controlled-documents/src/types.ts b/models/controlled-documents/src/types.ts
index 1c0747e36a..1efce19690 100644
--- a/models/controlled-documents/src/types.ts
+++ b/models/controlled-documents/src/types.ts
@@ -145,7 +145,7 @@ export class TProject extends TDoc implements Project {
 }
 
 @Model(documents.class.DocumentMeta, core.class.Doc, DOMAIN_DOCUMENTS)
-@UX(documents.string.Document)
+@UX(documents.string.ControlledDocument, documents.icon.Document)
 export class TDocumentMeta extends TDoc implements DocumentMeta {
   @Prop(Collection(documents.class.Document), documents.string.Documents)
     documents!: CollectionSize<Document>
diff --git a/models/drive/src/index.ts b/models/drive/src/index.ts
index 2dec1c87c7..e44badf673 100644
--- a/models/drive/src/index.ts
+++ b/models/drive/src/index.ts
@@ -111,7 +111,7 @@ export class TResource extends TDoc implements Resource {
 }
 
 @Model(drive.class.Folder, drive.class.Resource, DOMAIN_DRIVE)
-@UX(drive.string.Folder)
+@UX(drive.string.Folder, drive.icon.Folder)
 export class TFolder extends TResource implements Folder {
   @Prop(TypeRef(drive.class.Folder), drive.string.Parent)
   @Index(IndexKind.Indexed)
@@ -126,7 +126,7 @@ export class TFolder extends TResource implements Folder {
 }
 
 @Model(drive.class.File, drive.class.Resource, DOMAIN_DRIVE)
-@UX(drive.string.File)
+@UX(drive.string.File, drive.icon.File)
 export class TFile extends TResource implements File {
   @Prop(TypeRef(drive.class.Folder), drive.string.Parent)
   @Index(IndexKind.Indexed)
diff --git a/packages/presentation/src/components/NavLink.svelte b/packages/presentation/src/components/NavLink.svelte
index da17f8a759..8ba99a9739 100644
--- a/packages/presentation/src/components/NavLink.svelte
+++ b/packages/presentation/src/components/NavLink.svelte
@@ -26,6 +26,7 @@
   export let shrink: number = 1
   export let accent: boolean = false
   export let noOverflow: boolean = false
+  export let inlineReference: boolean = false
 
   function clickHandler (e: MouseEvent): void {
     if (disabled) return
@@ -72,6 +73,7 @@
     class:noOverflow
     class:inline
     class:colorInherit
+    class:antiMention={inlineReference}
     class:fs-bold={accent}
     style:flex-shrink={shrink}
     on:click={clickHandler}
@@ -85,6 +87,7 @@
     class:noOverflow
     class:inline
     class:colorInherit
+    class:antiMention={inlineReference}
     class:fs-bold={accent}
     style:flex-shrink={shrink}
     on:click={clickHandler}
@@ -95,7 +98,7 @@
 
 <style lang="scss">
   span,
-  a {
+  a:not(.antiMention) {
     min-width: 0;
     font-weight: inherit;
 
diff --git a/packages/presentation/src/components/markup/ObjectNode.svelte b/packages/presentation/src/components/markup/ObjectNode.svelte
index 706fb89292..f1caf109d7 100644
--- a/packages/presentation/src/components/markup/ObjectNode.svelte
+++ b/packages/presentation/src/components/markup/ObjectNode.svelte
@@ -14,19 +14,23 @@
 -->
 <script lang="ts">
   import { Class, Doc, Ref } from '@hcengineering/core'
-  import { Component } from '@hcengineering/ui'
+  import { Component, Icon } from '@hcengineering/ui'
   import view from '@hcengineering/view'
 
-  import { createQuery } from '../../utils'
+  import { createQuery, getClient } from '../../utils'
 
   export let _id: Ref<Doc> | undefined = undefined
   export let _class: Ref<Class<Doc>> | undefined = undefined
   export let title: string = ''
 
+  const client = getClient()
+  const hierarchy = client.getHierarchy()
   const docQuery = createQuery()
 
   let doc: Doc | undefined = undefined
 
+  $: icon = _class !== undefined ? hierarchy.getClass(_class).icon : null
+
   $: if (_class != null && _id != null) {
     docQuery.query(_class, { _id }, (r) => {
       doc = r.shift()
@@ -35,7 +39,9 @@
 </script>
 
 {#if !doc}
-  <span class="antiMention">@{title}</span>
+  <span class="antiMention">
+    {#if icon}<Icon {icon} size="small" />{' '}{:else}@{/if}{title}
+  </span>
 {:else}
   <Component
     is={view.component.ObjectMention}
diff --git a/packages/text/src/markup/__tests__/dsl.test.ts b/packages/text/src/markup/__tests__/dsl.test.ts
index 69762fa291..37841dfc8f 100644
--- a/packages/text/src/markup/__tests__/dsl.test.ts
+++ b/packages/text/src/markup/__tests__/dsl.test.ts
@@ -21,7 +21,7 @@ describe('dsl', () => {
       )
     )
     expect(jsonToHTML(doc)).toEqual(
-      '<p>Hello, <span data-type="reference" class="antiMention" data-id="123" data-objectclass="world" data-label="World">@World</span></p><p>Check out <a target="_blank" rel="noopener noreferrer" class="cursor-pointer" href="https://example.com"><u>this link</u></a>.</p>'
+      '<p>Hello, <span data-type="reference" data-id="123" data-objectclass="world" data-label="World" class="antiMention">@World</span></p><p>Check out <a target="_blank" rel="noopener noreferrer" class="cursor-pointer" href="https://example.com"><u>this link</u></a>.</p>'
     )
   })
 })
diff --git a/packages/text/src/nodes/reference.ts b/packages/text/src/nodes/reference.ts
index c333371095..613a51eca1 100644
--- a/packages/text/src/nodes/reference.ts
+++ b/packages/text/src/nodes/reference.ts
@@ -16,6 +16,7 @@
 import { Node, mergeAttributes } from '@tiptap/core'
 import { getDataAttribute } from './utils'
 import { Class, Doc, Ref } from '@hcengineering/core'
+import { Attrs } from '@tiptap/pm/model'
 
 export interface ReferenceNodeProps {
   id: Ref<Doc>
@@ -24,7 +25,6 @@ export interface ReferenceNodeProps {
 }
 
 export interface ReferenceOptions {
-  renderLabel: (props: { options: ReferenceOptions, props: ReferenceNodeProps }) => string
   suggestion: { char?: string }
   HTMLAttributes: Record<string, any>
 }
@@ -37,8 +37,6 @@ export const ReferenceNode = Node.create<ReferenceOptions>({
   group: 'inline',
   inline: true,
   selectable: true,
-  atom: true,
-  draggable: true,
 
   addAttributes () {
     return {
@@ -50,10 +48,6 @@ export const ReferenceNode = Node.create<ReferenceOptions>({
 
   addOptions () {
     return {
-      renderLabel ({ options, props }) {
-        // eslint-disable-next-line
-        return `${options.suggestion.char}${props.label ?? props.id}`
-      },
       suggestion: { char: '@' },
       HTMLAttributes: {}
     }
@@ -62,22 +56,14 @@ export const ReferenceNode = Node.create<ReferenceOptions>({
   parseHTML () {
     return [
       {
-        tag: `span[data-type="${this.name}"]`,
-        getAttrs: (el) => {
-          const id = (el as HTMLSpanElement).getAttribute('id')?.trim()
-          const label = (el as HTMLSpanElement).getAttribute('label')?.trim()
-          const objectclass = (el as HTMLSpanElement).getAttribute('objectclass')?.trim()
-
-          if (id == null || label == null || objectclass == null) {
-            return false
-          }
-
-          return {
-            id,
-            label,
-            objectclass
-          }
-        }
+        priority: 60,
+        tag: 'span[data-type="reference"]',
+        getAttrs
+      },
+      {
+        priority: 60,
+        tag: 'a[data-type="reference"]',
+        getAttrs
       }
     ]
   },
@@ -88,20 +74,31 @@ export const ReferenceNode = Node.create<ReferenceOptions>({
       mergeAttributes(
         {
           'data-type': this.name,
+          'data-id': node.attrs.id,
+          'data-objectclass': node.attrs.objectclass,
+          'data-label': node.attrs.label,
           class: 'antiMention'
         },
         this.options.HTMLAttributes,
         HTMLAttributes
       ),
-      this.options.renderLabel({
-        options: this.options,
-        props: node.attrs as ReferenceNodeProps
-      })
+      `${this.options.suggestion.char}${node.attrs.label ?? node.attrs.id}`
     ]
-  },
-
-  renderText ({ node }) {
-    const options = this.options
-    return options.renderLabel({ options, props: node.attrs as ReferenceNodeProps })
   }
 })
+
+function getAttrs (el: HTMLSpanElement): Attrs | false {
+  const id = el.dataset.id?.trim()
+  const label = el.dataset.label?.trim()
+  const objectclass = el.dataset.objectclass?.trim()
+
+  if (id == null || label == null || objectclass == null) {
+    return false
+  }
+
+  return {
+    id,
+    label,
+    objectclass
+  }
+}
diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss
index 2158b0bb91..8d3ec1dffc 100644
--- a/packages/theme/styles/common.scss
+++ b/packages/theme/styles/common.scss
@@ -518,14 +518,28 @@
   }
 }
 
-.antiMention {
-  display: inline-flex;
+.antiMention, .antiMention:visited {
+  display: inline;
+  font-weight: normal;
   padding: 0 .25rem;
-  width: fit-content;
   color: var(--theme-link-color);
   background-color: var(--theme-mention-bg-color);
+  text-decoration: none;
   border-radius: .25rem;
   cursor: pointer;
+  user-select: text;
+
+  &:hover {
+    text-decoration: none !important;
+    background-color: var(--theme-mention-focused-bg-color);
+  }
+
+  > svg {
+    display: inline-block;
+    vertical-align: sub;
+    margin-bottom: 1px;
+    width: .875rem;
+  }
 }
 
 .antiDivider {
diff --git a/plugins/card-resources/src/components/CardPresenter.svelte b/plugins/card-resources/src/components/CardPresenter.svelte
index af560ead0d..e194e0dde5 100644
--- a/plugins/card-resources/src/components/CardPresenter.svelte
+++ b/plugins/card-resources/src/components/CardPresenter.svelte
@@ -36,7 +36,7 @@
 </script>
 
 {#if inline && value}
-  <ObjectMention object={value} {disabled} {noUnderline} {onClick} component={card.component.EditCard} />
+  <ObjectMention object={value} {disabled} {onClick} component={card.component.EditCard} />
 {:else if value}
   {#if type === 'link'}
     <div class="flex-row-center">
diff --git a/plugins/contact-resources/src/components/OrganizationPresenter.svelte b/plugins/contact-resources/src/components/OrganizationPresenter.svelte
index 478237293a..dff5bd3887 100644
--- a/plugins/contact-resources/src/components/OrganizationPresenter.svelte
+++ b/plugins/contact-resources/src/components/OrganizationPresenter.svelte
@@ -34,13 +34,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention
-      object={value}
-      {disabled}
-      {accent}
-      {noUnderline}
-      component={contact.component.EditOrganizationPanel}
-    />
+    <ObjectMention object={value} {disabled} component={contact.component.EditOrganizationPanel} />
   {:else if type === 'link'}
     <DocNavLink {disabled} object={value} {accent} {noUnderline} component={contact.component.EditOrganizationPanel}>
       <div class="flex-presenter" style:max-width={maxWidth} use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/contact-resources/src/components/PersonElement.svelte b/plugins/contact-resources/src/components/PersonElement.svelte
index b33f817d0a..eb945ec969 100644
--- a/plugins/contact-resources/src/components/PersonElement.svelte
+++ b/plugins/contact-resources/src/components/PersonElement.svelte
@@ -41,7 +41,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} {colorInherit} onClick={onEdit} />
+    <ObjectMention object={value} {disabled} onClick={onEdit} />
   {:else if type === 'link'}
     <DocNavLink object={value} onClick={onEdit} {disabled} {noUnderline} {colorInherit} {accent} noOverflow>
       <span
diff --git a/plugins/controlled-documents-resources/src/index.ts b/plugins/controlled-documents-resources/src/index.ts
index debf8871f0..5a6a8a89f8 100644
--- a/plugins/controlled-documents-resources/src/index.ts
+++ b/plugins/controlled-documents-resources/src/index.ts
@@ -114,7 +114,8 @@ import {
   getVisibleFilters,
   isFolder,
   renameFolder,
-  sortDocumentStates
+  sortDocumentStates,
+  getDocumentMetaTitle
 } from './utils'
 
 export { DocumentStatusTag, DocumentTitle, DocumentVersionPresenter, StatePresenter }
@@ -462,6 +463,7 @@ export default async (): Promise<Resources> => ({
     ControlledDocumentReferenceObjectProvider: controlledDocumentReferenceObjectProvider,
     ProjectDocumentReferenceObjectProvider: projectDocumentReferenceObjectProvider,
     ControlledDocumentTitleProvider: getControlledDocumentTitle,
+    DocumentMetaTitleProvider: getDocumentMetaTitle,
     Comment: comment,
     IsCommentVisible: isCommentVisible
   },
diff --git a/plugins/controlled-documents-resources/src/plugin.ts b/plugins/controlled-documents-resources/src/plugin.ts
index 4a7826ebbf..04a794ca23 100644
--- a/plugins/controlled-documents-resources/src/plugin.ts
+++ b/plugins/controlled-documents-resources/src/plugin.ts
@@ -249,6 +249,7 @@ export default mergeIds(documentsId, documents, {
     CanOpenDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
     CanPrintDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
     CanTransferDocument: '' as Resource<(doc?: Doc | Doc[]) => Promise<boolean>>,
-    ControlledDocumentTitleProvider: '' as Resource<(client: Client, ref: Ref<Doc>, doc?: Doc) => Promise<string>>
+    ControlledDocumentTitleProvider: '' as Resource<(client: Client, ref: Ref<Doc>, doc?: Doc) => Promise<string>>,
+    DocumentMetaTitleProvider: '' as Resource<(client: Client, ref: Ref<Doc>, doc?: Doc) => Promise<string>>
   }
 })
diff --git a/plugins/controlled-documents-resources/src/utils.ts b/plugins/controlled-documents-resources/src/utils.ts
index 0f93881a79..f4feb93cdf 100644
--- a/plugins/controlled-documents-resources/src/utils.ts
+++ b/plugins/controlled-documents-resources/src/utils.ts
@@ -716,6 +716,18 @@ export async function documentIdentifierProvider (client: Client, ref: Ref<Docum
   return document.code
 }
 
+export async function getDocumentMetaTitle (
+  client: Client,
+  ref: Ref<DocumentMeta>,
+  doc?: DocumentMeta
+): Promise<string> {
+  const object = doc ?? (await client.findOne(documents.class.DocumentMeta, { _id: ref }))
+
+  if (object === undefined) return ''
+
+  return object.title
+}
+
 export async function controlledDocumentReferenceObjectProvider (
   client: Client,
   ref: Ref<ControlledDocument>,
diff --git a/plugins/document-resources/src/components/DocumentPresenter.svelte b/plugins/document-resources/src/components/DocumentPresenter.svelte
index 4b7b26684e..888203182e 100644
--- a/plugins/document-resources/src/components/DocumentPresenter.svelte
+++ b/plugins/document-resources/src/components/DocumentPresenter.svelte
@@ -37,7 +37,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} component={document.component.EditDoc} />
+    <ObjectMention object={value} {disabled} component={document.component.EditDoc} />
   {:else if type === 'link'}
     <DocNavLink {disabled} object={value} {accent} {noUnderline} component={document.component.EditDoc}>
       <div
diff --git a/plugins/drive-resources/src/components/DrivePresenter.svelte b/plugins/drive-resources/src/components/DrivePresenter.svelte
index ff04b866ea..a501982693 100644
--- a/plugins/drive-resources/src/components/DrivePresenter.svelte
+++ b/plugins/drive-resources/src/components/DrivePresenter.svelte
@@ -34,7 +34,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink {disabled} object={value} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/drive-resources/src/components/FilePresenter.svelte b/plugins/drive-resources/src/components/FilePresenter.svelte
index ae9c107aa4..f774607b07 100644
--- a/plugins/drive-resources/src/components/FilePresenter.svelte
+++ b/plugins/drive-resources/src/components/FilePresenter.svelte
@@ -39,7 +39,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.title) }}>
diff --git a/plugins/drive-resources/src/components/FileVersionPresenter.svelte b/plugins/drive-resources/src/components/FileVersionPresenter.svelte
index f8214c8162..4ea45b66e9 100644
--- a/plugins/drive-resources/src/components/FileVersionPresenter.svelte
+++ b/plugins/drive-resources/src/components/FileVersionPresenter.svelte
@@ -53,7 +53,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink object={value} onClick={handleClick} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter">
diff --git a/plugins/drive-resources/src/components/FolderPresenter.svelte b/plugins/drive-resources/src/components/FolderPresenter.svelte
index b8645f9877..8bbb395fce 100644
--- a/plugins/drive-resources/src/components/FolderPresenter.svelte
+++ b/plugins/drive-resources/src/components/FolderPresenter.svelte
@@ -34,7 +34,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink {disabled} object={value} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.title) }}>
diff --git a/plugins/lead-resources/src/components/LeadPresenter.svelte b/plugins/lead-resources/src/components/LeadPresenter.svelte
index 408c90c226..1a3891ae9a 100644
--- a/plugins/lead-resources/src/components/LeadPresenter.svelte
+++ b/plugins/lead-resources/src/components/LeadPresenter.svelte
@@ -32,7 +32,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {noUnderline} {accent} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink object={value} {disabled} {noUnderline} {accent}>
       <div class="flex-presenter">
diff --git a/plugins/love-resources/src/components/MeetingMinutesPresenter.svelte b/plugins/love-resources/src/components/MeetingMinutesPresenter.svelte
index 503b77a29d..b6d0c102f8 100644
--- a/plugins/love-resources/src/components/MeetingMinutesPresenter.svelte
+++ b/plugins/love-resources/src/components/MeetingMinutesPresenter.svelte
@@ -31,7 +31,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.title) }}>
diff --git a/plugins/love-resources/src/components/RoomPresenter.svelte b/plugins/love-resources/src/components/RoomPresenter.svelte
index ced8b12ecb..6ab4a79521 100644
--- a/plugins/love-resources/src/components/RoomPresenter.svelte
+++ b/plugins/love-resources/src/components/RoomPresenter.svelte
@@ -36,7 +36,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(roomName) }}>
diff --git a/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte b/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte
index 1d962fbc7f..bede543155 100644
--- a/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte
+++ b/plugins/products-resources/src/components/product-version/ProductVersionPresenter.svelte
@@ -46,7 +46,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} title={name} />
+    <ObjectMention object={value} {disabled} title={name} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(name) }}>
diff --git a/plugins/products-resources/src/components/product-version/ProductVersionVersionPresenter.svelte b/plugins/products-resources/src/components/product-version/ProductVersionVersionPresenter.svelte
index 062fa4cf76..01b0bbedf6 100644
--- a/plugins/products-resources/src/components/product-version/ProductVersionVersionPresenter.svelte
+++ b/plugins/products-resources/src/components/product-version/ProductVersionVersionPresenter.svelte
@@ -32,7 +32,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} title={version} />
+    <ObjectMention object={value} {disabled} title={version} />
   {:else}
     <DocNavLink object={value} {disabled} {noUnderline} {accent}>
       <div class="flex-presenter">
diff --git a/plugins/products-resources/src/components/product/ProductPresenter.svelte b/plugins/products-resources/src/components/product/ProductPresenter.svelte
index a9e7a0d8c9..f46e2ea198 100644
--- a/plugins/products-resources/src/components/product/ProductPresenter.svelte
+++ b/plugins/products-resources/src/components/product/ProductPresenter.svelte
@@ -35,7 +35,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/recruit-resources/src/components/ApplicationPresenter.svelte b/plugins/recruit-resources/src/components/ApplicationPresenter.svelte
index 67d81ca1da..87940c1690 100644
--- a/plugins/recruit-resources/src/components/ApplicationPresenter.svelte
+++ b/plugins/recruit-resources/src/components/ApplicationPresenter.svelte
@@ -35,7 +35,7 @@
 
 {#if value && shortLabel}
   {#if inline}
-    <ObjectMention object={value} {disabled} {noUnderline} {accent} />
+    <ObjectMention object={value} {disabled} />
   {:else if type === 'link'}
     <DocNavLink object={value} {disabled} {noUnderline} {accent}>
       <div class="flex-presenter">
diff --git a/plugins/recruit-resources/src/components/VacancyPresenter.svelte b/plugins/recruit-resources/src/components/VacancyPresenter.svelte
index 35ff43c74e..9e53736223 100644
--- a/plugins/recruit-resources/src/components/VacancyPresenter.svelte
+++ b/plugins/recruit-resources/src/components/VacancyPresenter.svelte
@@ -41,7 +41,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} component={recruit.component.EditVacancy} />
+    <ObjectMention object={value} {disabled} component={recruit.component.EditVacancy} />
   {:else if type === 'link'}
     <div class="flex-between flex-gap-2 w-full">
       <DocNavLink {disabled} object={value} {accent} {noUnderline} component={recruit.component.EditVacancy}>
diff --git a/plugins/survey-resources/src/components/SurveyPresenter.svelte b/plugins/survey-resources/src/components/SurveyPresenter.svelte
index afe5944962..b9dca4c1a1 100644
--- a/plugins/survey-resources/src/components/SurveyPresenter.svelte
+++ b/plugins/survey-resources/src/components/SurveyPresenter.svelte
@@ -35,7 +35,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} {colorInherit} onClick={onEdit} />
+    <ObjectMention object={value} {disabled} onClick={onEdit} />
   {:else if type === 'link'}
     <DocNavLink object={value} onClick={onEdit} {disabled} {noUnderline} {colorInherit} {accent} noOverflow>
       <div class="flex-presenter" style:max-width={maxWidth}>
diff --git a/plugins/test-management-resources/src/components/test-case/TestCasePresenter.svelte b/plugins/test-management-resources/src/components/test-case/TestCasePresenter.svelte
index 222bd59cc7..e83d66ae4f 100644
--- a/plugins/test-management-resources/src/components/test-case/TestCasePresenter.svelte
+++ b/plugins/test-management-resources/src/components/test-case/TestCasePresenter.svelte
@@ -31,7 +31,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention title={value?.name} object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention title={value?.name} object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline} {onClick}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/test-management-resources/src/components/test-plan/TestPlanItemPresenter.svelte b/plugins/test-management-resources/src/components/test-plan/TestPlanItemPresenter.svelte
index 12ce4c4c50..6125a4bf67 100644
--- a/plugins/test-management-resources/src/components/test-plan/TestPlanItemPresenter.svelte
+++ b/plugins/test-management-resources/src/components/test-plan/TestPlanItemPresenter.svelte
@@ -37,7 +37,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: testManagement.string.TestCase }}>
diff --git a/plugins/test-management-resources/src/components/test-plan/TestPlanPresenter.svelte b/plugins/test-management-resources/src/components/test-plan/TestPlanPresenter.svelte
index eebc03cf97..f95de2977c 100644
--- a/plugins/test-management-resources/src/components/test-plan/TestPlanPresenter.svelte
+++ b/plugins/test-management-resources/src/components/test-plan/TestPlanPresenter.svelte
@@ -27,7 +27,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/test-management-resources/src/components/test-result/TestResultPresenter.svelte b/plugins/test-management-resources/src/components/test-result/TestResultPresenter.svelte
index f2f5005c15..3e106026d3 100644
--- a/plugins/test-management-resources/src/components/test-result/TestResultPresenter.svelte
+++ b/plugins/test-management-resources/src/components/test-result/TestResultPresenter.svelte
@@ -37,7 +37,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: testManagement.string.TestResult }}>
diff --git a/plugins/test-management-resources/src/components/test-run/TestRunPresenter.svelte b/plugins/test-management-resources/src/components/test-run/TestRunPresenter.svelte
index 9b38f419d5..447d30cbfb 100644
--- a/plugins/test-management-resources/src/components/test-run/TestRunPresenter.svelte
+++ b/plugins/test-management-resources/src/components/test-run/TestRunPresenter.svelte
@@ -27,7 +27,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/test-management-resources/src/components/test-suite/TestSuitePresenter.svelte b/plugins/test-management-resources/src/components/test-suite/TestSuitePresenter.svelte
index 80613c3edb..4312a20f5e 100644
--- a/plugins/test-management-resources/src/components/test-suite/TestSuitePresenter.svelte
+++ b/plugins/test-management-resources/src/components/test-suite/TestSuitePresenter.svelte
@@ -30,7 +30,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {accent} {noUnderline} />
+    <ObjectMention object={value} {disabled} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline}>
       <div class="flex-presenter" use:tooltip={{ label: getEmbeddedLabel(value.name) }}>
diff --git a/plugins/text-editor-resources/src/components/extension/reference.ts b/plugins/text-editor-resources/src/components/extension/reference.ts
index f66c9fa3cf..81546884b5 100644
--- a/plugins/text-editor-resources/src/components/extension/reference.ts
+++ b/plugins/text-editor-resources/src/components/extension/reference.ts
@@ -26,6 +26,7 @@ import { getMetadata, getResource } from '@hcengineering/platform'
 import presentation, { createQuery, getClient } from '@hcengineering/presentation'
 import view from '@hcengineering/view'
 
+import contact from '@hcengineering/contact'
 import { parseLocation, type Location } from '@hcengineering/ui'
 import workbench, { type Application } from '@hcengineering/workbench'
 
@@ -38,10 +39,6 @@ export const ReferenceExtension = ReferenceNode.extend<ReferenceExtensionOptions
   addOptions () {
     return {
       HTMLAttributes: {},
-      renderLabel ({ options, props }) {
-        // eslint-disable-next-line
-        return `${options.suggestion.char}${props.label ?? props.id}`
-      },
       suggestion: {
         char: '@',
         allowSpaces: true,
@@ -86,19 +83,21 @@ export const ReferenceExtension = ReferenceNode.extend<ReferenceExtensionOptions
 
   addNodeView () {
     return ({ node, HTMLAttributes }) => {
-      const span = document.createElement('span')
-      span.setAttribute('data-type', this.name)
-      span.className = 'antimention'
+      const root = document.createElement('span')
+      root.className = 'antiMention'
       const attributes = mergeAttributes(
         {
           'data-type': this.name,
+          'data-id': node.attrs.id,
+          'data-objectclass': node.attrs.objectclass,
+          'data-label': node.attrs.label,
           class: 'antiMention'
         },
         this.options.HTMLAttributes,
         HTMLAttributes
       )
 
-      span.addEventListener('click', (event) => {
+      root.addEventListener('click', (event) => {
         if (event.button !== 0) return
 
         const link = (event.target as HTMLElement)?.closest('span')
@@ -112,20 +111,40 @@ export const ReferenceExtension = ReferenceNode.extend<ReferenceExtensionOptions
       })
 
       Object.entries(attributes).forEach(([key, value]) => {
-        span.setAttribute(key, value)
+        root.setAttribute(key, value)
       })
 
+      const client = getClient()
+      const hierarchy = client.getHierarchy()
+
       const query = createQuery(true)
       const options = this.options
 
       const renderLabel = (props: ReferenceNodeProps): void => {
-        span.setAttribute('data-label', props.label)
-        span.innerText = options.renderLabel({ options, props: props ?? (node.attrs as ReferenceNodeProps) })
+        root.setAttribute('data-label', props.label)
+        titleSpan.innerText = `${iconUrl !== '' ? '' : options.suggestion.char}${props.label ?? props.id}`
       }
 
       const id = node.attrs.id
       const objectclass: Ref<Class<Doc>> = node.attrs.objectclass
 
+      const icon =
+        objectclass !== undefined && !hierarchy.isDerived(objectclass, contact.class.Contact)
+          ? hierarchy.getClass(objectclass).icon
+          : undefined
+
+      const iconUrl = typeof icon === 'string' ? getMetadata(icon) ?? 'https://anticrm.org/logo.svg' : ''
+
+      if (iconUrl !== '') {
+        const svg = root.appendChild(document.createElementNS('http://www.w3.org/2000/svg', 'svg'))
+        root.appendChild(document.createTextNode(' '))
+        svg.setAttribute('class', 'svg-small')
+        svg.setAttribute('fill', 'currentColor')
+        const use = svg.appendChild(document.createElementNS('http://www.w3.org/2000/svg', 'use'))
+        use.setAttributeNS('http://www.w3.org/1999/xlink', 'href', iconUrl)
+      }
+
+      const titleSpan = root.appendChild(document.createElement('span'))
       renderLabel({ id, objectclass, label: node.attrs.label })
 
       if (id !== undefined && objectclass !== undefined) {
@@ -141,7 +160,7 @@ export const ReferenceExtension = ReferenceNode.extend<ReferenceExtensionOptions
       }
 
       return {
-        dom: span,
+        dom: root,
         update (node, decorations) {
           renderLabel({ id, objectclass, label: node.attrs.label })
           return true
diff --git a/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte b/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte
index f72161fd28..7f1fd02403 100644
--- a/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte
+++ b/plugins/tracker-resources/src/components/components/ComponentPresenter.svelte
@@ -44,7 +44,7 @@
 
 <div class="flex-row-center">
   {#if inline}
-    <ObjectMention object={value} {disabled} {noUnderline} {accent} {onClick} />
+    <ObjectMention object={value} {disabled} {onClick} />
   {:else}
     <DocNavLink object={value} {onClick} {disabled} {noUnderline} {accent} component={view.component.EditDoc}>
       <span class="flex-presenter flex-row-center" class:list={kind === 'list'}>
diff --git a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
index 538b88c4fc..205a531e45 100644
--- a/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
+++ b/plugins/tracker-resources/src/components/issues/IssuePresenter.svelte
@@ -40,7 +40,7 @@
 </script>
 
 {#if inline && value}
-  <ObjectMention object={value} {disabled} {noUnderline} {onClick} component={tracker.component.EditIssue} />
+  <ObjectMention object={value} {disabled} {onClick} component={tracker.component.EditIssue} />
 {:else if value}
   {#if type === 'link'}
     <div class="flex-row-center">
diff --git a/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte b/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte
index 00c95f5704..6320cf3d39 100644
--- a/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte
+++ b/plugins/tracker-resources/src/components/milestones/MilestonePresenter.svelte
@@ -49,7 +49,7 @@
 
 {#if value}
   {#if inline}
-    <ObjectMention object={value} {disabled} {noUnderline} {accent} {onClick} />
+    <ObjectMention object={value} {disabled} {onClick} />
   {:else}
     <DocNavLink object={value} {disabled} {accent} {noUnderline} {onClick}>
       <div class="flex-presenter" use:tooltip={{ label: tracker.string.Milestone }}>
diff --git a/plugins/view-resources/src/components/DocNavLink.svelte b/plugins/view-resources/src/components/DocNavLink.svelte
index 9d42360aa5..135d68721d 100644
--- a/plugins/view-resources/src/components/DocNavLink.svelte
+++ b/plugins/view-resources/src/components/DocNavLink.svelte
@@ -31,6 +31,7 @@
   export let shrink: number = 1
   export let accent: boolean = false
   export let noOverflow: boolean = false
+  export let inlineReference: boolean = false
 
   let _disabled = disabled || $restrictionStore.disableNavigation
   $: _disabled = disabled || $restrictionStore.disableNavigation
@@ -58,6 +59,17 @@
   $: if (object !== undefined) getHref(object)
 </script>
 
-<NavLink disabled={_disabled} {onClick} {noUnderline} {inline} {shrink} {href} {colorInherit} {accent} {noOverflow}>
+<NavLink
+  disabled={_disabled}
+  {onClick}
+  {noUnderline}
+  {inline}
+  {shrink}
+  {href}
+  {colorInherit}
+  {accent}
+  {noOverflow}
+  {inlineReference}
+>
   <slot />
 </NavLink>
diff --git a/plugins/view-resources/src/components/ObjectMention.svelte b/plugins/view-resources/src/components/ObjectMention.svelte
index 644832d826..c7152729ed 100644
--- a/plugins/view-resources/src/components/ObjectMention.svelte
+++ b/plugins/view-resources/src/components/ObjectMention.svelte
@@ -16,11 +16,13 @@
   import { Class, Doc, Ref } from '@hcengineering/core'
   import { getResource, translateCB } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
-  import { AnyComponent, LabelAndProps, themeStore, tooltip } from '@hcengineering/ui'
+  import { AnyComponent, Icon, LabelAndProps, themeStore, tooltip } from '@hcengineering/ui'
   import view from '@hcengineering/view'
 
   import { getReferenceLabel } from '@hcengineering/text-editor-resources/src/components/extension/reference'
+  import { classIcon } from '../utils'
   import DocNavLink from './DocNavLink.svelte'
+  import contact from '@hcengineering/contact'
 
   export let _id: Ref<Doc> | undefined = undefined
   export let _class: Ref<Class<Doc>> | undefined = undefined
@@ -28,9 +30,6 @@
   export let title: string = ''
   export let component: AnyComponent | undefined = undefined
   export let disabled: boolean = false
-  export let accent: boolean = false
-  export let noUnderline: boolean = false
-  export let colorInherit: boolean = false
   export let onClick: ((event: MouseEvent) => void) | undefined = undefined
 
   const client = getClient()
@@ -58,6 +57,9 @@
     doc = object
   }
 
+  $: icon =
+    doc !== undefined && !hierarchy.isDerived(doc._class, contact.class.Contact) ? classIcon(client, doc._class) : null
+
   $: void updateDocTitle(doc)
   $: void updateDocTooltip(doc)
   $: void updateDocLabel(doc, _class)
@@ -113,19 +115,9 @@
 </script>
 
 {#if displayTitle}
-  <DocNavLink
-    object={doc}
-    component={docComponent}
-    {disabled}
-    {accent}
-    {colorInherit}
-    {noUnderline}
-    inline
-    noOverflow
-    {onClick}
-  >
-    <span class="antiMention" class:reference={!disabled} use:tooltip={disabled ? undefined : docTooltip}>
-      @{displayTitle}
-    </span>
-  </DocNavLink>
+  <span data-type={'reference'} data-id={doc?._id} data-objectclass={doc?._class} data-label={displayTitle}>
+    <DocNavLink object={doc} component={docComponent} {disabled} inlineReference {onClick}>
+      {#if icon}<Icon {icon} size="small" />{' '}{:else}@{/if}{displayTitle}
+    </DocNavLink>
+  </span>
 {/if}
diff --git a/tests/sanity/tests/model/documents/document-content-page.ts b/tests/sanity/tests/model/documents/document-content-page.ts
index f454f0fb6b..5d02003d6d 100644
--- a/tests/sanity/tests/model/documents/document-content-page.ts
+++ b/tests/sanity/tests/model/documents/document-content-page.ts
@@ -287,7 +287,7 @@ export class DocumentContentPage extends CommonPage {
   }
 
   async checkReferenceInTheText (label: string): Promise<void> {
-    await expect(this.page.locator('span', { hasText: '@' + label })).toHaveAttribute('data-type', 'reference')
+    await expect(this.page.locator('span.antiMention', { hasText: label })).toHaveAttribute('data-type', 'reference')
   }
 
   async executeMoreAction (action: string): Promise<void> {
diff --git a/tests/sanity/tests/model/tracker/common-tracker-page.ts b/tests/sanity/tests/model/tracker/common-tracker-page.ts
index 142ecf8ee8..2252500c13 100644
--- a/tests/sanity/tests/model/tracker/common-tracker-page.ts
+++ b/tests/sanity/tests/model/tracker/common-tracker-page.ts
@@ -181,7 +181,7 @@ export class CommonTrackerPage extends CalendarPage {
   }
 
   async openLinkFromActivitiesByText (linkText: string): Promise<void> {
-    await this.linkInActivity().filter({ hasText: linkText }).click()
+    await this.linkInActivity().filter({ hasText: linkText }).first().click()
   }
 
   async addCommentWithImage (comment: string, fileName: string): Promise<void> {
diff --git a/tests/sanity/tests/tracker/mentions.spec.ts b/tests/sanity/tests/tracker/mentions.spec.ts
index 068ffff94c..915eb49aeb 100644
--- a/tests/sanity/tests/tracker/mentions.spec.ts
+++ b/tests/sanity/tests/tracker/mentions.spec.ts
@@ -112,12 +112,12 @@ test.describe('Mentions issue tests', () => {
     const secondId = await issuesPage.getIssueId(backlinkIssueSecond.title)
     await issuesPage.openIssueByName(backlinkIssueSecond.title)
     await issuesDetailsPage.addMentions(defaultId)
-    await issuesDetailsPage.checkCommentExist(`@${defaultId}`)
-    await issuesDetailsPage.openLinkFromActivitiesByText(`@${defaultId}`)
+    await issuesDetailsPage.checkCommentExist(defaultId)
+    await issuesDetailsPage.openLinkFromActivitiesByText(defaultId)
     await issuesDetailsPage.checkIssue(backlinkIssueDefault)
     await issuesDetailsPage.addMentions(secondId)
-    await issuesDetailsPage.checkCommentExist(`@${secondId}`)
-    await issuesDetailsPage.openLinkFromActivitiesByText(`@${secondId}`)
+    await issuesDetailsPage.checkCommentExist(secondId)
+    await issuesDetailsPage.openLinkFromActivitiesByText(secondId)
     await issuesDetailsPage.checkIssue(backlinkIssueSecond)
     await issuesDetailsPage.clickCloseIssueButton()
   })