diff --git a/src/components/chat/topbar.ts b/src/components/chat/topbar.ts
index 38dd160e..6f96d392 100644
--- a/src/components/chat/topbar.ts
+++ b/src/components/chat/topbar.ts
@@ -144,7 +144,7 @@ export default class ChatTopbar {
     this.avatarElement = new AvatarElement();
     this.avatarElement.setAttribute('dialog', '1');
     this.avatarElement.setAttribute('clickable', '');
-    this.avatarElement.classList.add('avatar-40');
+    this.avatarElement.classList.add('avatar-40', 'person-avatar');
 
     this.subtitle = document.createElement('div');
     this.subtitle.classList.add('info');
diff --git a/src/lib/appManagers/appDialogsManager.ts b/src/lib/appManagers/appDialogsManager.ts
index 83bcd8e3..65cc82c2 100644
--- a/src/lib/appManagers/appDialogsManager.ts
+++ b/src/lib/appManagers/appDialogsManager.ts
@@ -1081,9 +1081,11 @@ export class AppDialogsManager {
       //dom.unreadMessagesSpan.innerText = '' + (dialog.unread_count ? formatNumber(dialog.unread_count, 1) : ' ');
       dom.unreadMessagesSpan.innerText = '' + (dialog.unread_count || ' ');
       dom.unreadMessagesSpan.classList.add('unread');
-    } else if(isPinned) {
+    } else {
       dom.unreadMessagesSpan.classList.remove('unread');
-      dom.unreadMessagesSpan.classList.add('tgico-pinnedchat');
+      if(isPinned) {
+        dom.unreadMessagesSpan.classList.add('tgico-pinnedchat');
+      }
     }
   }
 
diff --git a/src/scss/partials/_chatTopbar.scss b/src/scss/partials/_chatTopbar.scss
index f9dad046..1f538ece 100644
--- a/src/scss/partials/_chatTopbar.scss
+++ b/src/scss/partials/_chatTopbar.scss
@@ -191,6 +191,10 @@
 		align-items: center;
 		cursor: pointer;
 
+		&-avatar {
+			flex: 0 0 auto;
+		}
+
 		.bottom {
 			font-size: 14px;
 			//line-height: 18px;