diff --git a/src/components/button.style.js b/src/components/button.style.js
index 1644accc4..3fb308b89 100644
--- a/src/components/button.style.js
+++ b/src/components/button.style.js
@@ -54,7 +54,7 @@ export default {
     {
       variant: 'danger',
       directives: {
-        background: '$blend(--cRed 0.25 --inheritedBackground)',
+        background: '--cRed',
       },
     },
     {
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 9755ac590..35a57d9fe 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -9,7 +9,7 @@
   .inner-nav {
     display: grid;
     grid-template-rows: var(--navbar-height);
-    grid-template-columns: minmax(5em, 1fr) auto minmax(5em, 1fr);
+    grid-template-columns: 2fr auto 2fr;
     grid-template-areas: "sitename logo actions";
     box-sizing: border-box;
     padding: 0 1.2em;
@@ -31,7 +31,7 @@
   }
 
   &.-logoLeft .inner-nav {
-    grid-template-columns: auto minmax(5em, 1fr) minmax(5em, 1fr);
+    grid-template-columns: auto 2fr 2fr;
     grid-template-areas: "logo sitename actions";
   }
 
@@ -92,18 +92,23 @@
 
   .actions {
     grid-area: actions;
-    justify-content: flex-end;
-    text-align: right;
-    z-index: 1;
   }
 
   .item {
+    flex: 1;
     line-height: var(--navbar-height);
     height: var(--navbar-height);
+    overflow: hidden;
     display: flex;
+    flex-wrap: wrap;
+
+    &.right {
+      justify-content: flex-end;
+      text-align: right;
+    }
   }
 
   .spacer {
-    min-width: 1em;
+    width: 1em;
   }
 }
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 8c7f589b6..a75f8506d 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -32,50 +32,48 @@
         >
       </router-link>
       <div class="item right actions">
-        <SearchBar
+        <search-bar
           v-if="currentUser || !privateMode"
           @toggled="onSearchBarToggled"
           @click.stop
         />
-        <template v-if="searchBarHidden">
-          <button
-            class="button-unstyled nav-icon"
-            :title="$t('nav.preferences')"
-            @click.stop="openSettingsModal('user')"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="cog"
-            />
-          </button>
-          <button
-            v-if="currentUser && currentUser.role === 'admin'"
-            class="button-unstyled nav-icon"
-            target="_blank"
-            :title="$t('nav.administration')"
-            @click.stop="openSettingsModal('admin')"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="tachometer-alt"
-            />
-          </button>
-          <span class="spacer" />
-          <button
-            v-if="currentUser"
-            class="button-unstyled nav-icon"
-            :title="$t('login.logout')"
-            @click.stop.prevent="logout"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="sign-out-alt"
-            />
-          </button>
-        </template>
+        <button
+          class="button-unstyled nav-icon"
+          :title="$t('nav.preferences')"
+          @click.stop="openSettingsModal('user')"
+        >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="cog"
+          />
+        </button>
+        <button
+          v-if="currentUser && currentUser.role === 'admin'"
+          class="button-unstyled nav-icon"
+          target="_blank"
+          :title="$t('nav.administration')"
+          @click.stop="openSettingsModal('admin')"
+        >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="tachometer-alt"
+          />
+        </button>
+        <span class="spacer" />
+        <button
+          v-if="currentUser"
+          class="button-unstyled nav-icon"
+          :title="$t('login.logout')"
+          @click.stop.prevent="logout"
+        >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="sign-out-alt"
+          />
+        </button>
       </div>
     </div>
     <teleport to="#modal">
diff --git a/src/components/drafts/drafts.js b/src/components/drafts/drafts.js
index 0fdd962fc..8acde3c17 100644
--- a/src/components/drafts/drafts.js
+++ b/src/components/drafts/drafts.js
@@ -1,39 +1,16 @@
 import Draft from 'src/components/draft/draft.vue'
 import List from 'src/components/list/list.vue'
-import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
 
 const Drafts = {
   components: {
     Draft,
     List,
-    ConfirmModal,
-  },
-  data() {
-    return {
-      showingConfirmDialog: false
-    }
   },
   computed: {
     drafts() {
       return this.$store.getters.draftsArray
     },
   },
-  methods: {
-    abandonAll() {
-      this.showingConfirmDialog = true
-    },
-    doAbandonAll() {
-      this.drafts.forEach((draft) => {
-        this.$store.dispatch('abandonDraft', { id: draft.id }).then(() => {
-          this.hideConfirmDialog()
-        })
-      })
-      this.hideConfirmDialog()
-    },
-    hideConfirmDialog() {
-      this.showingConfirmDialog = false
-    },
-  }
 }
 
 export default Drafts
diff --git a/src/components/drafts/drafts.vue b/src/components/drafts/drafts.vue
index 3a22969e1..1cce255da 100644
--- a/src/components/drafts/drafts.vue
+++ b/src/components/drafts/drafts.vue
@@ -13,66 +13,36 @@
         >
           {{ $t('drafts.no_drafts') }}
         </div>
-        <template v-else>
-          <List
-            :items="drafts"
-            :non-interactive="true"
-          >
-            <template #item="{ item: draft }">
-              <Draft
-                class="draft"
-                :draft="draft"
-              />
-            </template>
-          </List>
-          <div class="remove-all">
-            <button
-              class="btn -danger button-default"
-              @click="abandonAll"
-            >
-              {{ $t('drafts.clean_drafts') }}
-            </button>
-          </div>
-        </template>
+        <List
+          v-else
+          :items="drafts"
+          :non-interactive="true"
+        >
+          <template #item="{ item: draft }">
+            <Draft
+              class="draft"
+              :draft="draft"
+            />
+          </template>
+        </List>
       </div>
     </div>
-    <teleport to="#modal">
-      <confirm-modal
-        v-if="showingConfirmDialog"
-        :confirm-danger="true"
-        :title="$t('drafts.abandon_confirm_title')"
-        :confirm-text="$t('drafts.abandon_confirm_accept_button')"
-        :cancel-text="$t('drafts.abandon_confirm_cancel_button')"
-        @accepted="doAbandonAll"
-        @cancelled="hideConfirmDialog"
-      >
-        {{ $t('drafts.abandon_all_confirm') }}
-      </confirm-modal>
-    </teleport>
   </div>
 </template>
 
 <script src="./drafts.js"></script>
 
 <style lang="scss">
-.Drafts {
-  .draft {
-    margin: 1em 0;
-  }
+.draft {
+  margin: 1em 0;
+}
 
-  .remove-all {
-    margin: 1em;
-    display: flex;
-    justify-content: center;
-  }
-
-  .empty-drafs-list-alert {
-    padding: 3em;
-    font-size: 1.2em;
-    display: flex;
-    justify-content: center;
-    color: var(--textFaint);
-  }
+.empty-drafs-list-alert {
+  padding: 3em;
+  font-size: 1.2em;
+  display: flex;
+  justify-content: center;
+  color: var(--textFaint);
 }
 
 </style>
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index 7dcfc356d..0e2e982d0 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -90,10 +90,10 @@
   }
 
   .reply-or-quote-selector {
+    flex-wrap: wrap;
     margin-bottom: 0.5em;
-    gap: 0 1em;
+    gap: 1em;
     display: flex;
-    flex-wrap: wrap-reverse;
     grid-template-columns: 1fr 1fr;
   }
 
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 966d7b48d..a82ffef24 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -112,13 +112,6 @@
             role="radiogroup"
             class="reply-or-quote-selector"
           >
-            <Checkbox
-              v-model="quoteThreadToggled"
-              :radio="true"
-              :disabled="quoteFormVisible"
-            >
-              {{ $t('post_status.quote_option') }}
-            </Checkbox>
             <Checkbox
               role="radio"
               :radio="true"
@@ -127,6 +120,13 @@
             >
               {{ $t('post_status.reply_option') }}
             </Checkbox>
+            <Checkbox
+              v-model="quoteThreadToggled"
+              :radio="true"
+              :disabled="quoteFormVisible"
+            >
+              {{ $t('post_status.quote_option') }}
+            </Checkbox>
           </div>
         </div>
         <div
diff --git a/src/components/search_bar/search_bar.vue b/src/components/search_bar/search_bar.vue
index 9a9c971fb..d06b4e77d 100644
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@@ -51,6 +51,8 @@
           class="cancel-icon fa-scale-110 fa-old-padding"
         />
       </button>
+      <span class="spacer" />
+      <span class="spacer" />
     </template>
   </div>
 </template>
@@ -59,14 +61,18 @@
 
 <style lang="scss">
 .SearchBar {
-  display: flex;
+  display: inline-flex;
   align-items: baseline;
   vertical-align: baseline;
   justify-content: flex-end;
 
+  &.-expanded {
+    width: 100%;
+  }
+
   .search-bar-input,
   .search-button {
-    height: 2em;
+    height: 29px;
   }
 
   .search-bar-input {
diff --git a/src/components/status_action_buttons/action_button.scss b/src/components/status_action_buttons/action_button.scss
index 7b7f8acda..522494cee 100644
--- a/src/components/status_action_buttons/action_button.scss
+++ b/src/components/status_action_buttons/action_button.scss
@@ -31,7 +31,6 @@
     align-self: stretch;
     width: 1px;
     background-color: var(--icon);
-    opacity: 0.75;
     margin: 0.5em 0;
   }
 
@@ -85,7 +84,7 @@
   &.-with-extra {
     .action-button-inner,
     .extra-button {
-      padding-left: 0.25em;
+      padding-left: 0.2em;
       padding-right: 0.25em;
     }
   }
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b15f4dbe9..9eae42456 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1884,7 +1884,6 @@
   "drafts": {
     "drafts": "Drafts",
     "no_drafts": "You have no drafts",
-    "clean_drafts": "Remove all drafts",
     "empty": "(No content)",
     "poll_tooltip": "Draft contains a poll",
     "continue": "Continue composing",
@@ -1894,7 +1893,6 @@
     "abandon_confirm": "Do you really want to abandon this draft?",
     "abandon_confirm_accept_button": "Abandon",
     "abandon_confirm_cancel_button": "Keep",
-    "abandon_all_confirm": "Do you really want to abandon all drafts?",
     "replying": "Replying to {statusLink}",
     "editing": "Editing {statusLink}",
     "unavailable": "(unavailable)"
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 7babbaf32..533972a13 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -499,12 +499,7 @@ export const init = ({
             }),
           )
           const lastVariantRule = variantRules[variantRules.length - 1]
-          const lastVariantSelector = ruleToSelector(
-            lastVariantRule,
-            true,
-          )
-
-          if (lastVariantRule && lastVariantSelector !== selector) {
+          if (lastVariantRule) {
             inheritRule = lastVariantRule
           } else {
             const normalRules = ruleset.filter(