diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index 895382d714..474040a626 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -49,33 +49,49 @@ limitations under the License.
     border-bottom: 2px solid transparent;
     height: 20px;
     width: 20px;
+    position: relative;
+}
+
+.mx_RightPanel_headerButton::before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 20px;
+    width: 20px;
     background-color: $rightpanel-button-color;
     mask-repeat: no-repeat;
     mask-size: contain;
 }
 
-.mx_RightPanel_membersButton {
+.mx_RightPanel_membersButton::before {
     mask-image: url('$(res)/img/feather-icons/user.svg');
 }
 
-.mx_RightPanel_filesButton {
+.mx_RightPanel_filesButton::before {
     mask-image: url('$(res)/img/feather-icons/files.svg');
 }
 
-.mx_RightPanel_notifsButton {
+.mx_RightPanel_notifsButton::before {
     mask-image: url('$(res)/img/feather-icons/notifications.svg');
 }
 
-.mx_RightPanel_groupMembersButton {
+.mx_RightPanel_groupMembersButton::before {
     mask-image: url('$(res)/img/icons-people.svg');
 }
 
-.mx_RightPanel_roomsButton {
+.mx_RightPanel_roomsButton::before {
     mask-image: url('$(res)/img/icons-room-nobg.svg');
 }
 
-.mx_RightPanel_headerButton_highlight {
-    border-color: $button-bg-color;
+.mx_RightPanel_headerButton_highlight::after {
+    content: '';
+    position: absolute;
+    bottom: -6px;
+    left: 0;
+    right: 0;
+    height: 2px;
+    background-color: $button-bg-color;
 }
 
 .mx_RightPanel_headerButton_badge {