diff --git a/frontend/src/app/main/ui/workspace/tokens/common.scss b/frontend/src/app/main/ui/workspace/tokens/common.scss
index bb067e683..34801d65c 100644
--- a/frontend/src/app/main/ui/workspace/tokens/common.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/common.scss
@@ -19,20 +19,7 @@
 }
 
 .labeled-input-error {
-  border: 1px solid var(--status-color-error-500) !important;
-}
-
-.button {
-  @extend .button-primary;
-}
-
-.action-button {
-  @extend .button-tertiary;
-  height: $s-32;
-  width: $s-28;
-  svg {
-    @extend .button-icon;
-  }
+  border: $s-1 solid var(--status-color-error-500) !important;
 }
 
 .dropdown {
diff --git a/frontend/src/app/main/ui/workspace/tokens/modals/themes.scss b/frontend/src/app/main/ui/workspace/tokens/modals/themes.scss
index a3bb43803..43793b951 100644
--- a/frontend/src/app/main/ui/workspace/tokens/modals/themes.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/modals/themes.scss
@@ -175,7 +175,7 @@
 }
 
 .sets-list-wrapper {
-  border: 1px solid color-mix(in hsl, var(--color-foreground-secondary) 30%, transparent);
+  border: $s-1 solid color-mix(in hsl, var(--color-foreground-secondary) 30%, transparent);
   border-radius: $s-8;
   overflow-y: auto;
 }
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
index cf3c1c412..a00570b1a 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.cljs
@@ -29,10 +29,9 @@
 (mf/defc menu-entry
   {::mf/props :obj}
   [{:keys [title value on-click]}]
-  [:li
-   {:class (stl/css :context-menu-item)
-    :data-value value
-    :on-click on-click}
+  [:li {:class (stl/css :context-menu-item)
+        :data-value value
+        :on-click on-click}
    [:span {:class (stl/css :title)} title]])
 
 (mf/defc menu
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.scss b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.scss
index ccf1b7bea..f5b278499 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/tokens/sets_context_menu.scss
@@ -4,6 +4,7 @@
 //
 // Copyright (c) KALEIDOS INC
 
+@use "../../ds/typography.scss" as t;
 @import "refactor/common-refactor.scss";
 
 .token-set-context-menu {
@@ -21,14 +22,11 @@
   background-color: var(--menu-background-color);
   max-height: 100vh;
   overflow-y: auto;
-
-  li {
-    @include bodySmallTypography;
-    color: var(--menu-foreground-color);
-  }
 }
 
 .context-menu-item {
+  @include t.use-typography("body-small");
+  color: var(--menu-foreground-color);
   display: flex;
   align-items: center;
   height: $s-28;
@@ -39,8 +37,5 @@
 
   &:hover {
     background-color: var(--menu-background-color-hover);
-    .title {
-      color: var(--menu-foreground-color-hover);
-    }
   }
 }