diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index c7c0d6fac4..7e5ab7cdbd 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -95,15 +95,7 @@ limitations under the License.
     mask-position: center;
 }
 
-.mx_RightPanel_headerButton_highlight {
-    background: rgba($accent-color, 0.25);
-    // make the icon the accent color too
-    &::before {
-        background-color: $accent-color !important;
-    }
-}
-
-.mx_RightPanel_headerButton:not(.mx_RightPanel_headerButton_highlight) {
+.mx_RightPanel_headerButton {
     &:hover {
         background: rgba($accent-color, 0.1);
 
@@ -113,6 +105,12 @@ limitations under the License.
     }
 }
 
+.mx_RightPanel_headerButton_highlight {
+    &::before {
+        background-color: $accent-color !important;
+    }
+}
+
 .mx_RightPanel_headerButton_badge {
     font-size: $font-8px;
     border-radius: 8px;
diff --git a/res/css/structures/_UserMenu.scss b/res/css/structures/_UserMenu.scss
index 6fa2f2578e..fecac40e4e 100644
--- a/res/css/structures/_UserMenu.scss
+++ b/res/css/structures/_UserMenu.scss
@@ -15,7 +15,6 @@ limitations under the License.
 */
 
 .mx_UserMenu {
-
     // to make the menu button sort of aligned with the explore button below
     padding-right: 6px;
 
@@ -59,7 +58,7 @@ limitations under the License.
             mask-position: center;
             mask-size: contain;
             mask-repeat: no-repeat;
-            background: $primary-fg-color;
+            background: $tertiary-fg-color;
             mask-image: url('$(res)/img/feather-customised/chevron-down.svg');
         }
     }