diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue
index 6f3152901..a1cba33bc 100644
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@@ -2,7 +2,7 @@
   <div
     ref="root"
     class="input emoji-input"
-    :class="{ '-with-picker': !hideEmojiButton, '-textarea': this.input?.tagName === 'TEXTAREA' }"
+    :class="{ 'with-picker': !hideEmojiButton }"
   >
     <slot
       :id="'textbox-' + randomSeed"
@@ -120,7 +120,7 @@
     position: absolute;
     top: 0;
     right: 0;
-    padding: 0.2em 0.25em;
+    margin: 0.2em 0.25em;
     font-size: 1.3em;
     cursor: pointer;
     line-height: 1.2em;
@@ -130,12 +130,6 @@
     }
   }
 
-  &.-textarea .emoji-picker-icon {
-    inset: auto;
-    bottom: 0;
-    left: 0;
-  }
-
   .emoji-picker-panel {
     position: absolute;
     z-index: 20;
@@ -157,15 +151,8 @@
     outline: none;
   }
 
-
-  &.-with-picker {
-    input {
-      padding-right: 2.4em;
-    }
-
-    textarea {
-      margin-bottom: 2.5em;
-    }
+  &.with-picker input {
+    padding-right: 2em;
   }
 
   .hidden-overlay {
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index 077548d25..de870e1a4 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -208,11 +208,14 @@
     padding: 0;
   }
 
-  textarea.input.form-post-body {
+  .input.form-post-body {
     // TODO: make a resizable textarea component?
     box-sizing: content-box; // needed for easier computation of dynamic size
     overflow: hidden;
     transition: min-height 200ms 100ms;
+    // stock padding + 1 line of text (for counter)
+    padding-bottom: calc(var(--_padding) + var(--post-line-height) * 1em);
+    padding-right: 1.5em;
     // two lines of text
     height: calc(var(--post-line-height) * 1em);
     min-height: calc(var(--post-line-height) * 1em);