diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index 20ed8937bc939e..31b969fd10a013 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -150,7 +150,7 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Save changes",
diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json
index 191cbaa29e04ac..2f4a4aea3c6e0d 100644
--- a/app/javascript/mastodon/locales/en.json
+++ b/app/javascript/mastodon/locales/en.json
@@ -150,7 +150,7 @@
   "compose_form.poll.remove_option": "Remove this choice",
   "compose_form.poll.switch_to_multiple": "Change poll to allow multiple choices",
   "compose_form.poll.switch_to_single": "Change poll to allow for a single choice",
-  "compose_form.publish": "Publish",
+  "compose_form.publish": "Post",
   "compose_form.publish_form": "New post",
   "compose_form.publish_loud": "{publish}!",
   "compose_form.save_changes": "Save changes",
diff --git a/app/javascript/styles/fairy-floss/diff.scss b/app/javascript/styles/fairy-floss/diff.scss
index 6501c075fca5de..306a1ca057f687 100644
--- a/app/javascript/styles/fairy-floss/diff.scss
+++ b/app/javascript/styles/fairy-floss/diff.scss
@@ -512,6 +512,17 @@ a.mention,
   background: $purpleborder;
 }
 
+.admin-wrapper .sidebar__toggle__logo a {
+  color: $lighter-text-color !important;
+}
+
+// Mobile layout
+@media screen and (max-width: $no-gap-breakpoint - 285px - 1px) {
+  .admin-wrapper .sidebar .logo {
+    display: none;
+  }
+}
+
 .admin-wrapper .content .muted-hint a {
   color: $mint;
 }
@@ -653,3 +664,8 @@ a.mention,
     color: $lighter-text-color;
   }
 }
+
+.dropdown-menu__container__header {
+  color: $lighter-text-color;
+  font-weight: 900;
+}
diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index 5a67f1bf02dee2..be4f78a512cd44 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -1218,6 +1218,10 @@ button.icon-button.disabled i.fa-retweet {
     box-sizing: border-box;
     height: 48px;
   }
+
+  .admin-wrapper .sidebar .logo {
+    display: none;
+  }
 }
 
 .rules-list {
diff --git a/app/javascript/styles/macaron/variables.scss b/app/javascript/styles/macaron/variables.scss
index 8015f222ecb729..8e78219db4bcc3 100644
--- a/app/javascript/styles/macaron/variables.scss
+++ b/app/javascript/styles/macaron/variables.scss
@@ -25,6 +25,9 @@ $ui-base-lighter-color: $cream;
 $ui-primary-color: #9bcbed;
 $ui-secondary-color: $classic-base-color !default;
 $ui-highlight-color: $blueberry;
+$ui-button-secondary-color: $bilberry;
+$ui-button-secondary-border-color: $bilberry;
+$ui-button-secondary-focus-background-color: $pink;
 
 $primary-text-color: $black !default;
 $darker-text-color: $classic-base-color !default;
@@ -35,6 +38,8 @@ $inverted-text-color: $black !default;
 $lighter-text-color: $classic-base-color !default;
 $light-text-color: #444b5d;
 
+$ui-button-secondary-focus-color: $light-text-color;
+
 // Newly added colors
 $account-background-color: $white !default;
 
diff --git a/db/schema.rb b/db/schema.rb
index 299225406655bf..fcaa2c4c5e566a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -116,7 +116,7 @@
     t.integer "min_reblogs"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.boolean "keep_local", default: false
+    t.boolean "keep_local", default: true, null: false
     t.index ["account_id"], name: "index_account_statuses_cleanup_policies_on_account_id"
   end
 
@@ -978,10 +978,10 @@
     t.bigint "account_id", null: false
     t.bigint "application_id"
     t.bigint "in_reply_to_account_id"
+    t.datetime "deleted_at", precision: nil
     t.boolean "local_only"
     t.bigint "poll_id"
     t.string "activity_pub_type"
-    t.datetime "deleted_at", precision: nil
     t.datetime "edited_at", precision: nil
     t.boolean "trendable"
     t.bigint "ordered_media_attachment_ids", array: true