diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index 237d32584..ae64a75f1 100644
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@@ -305,16 +305,11 @@ class ComposeForm extends ImmutablePureComponent {
               <SpoilerButtonContainer />
             </div>
             {maxTootChars && <div className='character-counter__wrapper'><CharacterCounter max={maxTootChars} text={text} /></div>}
+            <div className='compose-form__publish'>
+              <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
+            </div>
           </div>
         }
-
-        {
-          !condensed &&
-          <div className='compose-form__publish'>
-            <div className='compose-form__publish-button-wrapper'><Button text={publishText} onClick={this.handleSubmit} disabled={disabledButton} block /></div>
-          </div>
-        }
-
       </div>
     );
   }
diff --git a/app/styles/components/columns.scss b/app/styles/components/columns.scss
index fe9bca700..a276e2116 100644
--- a/app/styles/components/columns.scss
+++ b/app/styles/components/columns.scss
@@ -132,7 +132,6 @@
     .compose-form {
       padding: 15px;
     }
-    .compose-form .compose-form__publish .compose-form__publish-button-wrapper {padding-top: 15px;}
 
     .status {
       padding: 15px 15px 15px (48px + 15px * 2);
diff --git a/app/styles/components/compose-form.scss b/app/styles/components/compose-form.scss
index 28d85b0ad..93297b6a3 100644
--- a/app/styles/components/compose-form.scss
+++ b/app/styles/components/compose-form.scss
@@ -291,13 +291,19 @@
   .compose-form__buttons-wrapper {
     padding: 10px;
     background: var(--background-color);
-    border-radius: 0 0 4px 4px;
     display: flex;
     justify-content: space-between;
     flex: 0 0 auto;
 
     .compose-form__buttons {
       display: flex;
+
+      > div {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
       .compose-form__upload-button-icon {line-height: 27px;}
 
       .compose-form__sensitive-button {
@@ -314,7 +320,7 @@
 
     .character-counter__wrapper {
       align-self: center;
-      margin-right: 4px;
+      margin: 0 10px 0 auto;
 
       .character-counter {
         cursor: default;
@@ -335,7 +341,6 @@
 
     .compose-form__publish-button-wrapper {
       overflow: hidden;
-      padding-top: 10px;
     }
   }
 } // end .compose-form
diff --git a/app/styles/components/modal.scss b/app/styles/components/modal.scss
index e3011f613..84ba5e474 100644
--- a/app/styles/components/modal.scss
+++ b/app/styles/components/modal.scss
@@ -621,7 +621,6 @@
 }
 
 .compose-modal {
-  padding: 8px 0 0;
   overflow: hidden;
   background-color: var(--background-color);
   border-radius: 6px;
@@ -632,7 +631,11 @@
   &__header {
     display: block;
     position: relative;
-    padding: 5px 0;
+    padding: 10px 0;
+    border-bottom: 1px solid hsla(var(--primary-text-color_hsl), 0.2);
+    display: flex;
+    align-items: center;
+    justify-content: center;
 
     &__title {
       display: block;
@@ -649,7 +652,6 @@
   &__close {
     position: absolute;
     right: 10px;
-    top: 5px;
     color: #999;
   }
 
@@ -687,6 +689,10 @@
         }
       }
     }
+
+    .compose-form .compose-form__buttons-wrapper {
+      padding: 0;
+    }
   }
 
   @media screen and (max-width: 895px) {