diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 49953d3e0..64bb6f5ab 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -163,7 +163,7 @@ textarea {
       @include transparent-background(var(--color-text));
     }
     &.primary {
-      @include transparent-background($session-color-primary);
+      @include transparent-background(var(--color-dark-gray-color));
     }
     &.secondary {
       @include transparent-background($session-color-secondary);
@@ -232,7 +232,7 @@ textarea {
   border-radius: 2px;
   text-align: center;
   &.primary {
-    background-color: $session-color-primary;
+    background-color: var(--color-dark-gray-color);
   }
   &.secondary {
     background-color: $session-color-secondary;
diff --git a/stylesheets/_session_constants.scss b/stylesheets/_session_constants.scss
index 1e0e32f8c..1d3a52cbe 100644
--- a/stylesheets/_session_constants.scss
+++ b/stylesheets/_session_constants.scss
@@ -98,7 +98,6 @@ $session-shade-1: #0c0c0c;
 $session-shade-1-alt: #0f1011;
 $session-shade-2: #161616;
 $session-shade-3: #191818;
-$session-shade-4: #1b1b1b;
 $session-shade-5: #222325;
 $session-shade-6: #232323;
 $session-shade-6-alt: #2c2c2c;
@@ -108,7 +107,6 @@ $session-shade-9: #313131;
 $session-shade-10: #3e3e3e;
 $session-shade-11: #3f3f3f;
 $session-shade-12: #3f4146;
-$session-shade-13: #474646;
 $session-shade-14: #535865;
 $session-shade-15: #5b6c72;
 $session-shade-16: #979797;
@@ -122,7 +120,6 @@ $session-color-success: #35d388;
 $session-color-error: #edd422;
 $session-color-warning: var(--color-light-gray-color);
 $session-color-warning-alt: #ff9d00;
-$session-color-primary: $session-shade-13;
 $session-color-secondary: $session-shade-6;
 
 // Opacity and Shadow
diff --git a/stylesheets/_session_password.scss b/stylesheets/_session_password.scss
index e3ff8874b..565198b28 100644
--- a/stylesheets/_session_password.scss
+++ b/stylesheets/_session_password.scss
@@ -37,7 +37,7 @@
 
       .session-label {
         &.primary {
-          background-color: rgba($session-color-primary, 0.3);
+          background-color: rgba(var(--color-dark-gray-color), 0.3);
         }
         padding: var(--margins-xs) var(--margins-sm);
         text-align: center;
@@ -56,7 +56,7 @@
       min-width: 420px;
       padding: 3 * $session-margin-lg 2 * $session-margin-lg;
       box-sizing: border-box;
-      background-color: $session-shade-4;
+      background-color: var(--color-darker-gray-color);
       border: 1px solid $session-shade-8;
       border-radius: 2px;
 
diff --git a/ts/themes/SessionTheme.tsx b/ts/themes/SessionTheme.tsx
index c63a6c754..8576bc05e 100644
--- a/ts/themes/SessionTheme.tsx
+++ b/ts/themes/SessionTheme.tsx
@@ -59,7 +59,7 @@ const darkInputBackground = darkColorCellBackground;
 const darkFilterSessionText = 'none';
 const darkUnreadBorder = `4px solid ${accentDarkTheme}`;
 
-const darkScrollbarThumb = '#474646';
+const darkScrollbarThumb = darkGrayColor;
 const darkScrollbarTrack = '#1b1b1b';
 const darkFakeChatBubbleBg = '#212121';
 
@@ -71,7 +71,7 @@ const darkConversationList = '#1b1b1b';
 
 const darkTextHighlight = `${white}88`;
 const darkForegroundPrimary = white;
-const darkBackgroundPrimary = '#474646';
+const darkBackgroundPrimary = darkGrayColor;
 const darkButtonGreen = accentDarkTheme;
 const darkModalBackground = '#101011';
 
@@ -206,7 +206,7 @@ const lightInputBackground = '#efefef';
 const lightFilterSessionText = 'brightness(0) saturate(100%)';
 const lightUnreadBorder = `4px solid ${accentLightTheme}`;
 
-const lightScrollbarThumb = '#474646';
+const lightScrollbarThumb = darkGrayColor;
 const lightScrollbarTrack = '#fcfcfc';
 const lightFakeChatBubbleBg = '#f5f5f5';