diff --git a/changelog.d/visual.change b/changelog.d/visual.change
new file mode 100644
index 000000000..c2e743cd4
--- /dev/null
+++ b/changelog.d/visual.change
@@ -0,0 +1,4 @@
+Combined subject and content fields in post form (visually)
+Fixes for some elements not scaling with user UI scale
+Moved post form's emoji button into input field
+Minor visual changes and fixes
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index ac223edb1..78b93fd28 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -108,6 +108,12 @@
     align-items: baseline;
   }
 
+  .visibility-notice {
+    border: 1px solid var(--border);
+    border-radius: var(--roundness);
+    padding: 0.5em 1em
+  }
+
   .visibility-notice.edit-warning {
     > :first-child {
       margin-top: 0;
@@ -195,6 +201,10 @@
     line-height: 1.85;
   }
 
+  .inputs-wrapper {
+    padding: 0;
+  }
+
   .input.form-post-body {
     // TODO: make a resizable textarea component?
     box-sizing: content-box; // needed for easier computation of dynamic size
@@ -202,6 +212,7 @@
     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);
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 37371f1de..f661a980d 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -156,7 +156,7 @@
             class="preview-status"
           />
         </div>
-        <div class="input">
+        <div class="input inputs-wrapper">
           <EmojiInput
             v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
             v-model="newStatus.spoilerText"