diff --git a/res/css/structures/_MyGroups.scss b/res/css/structures/_MyGroups.scss
index b3a5c4f473..4428eadc48 100644
--- a/res/css/structures/_MyGroups.scss
+++ b/res/css/structures/_MyGroups.scss
@@ -49,11 +49,11 @@ limitations under the License.
     height: 40px;
     width: 40px;
     border-radius: 20px;
-    background-color: $roomheader-addroom-color;
+    background-color: $roomheader-addroom-bg-color;
     position: relative;
 
     &:before {
-        background-color: $accent-fg-color;
+        background-color: $roomheader-addroom-fg-color;
         mask: url('$(res)/img/icons-create-room.svg');
         mask-repeat: no-repeat;
         mask-position: center;
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index f76df1f683..235e636c35 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -83,15 +83,24 @@ limitations under the License.
 }
 
 .mx_RoomSubList_addRoom {
-    background-color: $roomheader-addroom-color;
-    color: $roomsublist-background;
-    background-image: url('$(res)/img/icons-room-add.svg');
-    background-repeat: no-repeat;
-    background-position: center;
+    background-color: $roomheader-addroom-bg-color;
     border-radius: 10px; // 16/2 + 2 padding
     height: 16px;
     flex: 0 0 16px;
-    background-clip: content-box;
+    position: relative;
+
+    &:before {
+        background-color: $roomheader-addroom-fg-color;
+        mask: url('$(res)/img/icons-room-add.svg');
+        mask-repeat: no-repeat;
+        mask-position: center;
+        content: '';
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+    }
 }
 
 .mx_RoomSubList_badgeHighlight {
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 6f32157c48..535e43e93e 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -82,7 +82,8 @@ $settings-subsection-fg-color: $text-secondary-color;
 
 $topleftmenu-color: $text-primary-color;
 $roomheader-color: $text-primary-color;
-$roomheader-addroom-color: $header-panel-text-primary-color;
+$roomheader-addroom-bg-color: #3c4556; // $search-placeholder-color at 0.5 opacity
+$roomheader-addroom-fg-color: $text-primary-color;
 $tagpanel-button-color: $header-panel-text-primary-color;
 $roomheader-button-color: $header-panel-text-primary-color;
 $groupheader-button-color: $header-panel-text-primary-color;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 7bd84d6191..0eb136e5d9 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -145,7 +145,8 @@ $rte-group-pill-color: #aaa;
 
 $topleftmenu-color: #212121;
 $roomheader-color: #45474a;
-$roomheader-addroom-color: #91A1C0;
+$roomheader-addroom-bg-color: #91A1C0;
+$roomheader-addroom-fg-color: $accent-fg-color;
 $tagpanel-button-color: #91A1C0;
 $roomheader-button-color: #91A1C0;
 $groupheader-button-color: #91A1C0;