diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss
index 505d6c348f..78e8326772 100644
--- a/res/css/structures/_TagPanel.scss
+++ b/res/css/structures/_TagPanel.scss
@@ -157,7 +157,7 @@ limitations under the License.
     font-weight: 600;
     font-size: $font-14px;
     padding: 0 5px;
-    background-color: $roomtile-name-color;
+    background-color: $muted-fg-color;
 }
 
 .mx_TagTile_badgeHighlight {
diff --git a/res/css/views/rooms/_JumpToBottomButton.scss b/res/css/views/rooms/_JumpToBottomButton.scss
index 23018df8da..ba6814a7c3 100644
--- a/res/css/views/rooms/_JumpToBottomButton.scss
+++ b/res/css/views/rooms/_JumpToBottomButton.scss
@@ -42,7 +42,7 @@ limitations under the License.
     display: inline-block;
     padding: 0 4px;
     color: $roomtile-badge-fg-color;
-    background-color: $roomtile-name-color;
+    background-color: $muted-fg-color;
 }
 
 .mx_JumpToBottomButton_highlight .mx_JumpToBottomButton_badge {
@@ -56,7 +56,7 @@ limitations under the License.
     border-radius: 19px;
     box-sizing: border-box;
     background: $primary-bg-color;
-    border: 1.3px solid $roomtile-name-color;
+    border: 1.3px solid $muted-fg-color;
     cursor: pointer;
 }
 
@@ -70,5 +70,5 @@ limitations under the License.
     mask: url('$(res)/img/icon-jump-to-bottom.svg');
     mask-repeat: no-repeat;
     mask-position: 9px 14px;
-    background: $roomtile-name-color;
+    background: $muted-fg-color;
 }
diff --git a/res/css/views/rooms/_TopUnreadMessagesBar.scss b/res/css/views/rooms/_TopUnreadMessagesBar.scss
index 28eddf1fa2..c0545660c2 100644
--- a/res/css/views/rooms/_TopUnreadMessagesBar.scss
+++ b/res/css/views/rooms/_TopUnreadMessagesBar.scss
@@ -42,7 +42,7 @@ limitations under the License.
     border-radius: 19px;
     box-sizing: border-box;
     background: $primary-bg-color;
-    border: 1.3px solid $roomtile-name-color;
+    border: 1.3px solid $muted-fg-color;
     cursor: pointer;
 }
 
@@ -54,7 +54,7 @@ limitations under the License.
     mask-image: url('$(res)/img/icon-jump-to-first-unread.svg');
     mask-repeat: no-repeat;
     mask-position: 9px 13px;
-    background: $roomtile-name-color;
+    background: $muted-fg-color;
 }
 
 .mx_TopUnreadMessagesBar_markAsRead {
@@ -62,7 +62,7 @@ limitations under the License.
     width: 18px;
     height: 18px;
     background: $primary-bg-color;
-    border: 1.3px solid $roomtile-name-color;
+    border: 1.3px solid $muted-fg-color;
     border-radius: 10px;
     margin: 5px auto;
 }
@@ -76,5 +76,5 @@ limitations under the License.
     mask-repeat: no-repeat;
     mask-size: 10px;
     mask-position: 4px 4px;
-    background: $roomtile-name-color;
+    background: $muted-fg-color;
 }
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 58c313a196..a37ba3f79c 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -127,7 +127,6 @@ $roomtile2-selected-bg-color: rgba(141, 151, 165, 0.2);
 
 $notice-secondary-color: $roomlist-header-color;
 
-$roomtile-name-color: $header-panel-text-primary-color;
 $roomtile-selected-color: $text-primary-color;
 $roomtile-notified-color: $text-primary-color;
 $roomtile-selected-bg-color: $room-highlight-color;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 9a7918f1f8..3be53a5afb 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -123,7 +123,6 @@ $roomtile2-selected-bg-color: #1A1D23;
 
 // ********************
 
-$roomtile-name-color: $header-panel-text-primary-color;
 $roomtile-selected-color: $text-primary-color;
 $roomtile-notified-color: $text-primary-color;
 $roomtile-selected-bg-color: $room-highlight-color;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index a6507332af..5499c87588 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -194,7 +194,6 @@ $presence-offline: #e3e8f0;
 
 // ********************
 
-$roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
 $roomtile-selected-color: #212121;
 $roomtile-notified-color: #212121;
@@ -213,7 +212,7 @@ $username-variant8-color: #74d12c;
 $roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
 
 $roomsublist-background: $secondary-accent-color;
-$roomsublist-label-fg-color: $roomtile-name-color;
+$roomsublist-label-fg-color: $muted-fg-color;
 $roomsublist-label-bg-color: $tertiary-accent-color;
 $roomsublist-chevron-color: $accent-color;
 
@@ -292,7 +291,7 @@ $progressbar-color: #000;
 
 $room-warning-bg-color: $yellow-background;
 
-$memberstatus-placeholder-color: $roomtile-name-color;
+$memberstatus-placeholder-color: $muted-fg-color;
 
 $authpage-bg-color: #2e3649;
 $authpage-modal-bg-color: rgba(255, 255, 255, 0.59);
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index 6611352f13..adf1482580 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -93,7 +93,6 @@ $roomtile-notified-color: var(--roomlist-text-color);
 $roomtile-selected-color: var(--roomlist-text-color);
 // --roomlist-text-secondary-color
 $roomsublist-label-fg-color: var(--roomlist-text-secondary-color);
-$roomtile-name-color: var(--roomlist-text-secondary-color);
 $roomtile2-preview-color: var(--roomlist-text-secondary-color);
 $roomlist-header-color: var(--roomlist-text-secondary-color);
 $roomtile2-default-badge-bg-color: var(--roomlist-text-secondary-color);
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index d895d592f5..ec1b3588cf 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -193,7 +193,6 @@ $presence-offline: #E3E8F0;
 
 // ********************
 
-$roomtile-name-color: #61708b;
 $roomtile-badge-fg-color: $accent-fg-color;
 $roomtile-selected-color: #212121;
 $roomtile-notified-color: #212121;
@@ -212,7 +211,7 @@ $username-variant8-color: #74d12c;
 $roomtile-transparent-focused-color: rgba(0, 0, 0, 0.1);
 
 $roomsublist-background: $secondary-accent-color;
-$roomsublist-label-fg-color: $roomtile-name-color;
+$roomsublist-label-fg-color: $muted-fg-color;
 $roomsublist-label-bg-color: $tertiary-accent-color;
 $roomsublist-chevron-color: $accent-color;
 
@@ -291,7 +290,7 @@ $progressbar-color: #000;
 
 $room-warning-bg-color: $yellow-background;
 
-$memberstatus-placeholder-color: $roomtile-name-color;
+$memberstatus-placeholder-color: $muted-fg-color;
 
 $authpage-bg-color: #2e3649;
 $authpage-modal-bg-color: rgba(245, 245, 245, 0.90);