diff --git a/src/App.scss b/src/App.scss
index 3d30ec79c..3a0204d1e 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -440,6 +440,8 @@ textarea,
     height: unset;
   }
 
+  --padding: 0.5em;
+
   border: none;
   border-radius: $fallback--inputRadius;
   border-radius: var(--inputRadius, $fallback--inputRadius);
@@ -456,10 +458,10 @@ textarea,
   box-sizing: border-box;
   display: inline-block;
   position: relative;
-  height: 2em;
+  height: 2.4em;
   line-height: 1.2;
   hyphens: none;
-  padding: 8px 0.5em;
+  padding: var(--padding);
 
   &:disabled,
   &[disabled=disabled],
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
index 48e7934c1..ccedc1214 100644
--- a/src/components/conversation/conversation.vue
+++ b/src/components/conversation/conversation.vue
@@ -251,14 +251,11 @@
   .thread-ancestor-has-other-replies .conversation-status,
   .thread-ancestor:last-child .conversation-status,
   .thread-ancestor:last-child .thread-ancestor-dive-box,
+  &:last-child .conversation-status,
   &.-expanded .thread-tree .conversation-status {
     border-bottom: none;
   }
 
-  &:last-child .conversation-status {
-    border-bottom: none;
-  }
-
   .thread-ancestors + .thread-tree > .conversation-status {
     border-top-width: 1px;
     border-top-style: solid;
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index ebeead07e..a967d3a3d 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -507,12 +507,14 @@
   }
 
   .form-post-body {
-    resize: none;
+    box-sizing: content-box;
     overflow: hidden;
     transition: min-height 200ms 100ms;
-    padding-bottom: 1.75em;
-    min-height: 2em;
-    box-sizing: content-box;
+    padding-bottom: calc(var(--padding) + 1.2em);
+    // Because we changed box-sizing original height values are no longer correct
+    height: 1.2em;
+    min-height: 1.2em;
+    resize: none;
 
     &.scrollable-form {
       overflow-y: auto;
diff --git a/src/components/timeline/timeline.scss b/src/components/timeline/timeline.scss
index d5dd05f2b..897ebeb92 100644
--- a/src/components/timeline/timeline.scss
+++ b/src/components/timeline/timeline.scss
@@ -10,7 +10,7 @@
   }
 
   .conversation-heading {
-    top: calc(var(--panel-heading-height) * 2);
+    top: calc(var(--__panel-heading-height) * 2);
   }
 
   &.-nonpanel {
diff --git a/src/panel.scss b/src/panel.scss
index cdd7a291a..b36ad9b72 100644
--- a/src/panel.scss
+++ b/src/panel.scss
@@ -33,9 +33,9 @@
 }
 
 .panel-heading {
-  --panel-heading-height: 3.2em;
   --panel-heading-height-padding: 0.6em;
-  --__panel-heading-height-inner: calc(var(--panel-heading-height) - 2 * var(--panel-heading-height-padding));
+  --__panel-heading-height: 3.2em;
+  --__panel-heading-height-inner: calc(var(--__panel-heading-height) - 2 * var(--panel-heading-height-padding));
 
   position: relative;
   box-sizing: border-box;
@@ -55,7 +55,7 @@
   background-color: $fallback--bg;
   background-color: var(--bg, $fallback--bg);
   align-items: center;
-  height: var(--panel-heading-height);
+  height: var(--__panel-heading-height);
   z-index: 2;
 
   &.-flexible-height {