diff --git a/plugins/chat/assets/stylesheets/common/chat-navbar.scss b/plugins/chat/assets/stylesheets/common/chat-navbar.scss
index fe1a1d6297e..061e4be6b56 100644
--- a/plugins/chat/assets/stylesheets/common/chat-navbar.scss
+++ b/plugins/chat/assets/stylesheets/common/chat-navbar.scss
@@ -14,12 +14,6 @@
     z-index: z("composer", "content") - 1;
     padding-inline: 1rem;
 
-    .chat-drawer &,
-    .c-routes-channel-thread &,
-    .c-routes-channel-info & {
-      padding-inline: 0;
-    }
-
     &.-clickable {
       cursor: pointer;
     }
diff --git a/plugins/chat/assets/stylesheets/desktop/chat-navbar.scss b/plugins/chat/assets/stylesheets/desktop/chat-navbar.scss
new file mode 100644
index 00000000000..9b61edbd8c1
--- /dev/null
+++ b/plugins/chat/assets/stylesheets/desktop/chat-navbar.scss
@@ -0,0 +1,7 @@
+.c-navbar-container {
+  .chat-drawer &,
+  .c-routes-channel-thread &,
+  .c-routes-channel-info & {
+    padding-inline: 0;
+  }
+}
diff --git a/plugins/chat/assets/stylesheets/desktop/index.scss b/plugins/chat/assets/stylesheets/desktop/index.scss
index 6285d3d2802..e5daeca9293 100644
--- a/plugins/chat/assets/stylesheets/desktop/index.scss
+++ b/plugins/chat/assets/stylesheets/desktop/index.scss
@@ -1,4 +1,5 @@
 @import "base-desktop";
+@import "chat-navbar";
 @import "chat-composer-uploads";
 @import "chat-index-drawer";
 @import "chat-index-full-page";
diff --git a/plugins/chat/assets/stylesheets/mobile/base-mobile.scss b/plugins/chat/assets/stylesheets/mobile/base-mobile.scss
index 05cfaaa8f58..8779a11b5b3 100644
--- a/plugins/chat/assets/stylesheets/mobile/base-mobile.scss
+++ b/plugins/chat/assets/stylesheets/mobile/base-mobile.scss
@@ -1,5 +1,6 @@
 :root {
   --channel-list-avatar-size: 38px;
+  --chat-header-offset: 56px;
 }
 
 .chat-message-container:not(.-user-info-hidden) {
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-header.scss b/plugins/chat/assets/stylesheets/mobile/chat-header.scss
index eafa552c4b1..21a5168cf2e 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-header.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-header.scss
@@ -16,7 +16,7 @@
     .back-to-forum {
       color: var(--primary);
       font-size: var(--font-up-1);
-      padding: 0.5rem 0.8rem;
+      padding: 0.5rem 0.8rem 0.5rem 0.25rem;
 
       .d-icon {
         color: var(--primary);
diff --git a/plugins/chat/assets/stylesheets/mobile/chat-navbar.scss b/plugins/chat/assets/stylesheets/mobile/chat-navbar.scss
index 5faf8a9dec3..63d3e95ae1e 100644
--- a/plugins/chat/assets/stylesheets/mobile/chat-navbar.scss
+++ b/plugins/chat/assets/stylesheets/mobile/chat-navbar.scss
@@ -1,6 +1,11 @@
 .c-navbar {
+  gap: 0.75rem;
   &-container {
     max-width: 100vw;
     padding-inline: 0.25rem;
   }
+
+  &__back-button {
+    align-self: stretch;
+  }
 }