diff --git a/app/javascript/styles/fairy-floss/diff.scss b/app/javascript/styles/fairy-floss/diff.scss
index 663453efc..8d9f1a178 100644
--- a/app/javascript/styles/fairy-floss/diff.scss
+++ b/app/javascript/styles/fairy-floss/diff.scss
@@ -168,6 +168,20 @@ body.admin {
   background: $purple5;
 }
 
+.column-header__back-button,
+.column-header__button,
+.column-header__button.active,
+.column-header__button.active {
+  background: $purple5;
+
+  &:hover,
+  &:active,
+  &:focus {
+    color: $ui-highlight-color;
+    background: lighten($purple5, 4%);
+  }
+}
+
 .notification__filter-bar button.active::after,
 .notification__filter-bar a.active::after,
 .account__section-headline button.active::after,
@@ -193,10 +207,6 @@ body.admin {
   background: $purple2;
 }
 
-.column-link {
-  background: $purple3;
-}
-
 // link previews
 
 .status-card.compact {
@@ -475,10 +485,6 @@ a.mention,
   color: $purple4;
 }
 
-.admin-wrapper .sidebar-wrapper {
-  background: $purple2;
-}
-
 .admin-wrapper .sidebar ul .simple-navigation-active-leaf a {
   background: $purpleborder;
 
@@ -616,3 +622,10 @@ a.mention,
 .tabs-bar__wrapper {
   background: $purple1;
 }
+
+.navigation-panel,
+.compose-panel {
+  hr {
+    border-top: 1px solid $purple3;
+  }
+}
diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index f714456cf..26311c6c9 100644
--- a/app/javascript/styles/macaron/diff.scss
+++ b/app/javascript/styles/macaron/diff.scss
@@ -85,6 +85,7 @@ html {
 .column-header__button.active,
 .column-header__button.active {
   color: $ui-highlight-color;
+  background: $purple;
 
   &:hover,
   &:active,