diff --git a/app/javascript/styles/mastodon-light/variables.scss b/app/javascript/styles/mastodon-light/variables.scss
index 58ef93961d9..656a5d9f598 100644
--- a/app/javascript/styles/mastodon-light/variables.scss
+++ b/app/javascript/styles/mastodon-light/variables.scss
@@ -12,6 +12,5 @@ $grey-600: hsl(240deg, 8%, 33%); // Trout
 @use '../mastodon/variables' with (
   $ui-base-color: hsl(255deg, 25%, 88%),
   $ui-base-lighter-color: hsl(250deg, 24%, 75%),
-  $ui-secondary-color: hsl(240deg, 16%, 19%),
   $emojis-requiring-inversion: 'chains'
 );
diff --git a/app/javascript/styles/mastodon/_variables.scss b/app/javascript/styles/mastodon/_variables.scss
index 2726447f16d..a616afaad76 100644
--- a/app/javascript/styles/mastodon/_variables.scss
+++ b/app/javascript/styles/mastodon/_variables.scss
@@ -19,7 +19,6 @@ $ui-base-lighter-color: lighten(
   $ui-base-color,
   26%
 ) !default; // Lighter darkest
-$ui-secondary-color: hsl(255deg, 25%, 88%) !default; // Lightest
 
 // Keep this filter a SCSS variable rather than
 // a CSS Custom Property due to this Safari bug:
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 116bf6dc186..c5cf61f68fc 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -330,7 +330,7 @@
     color: var(--clr-text-secondary);
 
     a {
-      color: $ui-secondary-color;
+      color: var(--clr-text-primary);
       text-decoration: none;
 
       &:hover,
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e04fd8b77d0..99832d3dc47 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -6746,8 +6746,7 @@ a.status-card {
   }
 
   .dialog-option .poll__input {
-    border-color: var(--clr-text-secondary);
-    color: $ui-secondary-color;
+    color: var(--clr-text-secondary);
     display: inline-flex;
     align-items: center;
     justify-content: center;
@@ -6765,8 +6764,9 @@ a.status-card {
     }
 
     &.active {
-      border-color: var(--clr-text-success);
-      background: var(--clr-text-success);
+      color: var(--clr-text-on-success-strong);
+      background: var(--clr-bg-success-strong);
+      border-color: var(--clr-bg-success-strong);
     }
   }
 
@@ -6970,7 +6970,7 @@ a.status-card {
     hr {
       height: 0.25rem;
       padding: 0;
-      background-color: $ui-secondary-color;
+      background-color: var(--clr-text-primary);
       border: 0;
       margin: 20px 0;
     }
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 7e0f6b4dbec..121a60eb94d 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -930,7 +930,7 @@ code {
 
 .oauth-prompt {
   h3 {
-    color: $ui-secondary-color;
+    color: var(--clr-text-primary);
     font-size: 17px;
     line-height: 22px;
     font-weight: 500;
@@ -1152,8 +1152,8 @@ code {
 .permissions-list {
   &__item {
     padding: 15px;
-    color: $ui-secondary-color;
-    border-bottom: 1px solid lighten($ui-base-color, 4%);
+    color: var(--clr-text-primary);
+    border-bottom: 1px solid var(--clr-border-primary);
     display: flex;
     align-items: center;