diff --git a/client/src/views/stream/notes/assign.js b/client/src/views/stream/notes/assign.js
index 353b9409d0..e69593499a 100644
--- a/client/src/views/stream/notes/assign.js
+++ b/client/src/views/stream/notes/assign.js
@@ -56,7 +56,7 @@ class AssignNoteStreamView extends NoteStreamView {
 
         this.messageData['assignee'] =
             $('<span>')
-                .addClass('nowrap')
+                .addClass('nowrap name-avatar')
                 .append(
                     this.getHelper().getAvatarHtml(data.assignedUserId, 'small', 16, 'avatar-link'),
                     $('<a>')
diff --git a/client/src/views/stream/notes/create.js b/client/src/views/stream/notes/create.js
index e42d0502d3..5c7f516e6a 100644
--- a/client/src/views/stream/notes/create.js
+++ b/client/src/views/stream/notes/create.js
@@ -60,7 +60,7 @@ class CreateNoteStreamView extends NoteStreamView {
 
         this.messageData['assignee'] =
             $('<span>')
-                .addClass('nowrap')
+                .addClass('nowrap name-avatar')
                 .append(
                     this.getHelper().getAvatarHtml(data.assignedUserId, 'small', 16, 'avatar-link'),
                     $('<a>')
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index f659848a54..90ef9e38ca 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -2113,7 +2113,7 @@ img.avatar.avatar-link {
     top: 1px;
 
     &[width="16"] {
-        top: 2px;
+        top: 3px;
         vertical-align: baseline;
     }
 
@@ -2122,6 +2122,13 @@ img.avatar.avatar-link {
     }
 }
 
+.name-avatar {
+    > .avatar {
+        margin-left: 1px;
+        margin-right: 2px;
+    }
+}
+
 div[data-scope="User"],
 div[data-scope="PortalUser"],
 div[data-scope="ApiUser"] {