diff --git a/res/css/views/messages/_ReactionsRowButton.scss b/res/css/views/messages/_ReactionsRowButton.scss
index 2f20316d84..4bbfc3ed27 100644
--- a/res/css/views/messages/_ReactionsRowButton.scss
+++ b/res/css/views/messages/_ReactionsRowButton.scss
@@ -19,7 +19,7 @@ limitations under the License.
     line-height: $font-20px;
     margin-right: 6px;
     padding: 1px 6px;
-    border: 1px solid $reaction-row-button-border-color;
+    border: 1px solid $message-action-bar-border-color;
     border-radius: 10px;
     background-color: $header-panel-bg-color;
     cursor: pointer;
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index 52135e7e84..cdb6408682 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -74,7 +74,6 @@ $menu-selected-color: $room-highlight-color;
 
 // Settings
 // ********************
-$settings-grey-fg-color: #a2a2a2;
 $settings-profile-overlay-placeholder-fg-color: #454545;
 $settings-profile-button-bg-color: #e7e7e7;
 $settings-subsection-fg-color: $text-secondary-color;
@@ -85,6 +84,7 @@ $settings-subsection-fg-color: $text-secondary-color;
 $roomheader-addroom-bg-color: rgba(92, 100, 112, 0.3);
 $roomheader-addroom-fg-color: $primary-content;
 // ********************
+
 // Rich-text-editor
 // ********************
 $rte-room-pill-color: $room-highlight-color;
@@ -147,7 +147,6 @@ $message-action-bar-hover-border-color: $header-panel-text-primary-color;
 
 // Reaction row
 // ********************
-$reaction-row-button-border-color: $message-action-bar-border-color;
 $reaction-row-button-hover-border-color: $header-panel-text-primary-color;
 $reaction-row-button-selected-bg-color: #1f6954;
 // ********************
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index 216f61d7af..73f9206f77 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -160,7 +160,6 @@ $message-action-bar-fg-color: $header-panel-text-primary-color;
 $message-action-bar-border-color: #616b7f;
 $message-action-bar-hover-border-color: $header-panel-text-primary-color;
 
-$reaction-row-button-border-color: #616b7f;
 $reaction-row-button-hover-border-color: $header-panel-text-primary-color;
 $reaction-row-button-selected-bg-color: #1f6954;
 
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 8d3a21af15..881b98a2ee 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -248,11 +248,10 @@ $message-action-bar-fg-color: $primary-fg-color;
 $message-action-bar-border-color: #e9edf1;
 $message-action-bar-hover-border-color: $focus-bg-color;
 
-$reaction-row-button-border-color: #e9edf1;
 $reaction-row-button-hover-border-color: $focus-bg-color;
 $reaction-row-button-selected-bg-color: #e9fff9;
 
-$kbd-border-color: $reaction-row-button-border-color;
+$kbd-border-color: $message-action-bar-border-color;
 
 $tooltip-timeline-bg-color: $groupFilterPanel-bg-color;
 $tooltip-timeline-fg-color: #ffffff;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index e62cf9a1ae..20fb259142 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -219,7 +219,6 @@ $message-action-bar-hover-border-color: $focus-bg-color;
 
 // Reaction row
 // ********************
-$reaction-row-button-border-color: $message-action-bar-border-color;
 $reaction-row-button-hover-border-color: $focus-bg-color;
 $reaction-row-button-selected-bg-color: #e9fff9;
 // ********************
@@ -263,7 +262,7 @@ $voipcall-plinth-color: $system;
 // One-off colors
 // ********************
 $progressbar-bg-color: $panel-actions;
-$kbd-border-color: $reaction-row-button-border-color;
+$kbd-border-color: $message-action-bar-border-color;
 $visual-bell-bg-color: #faa;
 $event-timestamp-color: #acacac;
 $slider-background-color: $togglesw-off-color;