diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index a443f2980..05ee35cf3 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -162,7 +162,6 @@ export default class ComposeForm extends ImmutablePureComponent {
     const text     = [this.props.spoiler_text, countableText(this.props.text), maybeEye].join('');
 
     const secondaryVisibility = this.props.settings.get('side_arm');
-    const isWideView = this.props.settings.get('stretch');
     let showSideArm = secondaryVisibility !== 'none';
 
     let publishText = '';
@@ -182,14 +181,9 @@ export default class ComposeForm extends ImmutablePureComponent {
           {
             <i
               className={`fa fa-${privacyIcons[this.props.privacy]}`}
-              style={{
-                paddingRight: (filesAttached || !isWideView) ? '0' : '5px',
-              }}
+              style={{ paddingRight: '5px' }}
             />
-          }{
-            (filesAttached || !isWideView) ? '' :
-              intl.formatMessage(messages.publish)
-          }
+          }{intl.formatMessage(messages.publish)}
         </span>
       );
 
@@ -273,7 +267,6 @@ export default class ComposeForm extends ImmutablePureComponent {
               text={publishText}
               onClick={this.handleSubmit}
               disabled={submitDisabled}
-              block
             />
           </div>
         </div>
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index 43d484e6e..119e9feb0 100644
--- a/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@ -468,7 +468,7 @@
 
 .compose-form__publish__side-arm {
   padding: 0 !important;
-  width: 4em;
+  width: 36px;
   text-align: center;
   margin-right: 2px;
 }