diff --git a/res/css/structures/_GroupView.scss b/res/css/structures/_GroupView.scss
index ae86f68fd0..4ec53a3c9a 100644
--- a/res/css/structures/_GroupView.scss
+++ b/res/css/structures/_GroupView.scss
@@ -44,21 +44,29 @@ limitations under the License.
 }
 
 .mx_GroupHeader_button {
+    position: relative;
     margin-left: 5px;
     margin-right: 5px;
     cursor: pointer;
     height: 20px;
     width: 20px;
-    background-color: $groupheader-button-color;
-    mask-repeat: no-repeat;
-    mask-size: contain;
+
+    &::before {
+        content: '';
+        position: absolute;
+        height: 20px;
+        width: 20px;
+        background-color: $groupheader-button-color;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+    }
 }
 
-.mx_GroupHeader_editButton {
+.mx_GroupHeader_editButton::before {
     mask-image: url('$(res)/img/icons-settings-room.svg');
 }
 
-.mx_GroupHeader_shareButton {
+.mx_GroupHeader_shareButton::before {
     mask-image: url('$(res)/img/icons-share.svg');
 }
 
diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss
index c63db5d274..973f6fe9b3 100644
--- a/res/css/structures/_RightPanel.scss
+++ b/res/css/structures/_RightPanel.scss
@@ -50,18 +50,18 @@ limitations under the License.
     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;
+    &::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::before {
diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss
index 5b4a9b764b..e9f33183f5 100644
--- a/res/css/views/rooms/_MessageComposer.scss
+++ b/res/css/views/rooms/_MessageComposer.scss
@@ -180,34 +180,42 @@ limitations under the License.
 }
 
 .mx_MessageComposer_button {
+    position: relative;
     margin-right: 12px;
     cursor: pointer;
-    padding-top: 4px;
     height: 20px;
     width: 20px;
-    background-color: $composer-button-color;
-    mask-repeat: no-repeat;
-    mask-size: contain;
-    mask-position: center;
+
+    &::before {
+        content: '';
+        position: absolute;
+
+        height: 20px;
+        width: 20px;
+        background-color: $composer-button-color;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+        mask-position: center;
+    }
 }
 
-.mx_MessageComposer_upload {
+.mx_MessageComposer_upload::before {
     mask-image: url('$(res)/img/feather-customised/paperclip.svg');
 }
 
-.mx_MessageComposer_hangup {
+.mx_MessageComposer_hangup::before {
     mask-image: url('$(res)/img/hangup.svg');
 }
 
-.mx_MessageComposer_voicecall {
+.mx_MessageComposer_voicecall::before {
     mask-image: url('$(res)/img/feather-customised/phone.svg');
 }
 
-.mx_MessageComposer_videocall {
+.mx_MessageComposer_videocall::before {
     mask-image: url('$(res)/img/feather-customised/video.svg');
 }
 
-.mx_MessageComposer_stickers {
+.mx_MessageComposer_stickers::before {
     mask-image: url('$(res)/img/feather-customised/face.svg');
 }
 
diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss
index 2ee991cac7..5da8ff76b9 100644
--- a/res/css/views/rooms/_RoomHeader.scss
+++ b/res/css/views/rooms/_RoomHeader.scss
@@ -192,33 +192,41 @@ limitations under the License.
 }
 
 .mx_RoomHeader_button {
+    position: relative;
     margin-left: 10px;
     cursor: pointer;
     height: 20px;
     width: 20px;
-    background-color: $roomheader-button-color;
-    mask-repeat: no-repeat;
-    mask-size: contain;
+
+    &::before {
+        content: '';
+        position: absolute;
+        height: 20px;
+        width: 20px;
+        background-color: $roomheader-button-color;
+        mask-repeat: no-repeat;
+        mask-size: contain;
+    }
 }
 
-.mx_RoomHeader_settingsButton {
+.mx_RoomHeader_settingsButton::before {
     mask-image: url('$(res)/img/feather-customised/settings.svg');
 }
 
-.mx_RoomHeader_forgetButton {
+.mx_RoomHeader_forgetButton::before {
     mask-image: url('$(res)/img/leave.svg');
     width: 26px;
 }
 
-.mx_RoomHeader_searchButton {
+.mx_RoomHeader_searchButton::before {
     mask-image: url('$(res)/img/feather-customised/search.svg');
 }
 
-.mx_RoomHeader_shareButton {
+.mx_RoomHeader_shareButton::before {
     mask-image: url('$(res)/img/feather-customised/share.svg');
 }
 
-.mx_RoomHeader_manageIntegsButton {
+.mx_RoomHeader_manageIntegsButton::before {
     mask-image: url('$(res)/img/feather-customised/grid.svg');
 }
 
@@ -234,8 +242,7 @@ limitations under the License.
     margin-top: 18px;
 }
 
-.mx_RoomHeader_pinnedButton {
-    position: relative;
+.mx_RoomHeader_pinnedButton::before {
     mask-image: url('$(res)/img/icons-pin.svg');
 }