diff --git a/app/assets/stylesheets/common/base/sidebar-section-link.scss b/app/assets/stylesheets/common/base/sidebar-section-link.scss
index 3d425f29e84..6322b4043c2 100644
--- a/app/assets/stylesheets/common/base/sidebar-section-link.scss
+++ b/app/assets/stylesheets/common/base/sidebar-section-link.scss
@@ -62,14 +62,12 @@
     }
 
     .sidebar-section-link-content-text {
-      align-items: center;
-      display: inline-flex;
-
       @include ellipsis;
 
       .emoji {
         width: 15px;
         height: 15px;
+        vertical-align: baseline;
       }
 
       .badge-category__wrapper {
diff --git a/plugins/chat/assets/stylesheets/common/chat-channel-name.scss b/plugins/chat/assets/stylesheets/common/chat-channel-name.scss
index ca848a01a14..23651a2c0f1 100644
--- a/plugins/chat/assets/stylesheets/common/chat-channel-name.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-channel-name.scss
@@ -13,5 +13,6 @@
   .emoji {
     height: 1em;
     width: 1em;
+    vertical-align: baseline;
   }
 }
diff --git a/plugins/chat/assets/stylesheets/common/chat-message-info.scss b/plugins/chat/assets/stylesheets/common/chat-message-info.scss
index f32c9d14614..9aaed7c54b7 100644
--- a/plugins/chat/assets/stylesheets/common/chat-message-info.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-message-info.scss
@@ -7,7 +7,7 @@
 
 .chat-message-info__username {
   display: inline-flex;
-  align-items: center;
+  align-items: baseline;
 
   & + .chat-message-info__bot-indicator,
   & + .chat-message-info__date {
@@ -61,8 +61,8 @@
   margin-inline: 0.33rem;
 
   .emoji {
-    width: 16px;
-    height: 16px;
+    width: 15px;
+    height: 15px;
   }
 }
 
diff --git a/plugins/chat/assets/stylesheets/common/sidebar-extensions.scss b/plugins/chat/assets/stylesheets/common/sidebar-extensions.scss
index 0f4d0059a97..4c3431b32b9 100644
--- a/plugins/chat/assets/stylesheets/common/sidebar-extensions.scss
+++ b/plugins/chat/assets/stylesheets/common/sidebar-extensions.scss
@@ -152,12 +152,6 @@
     }
   }
 
-  .sidebar-section-link-content-text {
-    .user-status-message {
-      margin-left: 0.33em;
-    }
-  }
-
   .sidebar-section-link--active {
     background: var(--primary-low);
   }