diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index 020db3d5fd3..eab924449f8 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -83,6 +83,9 @@
     .saving-text {
       display: none;
     }
+    .toggler {
+      order: 2;
+    }
   }
 
   &.saving .saving-text {
@@ -98,7 +101,7 @@
       color: $primary-high;
     }
     .reply-details {
-      max-width: calc(100% - 60px);
+      max-width: calc(100% - 175px);
       flex: 1 1 auto;
       white-space: nowrap;
     }
diff --git a/app/assets/stylesheets/mobile/compose.scss b/app/assets/stylesheets/mobile/compose.scss
index 450d568e403..72496820dc3 100644
--- a/app/assets/stylesheets/mobile/compose.scss
+++ b/app/assets/stylesheets/mobile/compose.scss
@@ -25,6 +25,9 @@
 
   .reply-to {
     margin: 5px 0;
+    .reply-details {
+      max-width: calc(100% - 75px);
+    }
   }
 
   .toggler {
diff --git a/plugins/discourse-presence/assets/stylesheets/presence.scss b/plugins/discourse-presence/assets/stylesheets/presence.scss
index f7bae24433d..e26da30b928 100644
--- a/plugins/discourse-presence/assets/stylesheets/presence.scss
+++ b/plugins/discourse-presence/assets/stylesheets/presence.scss
@@ -49,7 +49,7 @@
 .composer-fields .presence-users {
   position: absolute;
   top: 20px;
-  right: 55px;
+  right: 75px;
   @media screen and (max-width: $small-width) {
     max-width: 318px;
     .presence-avatars {
@@ -63,7 +63,7 @@
     font-size: $font-down-1;
   }
   .composer-fields .presence-users {
-    top: 3px;
+    top: 7px;
     right: 65px;
     max-width: 70px;
     .presence-avatars {