diff --git a/res/css/structures/auth/_CompleteSecurity.scss b/res/css/structures/auth/_CompleteSecurity.scss
index 566507211c..2c45069cfe 100644
--- a/res/css/structures/auth/_CompleteSecurity.scss
+++ b/res/css/structures/auth/_CompleteSecurity.scss
@@ -51,7 +51,7 @@ limitations under the License.
 }
 
 .mx_CompleteSecurity_waiting {
-    color: $notice-secondary-color;
+    color: $tertiary-content;
 }
 
 .mx_CompleteSecurity_actionRow {
diff --git a/res/css/views/dialogs/_NewSessionReviewDialog.scss b/res/css/views/dialogs/_NewSessionReviewDialog.scss
index b35c570c80..0016b5b91b 100644
--- a/res/css/views/dialogs/_NewSessionReviewDialog.scss
+++ b/res/css/views/dialogs/_NewSessionReviewDialog.scss
@@ -33,5 +33,5 @@ limitations under the License.
 
 .mx_NewSessionReviewDialog_deviceID {
     font-size: $font-12px;
-    color: $notice-secondary-color;
+    color: $tertiary-content;
 }
diff --git a/res/css/views/messages/_common_CryptoEvent.scss b/res/css/views/messages/_common_CryptoEvent.scss
index afaed50fa4..b400a933ae 100644
--- a/res/css/views/messages/_common_CryptoEvent.scss
+++ b/res/css/views/messages/_common_CryptoEvent.scss
@@ -56,7 +56,7 @@ limitations under the License.
         padding: 10px 20px;
         margin: auto 0;
         text-align: center;
-        color: $notice-secondary-color;
+        color: $tertiary-content;
         overflow-wrap: break-word;
         font-size: $font-12px;
     }
diff --git a/res/css/views/right_panel/_UserInfo.scss b/res/css/views/right_panel/_UserInfo.scss
index edc82cfdbf..9a09d96bc9 100644
--- a/res/css/views/right_panel/_UserInfo.scss
+++ b/res/css/views/right_panel/_UserInfo.scss
@@ -122,7 +122,7 @@ limitations under the License.
 
     h3 {
         text-transform: uppercase;
-        color: $notice-secondary-color;
+        color: $tertiary-content;
         font-weight: 600;
         font-size: $font-12px;
         margin: 4px 0;
diff --git a/res/css/views/rooms/_EntityTile.scss b/res/css/views/rooms/_EntityTile.scss
index a2ebd6c11b..23a5ffc99f 100644
--- a/res/css/views/rooms/_EntityTile.scss
+++ b/res/css/views/rooms/_EntityTile.scss
@@ -122,7 +122,7 @@ limitations under the License.
 .mx_EntityTile_power {
     padding-inline-start: 6px;
     font-size: $font-10px;
-    color: $notice-secondary-color;
+    color: $tertiary-content;
     max-width: 6em;
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index dbfa53a729..b0c1474c25 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -130,8 +130,6 @@ $roomtile-default-badge-bg-color: #61708b;
 
 // ********************
 
-$notice-secondary-color: $tertiary-content;
-
 $panel-divider-color: transparent;
 
 $widget-menu-bar-bg-color: $header-panel-bg-color;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 4b8a9abc16..f3c9f7229f 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -18,7 +18,6 @@ $accent-color: #03b381;
 $accent-bg-color: rgba(3, 179, 129, 0.16);
 $notice-primary-color: #ff4b55;
 $notice-primary-bg-color: rgba(255, 75, 85, 0.16);
-$notice-secondary-color: #61708b;
 $header-panel-bg-color: #f3f8fd;
 
 // typical text (dark-on-white in light skin)
@@ -55,7 +54,7 @@ $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
 // pinned events indicator
 $pinned-unread-color: $notice-primary-color;
-$pinned-color: $notice-secondary-color;
+$pinned-color: $tertiary-content;
 
 // informational plinth
 $info-plinth-bg-color: #f7f7f7;
diff --git a/res/themes/light-custom/css/_custom.scss b/res/themes/light-custom/css/_custom.scss
index f34e1d1191..2fbb91c523 100644
--- a/res/themes/light-custom/css/_custom.scss
+++ b/res/themes/light-custom/css/_custom.scss
@@ -113,7 +113,6 @@ $primary-hairline-color: var(--roomlist-separator-color);// originally #e5e5e5,
 // --timeline-text-secondary-color
 $authpage-secondary-color: var(--timeline-text-secondary-color);
 $memberstatus-placeholder-color: var(--timeline-text-secondary-color);
-$notice-secondary-color: var(--timeline-text-secondary-color);
 $pinned-color: var(--timeline-text-secondary-color);
 $settings-subsection-fg-color: var(--timeline-text-secondary-color);
 $roomheader-addroom-bg-color: var(--timeline-text-secondary-color);
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index d3b56a47b3..a628600569 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -205,13 +205,11 @@ $username-variant6-color: #2dc2c5;
 $username-variant7-color: #5c56f5;
 $username-variant8-color: #74d12c;
 
-$notice-secondary-color: $tertiary-content;
-
 $panel-divider-color: transparent;
 
 // pinned events indicator
 $pinned-unread-color: $notice-primary-color;
-$pinned-color: $notice-secondary-color;
+$pinned-color: $tertiary-content;
 
 // ********************