diff --git a/ui/components/app/advanced-gas-controls/index.scss b/ui/components/app/advanced-gas-controls/index.scss
index 42e390f66..e7b41ba31 100644
--- a/ui/components/app/advanced-gas-controls/index.scss
+++ b/ui/components/app/advanced-gas-controls/index.scss
@@ -8,10 +8,10 @@
   }
 
   .form-field__row--error .form-field__heading-title h6 {
-    color: var(--error-1);
+    color: var(--color-error-default);
 
     & path {
-      fill: var(--error-1);
+      fill: var(--color-error-default);
     }
   }
 
@@ -21,6 +21,6 @@
   }
 
   path {
-    fill: var(--ui-3);
+    fill: var(--color-icon-muted);
   }
 }
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss
index 90c37de2b..1d7180432 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/index.scss
@@ -1,5 +1,5 @@
 .advanced-gas-fee-defaults {
-  border-top: 1px solid var(--ui-grey);
+  border-top: 1px solid var(--color-border-muted);
   padding-top: 16px;
 
   & &__checkbox {
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss
index 27db64b06..91b978972 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/index.scss
@@ -2,7 +2,7 @@
   display: flex;
   align-items: center;
   white-space: nowrap;
-  border-top: 1px solid var(--ui-grey);
+  border-top: 1px solid var(--color-border-muted);
   padding-top: 16px;
 
   > * {
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
index c78f2c999..40240d88e 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
@@ -1,6 +1,6 @@
 .advanced-gas-fee-input-subtext {
   margin-top: 2px;
-  color: var(--ui-4);
+  color: var(--color-text-alternative);
   font-size: $font-size-h8;
 
   &__label {
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss
index 5d212fd90..f01cea236 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.scss
@@ -1,4 +1,4 @@
 .priority-fee-input {
-  border-top: 1px solid var(--ui-grey);
+  border-top: 1px solid var(--color-border-default);
   padding-top: 16px;
 }
diff --git a/ui/components/app/advanced-gas-fee-popover/index.scss b/ui/components/app/advanced-gas-fee-popover/index.scss
index 4aab51f56..d8cce779a 100644
--- a/ui/components/app/advanced-gas-fee-popover/index.scss
+++ b/ui/components/app/advanced-gas-fee-popover/index.scss
@@ -7,7 +7,7 @@
     border-radius: 0;
     border-top-left-radius: 10px;
     border-top-right-radius: 10px;
-    border-bottom: 1px solid var(--ui-grey);
+    border-bottom: 1px solid var(--color-border-muted);
   }
 
   .popover-footer {