diff --git a/models/templates/src/index.ts b/models/templates/src/index.ts
index 64254665c5..35deb3d07d 100644
--- a/models/templates/src/index.ts
+++ b/models/templates/src/index.ts
@@ -58,7 +58,7 @@ export function createModel (builder: Builder): void {
     core.space.Model,
     {
       label: templates.string.Templates,
-      icon: templates.icon.Templates,
+      icon: templates.icon.Template,
       action: templates.action.ShowTemplates,
       order: 1500
     },
diff --git a/packages/text-editor/src/components/ReferenceInput.svelte b/packages/text-editor/src/components/ReferenceInput.svelte
index 5d97ce5ff6..a096a28563 100644
--- a/packages/text-editor/src/components/ReferenceInput.svelte
+++ b/packages/text-editor/src/components/ReferenceInput.svelte
@@ -310,16 +310,29 @@
       <button class="sendButton" on:click={submit}><div class="icon"><Send size={'medium'} /></div></button>
     {/if}
   </div>
-  <div class="buttons">
+  <div class="buttons-group large-gap ml-4 mt-2">
     {#each actions as a}
-      <div class="tool" on:click={(evt) => handleAction(a, evt)}>
-        <Icon icon={a.icon} size={'large'} />
+      <div class="icon-button" on:click={(evt) => handleAction(a, evt)}>
+        <Icon icon={a.icon} size={'medium'} />
       </div>
     {/each}
   </div>
 </div>
 
 <style lang="scss">
+  .icon-button {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 1rem;
+    height: 1rem;
+    color: var(--dark-color);
+    cursor: pointer;
+
+    &:hover {
+      color: var(--accent-color);
+    }
+  }
   .ref-container {
     display: flex;
     flex-direction: column;
@@ -329,7 +342,7 @@
       padding: 0.5rem;
       background-color: var(--body-accent);
       border: 1px solid var(--divider-color);
-      border-radius: 0.75rem 0.75rem 0 0;
+      border-radius: 0.5rem 0.5rem 0 0;
       border-bottom: 0;
 
       &.withoutTopBorder {
@@ -348,7 +361,7 @@
       padding: 0.75rem 1rem;
       background-color: var(--accent-bg-color);
       border: 1px solid var(--divider-color);
-      border-radius: 0.75rem;
+      border-radius: 0.5rem;
 
       &.withoutTopBorder {
         border-top-left-radius: 0;
@@ -428,30 +441,5 @@
         }
       }
     }
-    .buttons {
-      display: flex;
-      margin: 0.625rem 0 0 0.5rem;
-    }
-
-    .tool {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      width: 1.25rem;
-      height: 1.25rem;
-      color: var(--theme-content-dark-color);
-      cursor: pointer;
-
-      // &.active {
-      //   color: var(--theme-caption-color);
-      // }
-
-      &:hover {
-        color: var(--theme-caption-color);
-      }
-    }
-    .tool + .tool {
-      margin-left: 1rem;
-    }
   }
 </style>
diff --git a/packages/text-editor/src/components/TextEditor.svelte b/packages/text-editor/src/components/TextEditor.svelte
index dee410c7d9..32cc7acfe0 100644
--- a/packages/text-editor/src/components/TextEditor.svelte
+++ b/packages/text-editor/src/components/TextEditor.svelte
@@ -189,6 +189,8 @@
     max-height: 40vh;
     outline: none;
     line-height: 150%;
+    color: var(--accent-color);
+
     p:not(:last-child) {
       margin-block-end: 1em;
     }
@@ -201,7 +203,7 @@
     p.is-editor-empty:first-child::before {
       content: attr(data-placeholder);
       float: left;
-      color: var(--theme-content-trans-color);
+      color: var(--dark-color);
       pointer-events: none;
       height: 0;
     }
diff --git a/packages/text-editor/src/components/icons/Attach.svelte b/packages/text-editor/src/components/icons/Attach.svelte
index 239de5f4b9..f268336110 100644
--- a/packages/text-editor/src/components/icons/Attach.svelte
+++ b/packages/text-editor/src/components/icons/Attach.svelte
@@ -3,8 +3,11 @@
   const fill: string = 'currentColor'
 </script>
 
-<svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+<svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path
-    d="M4.82816 10.4853L10.485 4.82845C11.6566 3.65688 13.5561 3.65688 14.7277 4.82845C15.8992 6.00002 15.8992 7.89952 14.7277 9.07109L8.01014 15.7886C7.42436 16.3744 6.47461 16.3744 5.88882 15.7886C5.30304 15.2028 5.30304 14.2531 5.88882 13.6673L11.8992 7.65687C12.0945 7.46161 12.0945 7.14503 11.8992 6.94977C11.704 6.75451 11.3874 6.75451 11.1921 6.94977L5.18172 12.9602C4.20541 13.9365 4.20541 15.5194 5.18172 16.4957C6.15803 17.472 7.74094 17.472 8.71725 16.4957L15.4348 9.77819C16.9969 8.2161 16.9969 5.68344 15.4348 4.12134C13.8727 2.55924 11.34 2.55924 9.77791 4.12134L4.12106 9.77819C3.92579 9.97346 3.92579 10.29 4.12106 10.4853C4.31632 10.6806 4.6329 10.6806 4.82816 10.4853Z"
+    d="M21.6,10.4c-0.3-0.3-0.7-0.3-1.1-0.1c-0.3,0.3-0.3,0.7-0.1,1.1c0.5,0.6,0.8,1.3,0.8,2.1c0,1.8-1.5,3.2-3.2,3.2h-8c-1.8,0-3.2-1.5-3.2-3.2s1.5-3.2,3.2-3.2h5c0.4,0,0.8-0.3,0.8-0.8S15.4,8.8,15,8.8h-5c-2.6,0-4.8,2.1-4.8,4.8s2.1,4.8,4.8,4.8h8c2.6,0,4.8-2.1,4.8-4.8C22.8,12.3,22.3,11.2,21.6,10.4z"
+  />
+  <path
+    d="M2.8,9.5c0-1.8,1.5-3.2,3.2-3.2h8c1.8,0,3.2,1.5,3.2,3.2s-1.5,3.2-3.2,3.2H9c-0.4,0-0.8,0.3-0.8,0.8s0.3,0.8,0.8,0.8h5c2.6,0,4.8-2.1,4.8-4.8c0-2.6-2.1-4.8-4.8-4.8H6c-2.6,0-4.8,2.1-4.8,4.8c0,1.2,0.4,2.3,1.2,3.1C2.7,13,3.2,13,3.5,12.7c0.3-0.3,0.3-0.7,0.1-1.1C3.1,11.1,2.8,10.3,2.8,9.5z"
   />
 </svg>
diff --git a/packages/text-editor/src/components/icons/Emoji.svelte b/packages/text-editor/src/components/icons/Emoji.svelte
index 94d59329aa..782873925b 100644
--- a/packages/text-editor/src/components/icons/Emoji.svelte
+++ b/packages/text-editor/src/components/icons/Emoji.svelte
@@ -4,9 +4,15 @@
   const fill: string = 'currentColor'
 </script>
 
-<svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
-  <path
-    {opacity}
-    d="M10 2C14.4183 2 18 5.58172 18 10C18 14.4183 14.4183 18 10 18C5.58172 18 2 14.4183 2 10C2 5.58172 5.58172 2 10 2ZM10 3C6.13401 3 3 6.13401 3 10C3 13.866 6.13401 17 10 17C13.866 17 17 13.866 17 10C17 6.13401 13.866 3 10 3ZM7.15467 12.4273C8.66416 13.9463 11.0877 14.0045 12.6671 12.5961L12.8453 12.4273C13.04 12.2314 13.3566 12.2304 13.5524 12.4251C13.7265 12.5981 13.7467 12.8674 13.6123 13.0627L13.5547 13.1322L13.5323 13.1545C11.5691 15.1054 8.39616 15.0953 6.44533 13.1322C6.25069 12.9363 6.25169 12.6197 6.44757 12.4251C6.64344 12.2304 6.96002 12.2314 7.15467 12.4273ZM12.5 7.5C13.0523 7.5 13.5 7.94772 13.5 8.5C13.5 9.05228 13.0523 9.5 12.5 9.5C11.9477 9.5 11.5 9.05228 11.5 8.5C11.5 7.94772 11.9477 7.5 12.5 7.5ZM7.5 7.5C8.05228 7.5 8.5 7.94772 8.5 8.5C8.5 9.05228 8.05228 9.5 7.5 9.5C6.94772 9.5 6.5 9.05228 6.5 8.5C6.5 7.94772 6.94772 7.5 7.5 7.5Z"
-  />
+<svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <g {opacity}>
+    <path
+      d="M12,1.2C6.1,1.2,1.2,6.1,1.2,12S6.1,22.8,12,22.8S22.8,17.9,22.8,12S17.9,1.2,12,1.2z M12,21.2 c-5.1,0-9.2-4.1-9.2-9.2c0-5.1,4.1-9.2,9.2-9.2c5.1,0,9.2,4.1,9.2,9.2C21.2,17.1,17.1,21.2,12,21.2z"
+    />
+    <path
+      d="M15.8,14.8c-0.4-0.2-0.8,0-1,0.3l0,0c0,0,0,0,0,0c0,0-0.1,0.1-0.1,0.2c-0.1,0.2-0.3,0.4-0.5,0.6 c-0.5,0.4-1.2,0.8-2.2,0.8s-1.7-0.4-2.2-0.8c-0.2-0.2-0.4-0.4-0.5-0.6c-0.1-0.1-0.1-0.1-0.1-0.2c0,0,0,0,0,0l0,0 c-0.2-0.4-0.6-0.5-1-0.3c-0.4,0.2-0.5,0.6-0.3,1l0.7-0.3c-0.7,0.3-0.7,0.3-0.7,0.3l0,0l0,0l0,0l0,0l0,0c0,0,0,0.1,0,0.1 c0,0.1,0.1,0.2,0.2,0.3c0.2,0.2,0.4,0.5,0.7,0.8c0.7,0.6,1.7,1.2,3.2,1.2s2.5-0.6,3.2-1.2c0.3-0.3,0.6-0.6,0.7-0.8 c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0-0.1,0-0.1l0,0l0,0l0,0l0,0l0,0c0,0,0,0-0.7-0.3l0.7,0.3C16.4,15.5,16.2,15,15.8,14.8z"
+    />
+    <path d="M15.5,8.2c-0.4,0-0.8,0.3-0.8,0.8v2c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8V9C16.2,8.6,15.9,8.2,15.5,8.2z" />
+    <path d="M8.5,11.8c0.4,0,0.8-0.3,0.8-0.8V9c0-0.4-0.3-0.8-0.8-0.8S7.8,8.6,7.8,9v2C7.8,11.4,8.1,11.8,8.5,11.8z" />
+  </g>
 </svg>
diff --git a/packages/text-editor/src/components/icons/TextStyle.svelte b/packages/text-editor/src/components/icons/TextStyle.svelte
index 93a00f1a16..5ca6abc6da 100644
--- a/packages/text-editor/src/components/icons/TextStyle.svelte
+++ b/packages/text-editor/src/components/icons/TextStyle.svelte
@@ -3,8 +3,14 @@
   const fill: string = 'currentColor'
 </script>
 
-<svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+<svg class="svg-{size}" {fill} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
   <path
-    d="M14.0872 6.70308C14.9271 5.85998 16.2664 5.81735 17.1568 6.57701L17.2869 6.69697L17.4134 6.83357C18.1376 7.68212 18.1376 8.93671 17.4134 9.78526L17.293 9.91574L10.4167 16.8183C10.2617 16.9739 10.0749 17.0931 9.86988 17.1682L9.71291 17.2161L6.62737 17.9764C6.28827 18.0599 5.98023 17.7813 6.00917 17.4498L6.0236 17.366L6.81558 14.2953C6.86895 14.0883 6.96574 13.8958 7.09885 13.7302L7.20537 13.6112L14.0872 6.70308ZM16.5811 7.40543C16.1201 6.94613 15.393 6.91684 14.898 7.31661L14.7957 7.40884L7.91383 14.317C7.87193 14.359 7.83804 14.408 7.8135 14.4616L7.7839 14.545L7.20061 16.805L9.47368 16.2452C9.51317 16.2354 9.55114 16.221 9.58682 16.2022L9.6385 16.1709L9.70829 16.1126L16.5845 9.20999C17.0806 8.71206 17.0806 7.90677 16.5811 7.40543ZM6.42419 2.22879L6.46607 2.31323L9.448 9.94224L8.676 10.7172L8.004 8.99824H4.007L2.96614 11.678C2.87719 11.9068 2.63835 12.0329 2.40561 11.9879L2.31893 11.9628C2.09015 11.8738 1.96399 11.635 2.00906 11.4023L2.03413 11.3156L5.53436 2.31403C5.6877 1.9197 6.21661 1.89109 6.42419 2.22879ZM6.00061 3.871L4.396 7.99824H7.614L6.00061 3.871Z"
+    d="M14.5,7.8c0.4,0,0.8-0.3,0.8-0.8s-0.3-0.8-0.8-0.8h-6C8.1,6.2,7.8,6.6,7.8,7s0.3,0.8,0.8,0.8h2.2V14 c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8V7.8H14.5z"
+  />
+  <path
+    d="M20,1.8H4c-1,0-1.8,0.8-1.8,1.8V20c0,1,0.8,1.8,1.8,1.8h6.1c0.4,0,0.8-0.3,0.8-0.8s-0.3-0.8-0.8-0.8H4 c-0.1,0-0.2-0.1-0.2-0.2V3.5c0-0.1,0.1-0.2,0.2-0.2h16c0.1,0,0.2,0.1,0.2,0.2v4.9c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8V3.5 C21.8,2.5,21,1.8,20,1.8z"
+  />
+  <path
+    d="M19.2,11.2C19,11,18.8,11,18.6,11s-0.4,0.1-0.5,0.3l-5.2,7.2c-0.1,0.1-0.1,0.3-0.1,0.4v2c0,0.4,0.3,0.8,0.8,0.8 h2c0.2,0,0.5-0.1,0.6-0.3l5.5-7.5c0.2-0.3,0.2-0.8-0.1-1L19.2,11.2z M15.1,20.2h-0.9v-1l4.7-6.4l1.1,0.8L15.1,20.2z"
   />
 </svg>
diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index 1684479f36..3b8dc8ba15 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -94,7 +94,7 @@ table {
 
 li {
   color: var(--dark-color);
-  p { color: var(--content-color); }
+  p { color: var(--accent-color); }
 }
 
 /* Common */
@@ -111,6 +111,8 @@ p:last-child { margin-block-end: 0; }
   word-wrap: break-word;
   hyphens: auto;
   line-height: 150%;
+  color: var(--accent-color);
+  
   a {
     word-break: break-all;
     word-break: break-word;
@@ -292,6 +294,8 @@ input.search {
   gap: .75rem;
 
   &.reverse { direction: rtl; }
+  &.large-gap { gap: 1rem; }
+  &.medium-gap { gap: .75rem; }
   &.small-gap { gap: .5rem; }
   &.xsmall-gap { gap: .375rem; }
   &.xxsmall-gap { gap: .25rem; }
diff --git a/packages/theme/styles/common.scss b/packages/theme/styles/common.scss
index ad05ef345d..0eac052b97 100644
--- a/packages/theme/styles/common.scss
+++ b/packages/theme/styles/common.scss
@@ -324,3 +324,6 @@
     border-color: var(--highlight-select-border);
   }
 }
+
+// Replacing the background of a text editor in Activity
+.activity-content .ref-container .textInput { background-color: var(--body-color) !important; }
diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte
index 2bf18e940d..d2bfe0593f 100644
--- a/plugins/activity-resources/src/components/TxView.svelte
+++ b/plugins/activity-resources/src/components/TxView.svelte
@@ -153,7 +153,12 @@
       </div>
     {/if}
 
-    <div class="flex-grow flex-col clear-mins" class:isNew>
+    <div
+      class="flex-grow flex-col clear-mins"
+      class:isNew
+      class:comment={viewlet && viewlet?.editable}
+      class:mention={viewlet?.display === 'emphasized' || isMessageType(model[0]?.attribute)}
+    >
       <div class="flex-between">
         <div class="flex-row-center flex-grow label">
           <div class="bold">
@@ -294,7 +299,7 @@
       </div>
 
       {#if viewlet && viewlet.component && viewlet.display !== 'inline'}
-        <div class={viewlet.display}>
+        <div class="activity-content {viewlet.display}">
           <ShowMore ignore={edit}>
             {#if tx.collectionAttribute !== undefined && (tx.txDocIds?.size ?? 0) > 1}
               <div class="flex-row-center flex-grow flex-wrap clear-mins">
@@ -313,6 +318,29 @@
 {/if}
 
 <style lang="scss">
+  .comment,
+  .mention {
+    position: relative;
+
+    &::after {
+      content: '';
+      position: absolute;
+      bottom: -0.5rem;
+      left: -0.625rem;
+      right: -0.625rem;
+      background-color: var(--accent-bg-color);
+      border: 1px solid var(--divider-color);
+      border-radius: 0.5rem;
+      z-index: -1;
+    }
+  }
+  .comment::after {
+    top: -0.25rem;
+  }
+  .mention::after {
+    top: -0.625rem;
+  }
+
   .msgactivity-container {
     position: relative;
     min-width: 0;
@@ -329,7 +357,7 @@
       position: absolute;
       left: 1.125rem;
       width: 1px;
-      background-color: var(--theme-card-divider);
+      background-color: var(--popup-divider);
     }
     &::before {
       top: -1.5rem;
@@ -359,8 +387,8 @@
     margin-right: 1rem;
     width: 2.25rem;
     height: 2.25rem;
-    color: var(--theme-caption-color);
-    border: 1px solid var(--theme-card-divider);
+    color: var(--caption-color);
+    border: 1px solid var(--popup-divider);
     border-radius: 50%;
   }
 
@@ -377,18 +405,18 @@
     }
     .bold {
       font-weight: 500;
-      color: var(--theme-caption-color);
+      color: var(--caption-color);
     }
     .strong {
       font-weight: 500;
-      color: var(--theme-content-accent-color);
+      color: var(--accent-color);
     }
   }
 
   .time {
     align-self: baseline;
     margin-left: 1rem;
-    color: var(--theme-content-trans-color);
+    color: var(--dark-color);
   }
 
   .content {
@@ -400,10 +428,10 @@
 
   .emphasized {
     margin-top: 0.5rem;
-    background-color: var(--theme-bg-accent-color);
-    border: 1px solid var(--theme-bg-accent-color);
-    border-radius: 0.75rem;
-    padding: 1rem 1.25rem;
+    background-color: var(--body-color);
+    border: 1px solid var(--divider-color);
+    border-radius: 0.5rem;
+    padding: 0.75rem 1rem;
   }
 
   .message {
diff --git a/plugins/chunter-resources/src/components/activity/TxBacklinkReference.svelte b/plugins/chunter-resources/src/components/activity/TxBacklinkReference.svelte
index 44c47865d5..4518a642e6 100644
--- a/plugins/chunter-resources/src/components/activity/TxBacklinkReference.svelte
+++ b/plugins/chunter-resources/src/components/activity/TxBacklinkReference.svelte
@@ -57,7 +57,7 @@
 
 {#if presenter}
   {#if targetPresenter}
-    <div class="ml-2">
+    <div class="mx-2">
       <svelte:component this={targetPresenter.presenter} value={target} />
     </div>
   {/if}
diff --git a/plugins/contact-resources/src/components/EmployeePresenter.svelte b/plugins/contact-resources/src/components/EmployeePresenter.svelte
index 68ff9fffbc..d2ecbedd94 100644
--- a/plugins/contact-resources/src/components/EmployeePresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeePresenter.svelte
@@ -44,26 +44,24 @@
   $: handlePersonEdit = onEmployeeEdit ?? onEdit
 </script>
 
-<div bind:this={container} class="inline-flex clear-mins">
-  <div class:over-underline={!inline}>
-    <PersonPresenter
-      {value}
-      {tooltipLabels}
-      onEdit={isInteractive ? handlePersonEdit : () => {}}
-      {shouldShowAvatar}
-      {shouldShowName}
-      {avatarSize}
-      {shouldShowPlaceholder}
-      {isInteractive}
-      {inline}
-    />
-  </div>
-  {#if value?.$lookup?.statuses?.length}
-    <div class="pl-2 status content-color">
-      <EmployeeStatusPresenter employee={value} />
-    </div>
-  {/if}
+<div bind:this={container} class:over-underline={!inline}>
+  <PersonPresenter
+    {value}
+    {tooltipLabels}
+    onEdit={isInteractive ? handlePersonEdit : () => {}}
+    {shouldShowAvatar}
+    {shouldShowName}
+    {avatarSize}
+    {shouldShowPlaceholder}
+    {isInteractive}
+    {inline}
+  />
 </div>
+{#if value?.$lookup?.statuses?.length}
+  <div class="pl-2 status content-color">
+    <EmployeeStatusPresenter employee={value} />
+  </div>
+{/if}
 
 <style lang="scss">
   .status {
diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte
index 313c15b7ef..256f890017 100644
--- a/plugins/contact-resources/src/components/PersonContent.svelte
+++ b/plugins/contact-resources/src/components/PersonContent.svelte
@@ -93,22 +93,22 @@
 
       &:hover {
         .eContentPresenterIcon {
-          color: var(--theme-content-dark-color);
+          color: var(--dark-color);
         }
         .eContentPresenterLabel {
           text-decoration: none;
-          color: var(--theme-content-accent-color);
+          color: var(--accent-color);
         }
       }
     }
     .eContentPresenterIcon {
-      color: var(--theme-content-dark-color);
+      color: var(--dark-color);
     }
     .eContentPresenterLabel {
       min-width: 0;
       font-weight: 500;
       text-align: left;
-      color: var(--theme-content-accent-color);
+      color: var(--accent-color);
 
       overflow: hidden;
       visibility: visible;
@@ -121,11 +121,11 @@
     }
     &:hover {
       .eContentPresenterIcon {
-        color: var(--theme-caption-color);
+        color: var(--caption-color);
       }
       .eContentPresenterLabel {
         text-decoration: underline;
-        color: var(--theme-caption-color);
+        color: var(--caption-color);
       }
     }
   }
diff --git a/plugins/templates-assets/assets/icons.svg b/plugins/templates-assets/assets/icons.svg
index e9dd6d455e..eeecbe1f63 100644
--- a/plugins/templates-assets/assets/icons.svg
+++ b/plugins/templates-assets/assets/icons.svg
@@ -6,4 +6,10 @@
     <path d="M20.9,9.7c0.2,0.7,0.3,1.5,0.3,2.3c0,5.1-4.1,9.2-9.2,9.2H2.8V12c0-5.1,4.1-9.2,9.2-9.2c0.8,0,1.5,0.1,2.2,0.3c0.1-0.5,0.3-1,0.6-1.5C13.9,1.3,13,1.2,12,1.2C6.1,1.2,1.2,6.1,1.2,12v10c0,0.4,0.3,0.8,0.8,0.8h10c5.9,0,10.8-4.8,10.8-10.8c0-0.9-0.1-1.8-0.4-2.6C22,9.6,21.5,9.7,20.9,9.7z" />
     <path d="M16.2,4.5c0,0.4,0.3,0.8,0.8,0.8h1.8V7c0,0.4,0.3,0.8,0.8,0.8s0.8-0.3,0.8-0.8V5.2H22c0.4,0,0.8-0.3,0.8-0.8S22.4,3.8,22,3.8h-1.8V2c0-0.4-0.3-0.8-0.8-0.8S18.8,1.6,18.8,2v1.8H17C16.6,3.8,16.2,4.1,16.2,4.5z" />
   </symbol>  
+  <symbol id="template" viewBox="0 0 24 24">
+    <path d="M12,1.2C6.1,1.2,1.2,6.1,1.2,12v10c0,0.4,0.3,0.8,0.8,0.8h10c5.9,0,10.8-4.8,10.8-10.8S17.9,1.2,12,1.2z M12,21.2H2.8V12c0-5.1,4.1-9.2,9.2-9.2c5.1,0,9.2,4.1,9.2,9.2C21.2,17.1,17.1,21.2,12,21.2z" />
+    <path d="M16,8.2H7C6.6,8.2,6.2,8.6,6.2,9S6.6,9.8,7,9.8h9c0.4,0,0.8-0.3,0.8-0.8S16.4,8.2,16,8.2z" />
+    <path d="M16,12.2H7c-0.4,0-0.8,0.3-0.8,0.8s0.3,0.8,0.8,0.8h9c0.4,0,0.8-0.3,0.8-0.8S16.4,12.2,16,12.2z" />
+    <path d="M12,16.2H7c-0.4,0-0.8,0.3-0.8,0.8s0.3,0.8,0.8,0.8h5c0.4,0,0.8-0.3,0.8-0.8S12.4,16.2,12,16.2z" />
+  </symbol>  
 </svg>
diff --git a/plugins/templates-assets/src/index.ts b/plugins/templates-assets/src/index.ts
index 4be2259d6b..c13248c2ce 100644
--- a/plugins/templates-assets/src/index.ts
+++ b/plugins/templates-assets/src/index.ts
@@ -19,7 +19,8 @@ import templates, { templatesId } from '@anticrm/templates'
 
 const icons = require('../assets/icons.svg') as string // eslint-disable-line
 loadMetadata(templates.icon, {
-  Templates: `${icons}#templates`
+  Templates: `${icons}#templates`,
+  Template: `${icons}#template`
 })
 
 addStringsLoader(templatesId, async (lang: string) => await import(`../lang/${lang}.json`))
diff --git a/plugins/templates/src/index.ts b/plugins/templates/src/index.ts
index 64114d3d63..6137e01cea 100644
--- a/plugins/templates/src/index.ts
+++ b/plugins/templates/src/index.ts
@@ -38,6 +38,7 @@ export default plugin(templatesId, {
     Templates: '' as Ref<Space>
   },
   icon: {
-    Templates: '' as Asset
+    Templates: '' as Asset,
+    Template: '' as Asset
   }
 })