diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index ed1c33c73..425855b44 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -42,7 +42,9 @@
           <div class="chat-search-result-item">
             <profile-avatar :profile="option" size="small" />
             <div class="chat-search-result-info">
-              <span class="chat-search-result-name">{{ option.name }}</span>
+              <span class="chat-search-result-name">
+                <os-icon v-if="option.__typename === 'Group'" :icon="icons.group" class="chat-search-group-icon" />{{ option.name }}
+              </span>
               <span class="chat-search-result-detail">
                 {{ option.__typename === 'Group' ? `&${option.slug}` : `@${option.slug}` }}
               </span>
@@ -203,6 +205,10 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.chat-search-group-icon {
+  vertical-align: middle !important;
+  margin-right: 0;
+}
 .chat-search-result-detail {
   font-size: $font-size-small;
   color: $text-color-soft;
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index 09f334b87..7ab22843f 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -88,9 +88,20 @@
     <div slot="room-header-info">
       <div class="vac-room-name vac-text-ellipsis">
         <nuxt-link v-if="roomHeaderLink" :to="roomHeaderLink" class="chat-header-profile-link">
+          <os-icon v-if="selectedRoom && selectedRoom.isGroupRoom" :icon="icons.group" class="room-group-icon" />
           {{ selectedRoom ? selectedRoom.roomName : '' }}
         </nuxt-link>
-        <span v-else>{{ selectedRoom ? selectedRoom.roomName : '' }}</span>
+        <span v-else>
+          <os-icon v-if="selectedRoom && selectedRoom.isGroupRoom" :icon="icons.group" class="room-group-icon" />
+          {{ selectedRoom ? selectedRoom.roomName : '' }}
+        </span>
+      </div>
+    </div>
+
+    <div v-for="room in rooms" v-if="room.isGroupRoom" :slot="'room-list-info_' + room.roomId" :key="'info-' + room.id">
+      <div class="vac-room-name vac-text-ellipsis room-name-with-icon">
+        <os-icon :icon="icons.group" class="room-group-icon" />
+        {{ room.roomName }}
       </div>
     </div>
 
@@ -108,7 +119,8 @@
         :key="'avatar-' + msg._id"
         :profile="messageUserProfile(msg.senderId)"
         class="vac-message-avatar"
-        style="align-self: flex-end; margin: 0 0 2px;"
+        style="align-self: flex-end; margin: 0 0 2px; cursor: pointer;"
+        @click.native="navigateToProfile(msg.senderId, messageUserProfile(msg.senderId).name)"
       />
     </template>
   </vue-advanced-chat>
@@ -1104,11 +1116,13 @@ export default {
       document.body.removeChild(downloadLink)
     },
 
+    navigateToProfile(userId, name) {
+      const slug = (name || '').toLowerCase().replaceAll(' ', '-')
+      this.$router.push({ path: `/profile/${userId}/${slug}` })
+    },
+
     redirectToUserProfile({ user }) {
-      const userID = user.id
-      const userName = user.name.toLowerCase().replaceAll(' ', '-')
-      const url = `/profile/${userID}/${userName}`
-      this.$router.push({ path: url })
+      this.navigateToProfile(user.id, user.name)
     },
   },
 }
@@ -1118,6 +1132,18 @@ export default {
   margin-right: 15px;
 }
 
+.room-group-icon {
+  vertical-align: middle !important;
+  margin-right: 0;
+}
+
+.room-name-with-icon {
+  color: var(--chat-room-color-username);
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 22px;
+}
+
 .vac-message-avatar {
   width: 28px;
   height: 28px;