diff --git a/client/res/templates/notification/items/email-received.tpl b/client/res/templates/notification/items/email-received.tpl
index e291271cd3..3df73cff68 100644
--- a/client/res/templates/notification/items/email-received.tpl
+++ b/client/res/templates/notification/items/email-received.tpl
@@ -3,17 +3,14 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        <span class="text-muted"
-        ><span
-            class="fas fa-envelope action"
+        <span
+            class="fas fa-envelope text-muted action icon"
             style="cursor: pointer;"
             title="{{translate 'View'}}"
             data-action="quickView"
             data-id="{{emailId}}"
             data-scope="Email"
-        ></span>
-            <span class="message">{{{message}}}</span>
-        </span>
+        ></span><span class="message text-muted">{{{message}}}</span>
     </div>
 </div>
 
diff --git a/client/res/templates/stream/notes/assign.tpl b/client/res/templates/stream/notes/assign.tpl
index d4fea9bb6c..fec9d8c54d 100644
--- a/client/res/templates/stream/notes/assign.tpl
+++ b/client/res/templates/stream/notes/assign.tpl
@@ -9,8 +9,7 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        {{#if iconHtml}}{{{iconHtml}}}{{/if}}
-        <span class="text-muted message">{{{message}}}</span>
+        {{#if iconHtml}}{{{iconHtml}}}{{/if}}<span class="text-muted message">{{{message}}}</span>
     </div>
 </div>
 <div class="stream-date-container">
diff --git a/client/res/templates/stream/notes/create-related.tpl b/client/res/templates/stream/notes/create-related.tpl
index 2457e76ba1..9b1d9a7912 100644
--- a/client/res/templates/stream/notes/create-related.tpl
+++ b/client/res/templates/stream/notes/create-related.tpl
@@ -9,8 +9,7 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        {{#if iconHtml}}{{{iconHtml}}}{{/if}}
-        <span class="text-muted message">{{{message}}}</span>
+        {{#if iconHtml}}{{{iconHtml}}}{{/if}}<span class="text-muted message">{{{message}}}</span>
     </div>
 </div>
 
diff --git a/client/res/templates/stream/notes/create.tpl b/client/res/templates/stream/notes/create.tpl
index 2160182179..6f5ff26c8a 100644
--- a/client/res/templates/stream/notes/create.tpl
+++ b/client/res/templates/stream/notes/create.tpl
@@ -9,8 +9,7 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        {{#if iconHtml}}{{{iconHtml}}}{{/if}}
-        <span class="text-muted message">{{{message}}}</span>
+        {{#if iconHtml}}{{{iconHtml}}}{{/if}}<span class="text-muted message">{{{message}}}</span>
     </div>
 </div>
 
diff --git a/client/res/templates/stream/notes/email-received.tpl b/client/res/templates/stream/notes/email-received.tpl
index b2caa8919a..3377853355 100644
--- a/client/res/templates/stream/notes/email-received.tpl
+++ b/client/res/templates/stream/notes/email-received.tpl
@@ -10,17 +10,13 @@
     </div>
     <div class="stream-head-text-container">
         <span
-            class="text-muted"
-        ><span
             class="{{emailIconClassName}} action icon"
             style="cursor: pointer;"
             title="{{translate 'View'}}"
             data-action="quickView"
             data-id="{{emailId}}"
             data-scope="Email"
-        ></span>
-            {{{message}}}
-        </span>
+        ></span><span class="message text-muted">{{{message}}}</span>
     </div>
 </div>
 
diff --git a/client/res/templates/stream/notes/email-sent.tpl b/client/res/templates/stream/notes/email-sent.tpl
index 6aeba0135c..44fd203566 100644
--- a/client/res/templates/stream/notes/email-sent.tpl
+++ b/client/res/templates/stream/notes/email-sent.tpl
@@ -9,18 +9,14 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        <span
-            class="text-muted"
-        ><span
-            class="{{emailIconClassName}} action icon"
+       <span
+            class="{{emailIconClassName}} text-muted action icon"
             style="cursor: pointer;"
             title="{{translate 'View'}}"
             data-action="quickView"
             data-id="{{emailId}}"
             data-scope="Email"
-        ></span>
-            {{{message}}}
-        </span>
+        ></span><span class="text-muted">{{{message}}}</span>
     </div>
 </div>
 
diff --git a/client/res/templates/stream/notes/status.tpl b/client/res/templates/stream/notes/status.tpl
index 71ea65249a..240a994234 100644
--- a/client/res/templates/stream/notes/status.tpl
+++ b/client/res/templates/stream/notes/status.tpl
@@ -9,8 +9,7 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        {{#if iconHtml}}{{{iconHtml}}}{{/if}}
-        <span class="text-muted message">{{{message}}}</span>
+        {{#if iconHtml}}{{{iconHtml}}}{{/if}}<span class="text-muted message">{{{message}}}</span>
     </div>
 </div>
 
diff --git a/client/res/templates/stream/notes/update.tpl b/client/res/templates/stream/notes/update.tpl
index b3e3d80c69..84a1fdf913 100644
--- a/client/res/templates/stream/notes/update.tpl
+++ b/client/res/templates/stream/notes/update.tpl
@@ -9,8 +9,7 @@
         {{{avatar}}}
     </div>
     <div class="stream-head-text-container">
-        {{#if iconHtml}}{{{iconHtml}}}{{/if}}
-        <span class="text-muted message">{{{message}}}</span>
+        {{#if iconHtml}}{{{iconHtml}}}{{/if}}<span class="text-muted message">{{{message}}}</span>
         {{#if fieldDataList.length}}
             <a role="button" tabindex="0" data-action="expandDetails"><span class="fas fa-chevron-down"></span></a>
         {{/if}}
diff --git a/client/src/views/notification/items/email-inbox.js b/client/src/views/notification/items/email-inbox.js
index fb1b6b4142..d53cebba4c 100644
--- a/client/src/views/notification/items/email-inbox.js
+++ b/client/src/views/notification/items/email-inbox.js
@@ -40,14 +40,13 @@ class EmailInboxNotificationItemView extends BaseNotificationItemView {
             <div class="pull-left">{{{avatar}}}</div>
             <div class="stream-head-text-container">
                 <span
-                    class="fas fa-envelope text-muted action"
+                    class="fas fa-envelope text-muted action icon"
                     style="cursor: pointer;"
                     title="{{translate 'View'}}"
                     data-action="quickView"
                     data-id="{{model.attributes.relatedId}}"
                     data-scope="Email"
-                ></span>
-                <span class="text-muted message">{{{message}}}</span>
+                ></span><span class="text-muted message">{{{message}}}</span>
             </div>
         </div>
         <div class="stream-date-container">
diff --git a/client/src/views/notification/items/user-reaction.js b/client/src/views/notification/items/user-reaction.js
index 77ea99afac..f462fee94d 100644
--- a/client/src/views/notification/items/user-reaction.js
+++ b/client/src/views/notification/items/user-reaction.js
@@ -40,16 +40,13 @@ export default class UserReactionNotificationItemView extends BaseNotificationIt
             </div>
             <div class="stream-head-text-container">
                 <span
-                    class="{{reactionIconClass}} text-muted action"
+                    class="{{reactionIconClass}} text-muted action icon"
                     style="cursor: pointer;"
                     title="{{translate 'View'}}"
                     data-action="quickView"
                     data-id="{{noteId}}"
                     data-scope="Note"
-                ></span>
-                <span class="text-muted message">
-                    {{{message}}}
-                </span>
+                ></span><span class="text-muted message">{{{message}}}</span>
             </div>
         </div>
 
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 67d8ffa03f..c631bba9e1 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -2193,7 +2193,9 @@ td > span.color-icon {
     padding-left: var(--29px);
 
     > .icon:first-child {
-        margin-right: var(--3px);
+        min-width: var(--16px);
+        text-align: center;
+        margin-right: var(--6px);
     }
 }