diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 4fb8e0428..238be88df 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -726,10 +726,6 @@ const PostStatusForm = {
         scrollerRef.scrollTop = targetScroll
       }
     },
-    showEmojiPicker () {
-      this.$refs.textarea.focus()
-      this.$refs['emoji-input'].triggerShowPicker()
-    },
     clearError () {
       this.error = null
     },
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index 7c25002fb..0befba9c3 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -41,9 +41,8 @@
 
   .form-bottom-left {
     display: flex;
-    flex: 1;
-    padding-right: 7px;
-    margin-right: 7px;
+    padding-right: 0.5em;
+    margin-right: 0.5em;
     max-width: 10em;
   }
 
@@ -102,7 +101,7 @@
   .visibility-tray {
     display: flex;
     justify-content: space-between;
-    padding-top: 5px;
+    padding-top: 0.5em;
     align-items: baseline;
   }
 
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index bbff7d4b7..ec8bbd224 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -184,7 +184,6 @@
             class="input form-control main-input unstyled"
             enable-sticker-picker
             enable-emoji-picker
-            hide-emoji-button
             :newline-on-ctrl-enter="submitOnEnter"
             @input="onEmojiInputInput"
             @sticker-uploaded="addMediaFile"
@@ -288,13 +287,6 @@
             @upload-failed="uploadFailed"
             @all-uploaded="finishedUploadingFiles"
           />
-          <button
-            class="emoji-icon button-unstyled"
-            :title="$t('emoji.add_emoji')"
-            @click="showEmojiPicker"
-          >
-            <FAIcon icon="smile-beam" />
-          </button>
           <button
             v-if="pollsAvailable"
             class="poll-icon button-unstyled"