diff --git a/frontend/resources/styles/common/refactor/basic-rules.scss b/frontend/resources/styles/common/refactor/basic-rules.scss
index 2393046820..29a9219f0b 100644
--- a/frontend/resources/styles/common/refactor/basic-rules.scss
+++ b/frontend/resources/styles/common/refactor/basic-rules.scss
@@ -583,6 +583,7 @@
   padding: $s-32;
   border-radius: $br-8;
   background-color: var(--modal-background-color);
+  border: $s-2 solid var(--modal-border-color);
   min-width: $s-364;
   min-height: $s-192;
   max-width: $s-512;
@@ -843,6 +844,7 @@
   z-index: $z-index-10;
   color: var(--title-foreground-color-hover);
   background-color: var(--menu-background-color);
+  border: $s-2 solid var(--panel-border-color);
 }
 
 .menu-item-base {
@@ -904,6 +906,7 @@
   overflow-x: hidden;
   background-color: var(--menu-background-color);
   color: var(--menu-foreground-color);
+  border: $s-2 solid var(--panel-border-color);
 }
 
 .select-wrapper {
diff --git a/frontend/resources/styles/common/refactor/design-tokens.scss b/frontend/resources/styles/common/refactor/design-tokens.scss
index 6e227fd21b..d19935e44f 100644
--- a/frontend/resources/styles/common/refactor/design-tokens.scss
+++ b/frontend/resources/styles/common/refactor/design-tokens.scss
@@ -13,6 +13,8 @@
 
   --scrollbar-background-color: var(--color-foreground-secondary);
   --panel-background-color: var(--color-background-primary);
+  --panel-border-color: var(--color-background-quaternary);
+
   --app-background: var(--color-background-primary);
   --loader-background: var(--color-background-primary);
   --panel-title-background-color: var(--color-background-secondary);
diff --git a/frontend/src/app/main/ui/components/context_menu_a11y.scss b/frontend/src/app/main/ui/components/context_menu_a11y.scss
index bd4e89fabf..2aa9fcea96 100644
--- a/frontend/src/app/main/ui/components/context_menu_a11y.scss
+++ b/frontend/src/app/main/ui/components/context_menu_a11y.scss
@@ -32,6 +32,7 @@
     margin: $s-0;
     padding: $s-4;
     border-radius: $br-8;
+    border: $s-2 solid var(--panel-border-color);
     background-color: var(--menu-background-color);
     overflow: auto;
     & .separator {
diff --git a/frontend/src/app/main/ui/dashboard/change_owner.scss b/frontend/src/app/main/ui/dashboard/change_owner.scss
index 3c91c1a92b..2da4ec233c 100644
--- a/frontend/src/app/main/ui/dashboard/change_owner.scss
+++ b/frontend/src/app/main/ui/dashboard/change_owner.scss
@@ -12,7 +12,6 @@
 
 .modal-container {
   @extend .modal-container-base;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/dashboard/import.scss b/frontend/src/app/main/ui/dashboard/import.scss
index ade895916e..4b76f7d6d2 100644
--- a/frontend/src/app/main/ui/dashboard/import.scss
+++ b/frontend/src/app/main/ui/dashboard/import.scss
@@ -12,7 +12,6 @@
 
 .modal-container {
   @extend .modal-container-base;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/dashboard/team.scss b/frontend/src/app/main/ui/dashboard/team.scss
index 32afa09a09..06c66d7485 100644
--- a/frontend/src/app/main/ui/dashboard/team.scss
+++ b/frontend/src/app/main/ui/dashboard/team.scss
@@ -588,7 +588,6 @@
   width: $s-400;
   padding: $s-32;
   background-color: var(--modal-background-color);
-  border: $s-1 solid var(--modal-border-color);
   &.hero {
     top: $s-216;
     right: $s-32;
@@ -676,7 +675,6 @@
 
 .modal-container {
   @extend .modal-container-base;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/dashboard/team_form.scss b/frontend/src/app/main/ui/dashboard/team_form.scss
index 12f33182fc..8f401e2273 100644
--- a/frontend/src/app/main/ui/dashboard/team_form.scss
+++ b/frontend/src/app/main/ui/dashboard/team_form.scss
@@ -12,7 +12,6 @@
 
 .modal-container {
   @extend .modal-container-base;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/onboarding.scss b/frontend/src/app/main/ui/onboarding.scss
index b820261663..7c2e1b22f6 100644
--- a/frontend/src/app/main/ui/onboarding.scss
+++ b/frontend/src/app/main/ui/onboarding.scss
@@ -17,7 +17,6 @@
   padding: 0;
   margin: 0;
   min-width: $s-712;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-left {
diff --git a/frontend/src/app/main/ui/onboarding/newsletter.scss b/frontend/src/app/main/ui/onboarding/newsletter.scss
index a407dcfa86..350b75499b 100644
--- a/frontend/src/app/main/ui/onboarding/newsletter.scss
+++ b/frontend/src/app/main/ui/onboarding/newsletter.scss
@@ -14,7 +14,6 @@
   @extend .modal-container-base;
   position: relative;
   min-width: $s-712;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/onboarding/questions.scss b/frontend/src/app/main/ui/onboarding/questions.scss
index e2024f7dd3..999f41d12e 100644
--- a/frontend/src/app/main/ui/onboarding/questions.scss
+++ b/frontend/src/app/main/ui/onboarding/questions.scss
@@ -14,7 +14,6 @@
   @extend .modal-container-base;
   min-width: $s-512;
   position: relative;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 // STEP CONTAINER
diff --git a/frontend/src/app/main/ui/onboarding/team_choice.scss b/frontend/src/app/main/ui/onboarding/team_choice.scss
index 1ebf067988..42aaaef3d2 100644
--- a/frontend/src/app/main/ui/onboarding/team_choice.scss
+++ b/frontend/src/app/main/ui/onboarding/team_choice.scss
@@ -16,7 +16,6 @@
   display: flex;
   position: relative;
   min-width: $s-712;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-left {
diff --git a/frontend/src/app/main/ui/settings/access_tokens.scss b/frontend/src/app/main/ui/settings/access_tokens.scss
index 44bfaf9c0a..e843c83f0d 100644
--- a/frontend/src/app/main/ui/settings/access_tokens.scss
+++ b/frontend/src/app/main/ui/settings/access_tokens.scss
@@ -175,7 +175,6 @@
 .modal-container {
   @extend .modal-container-base;
   min-width: $s-408;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/settings/change_email.scss b/frontend/src/app/main/ui/settings/change_email.scss
index 97da12aeca..e6f1500764 100644
--- a/frontend/src/app/main/ui/settings/change_email.scss
+++ b/frontend/src/app/main/ui/settings/change_email.scss
@@ -13,7 +13,6 @@
 .modal-container {
   @extend .modal-container-base;
   min-width: $s-408;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/settings/delete_account.scss b/frontend/src/app/main/ui/settings/delete_account.scss
index 33e72dd4ac..148781eba1 100644
--- a/frontend/src/app/main/ui/settings/delete_account.scss
+++ b/frontend/src/app/main/ui/settings/delete_account.scss
@@ -13,7 +13,6 @@
 .modal-container {
   @extend .modal-container-base;
   min-width: $s-408;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/workspace/context_menu.scss b/frontend/src/app/main/ui/workspace/context_menu.scss
index 4a178c88f8..b83f67bb45 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.scss
+++ b/frontend/src/app/main/ui/workspace/context_menu.scss
@@ -17,6 +17,7 @@
   width: $s-240;
   padding: $s-4;
   border-radius: $br-8;
+  border: $s-2 solid var(--panel-border-color);
   background-color: var(--menu-background-color);
   z-index: $z-index-3;
 }
diff --git a/frontend/src/app/main/ui/workspace/nudge.scss b/frontend/src/app/main/ui/workspace/nudge.scss
index 28d4985791..5e58a036c0 100644
--- a/frontend/src/app/main/ui/workspace/nudge.scss
+++ b/frontend/src/app/main/ui/workspace/nudge.scss
@@ -13,7 +13,6 @@
 .modal-container {
   @extend .modal-container-base;
   min-width: $s-408;
-  border: $s-1 solid var(--modal-border-color);
 }
 
 .modal-header {
diff --git a/frontend/src/app/main/ui/workspace/palette.scss b/frontend/src/app/main/ui/workspace/palette.scss
index 9d88d9e033..995d886a00 100644
--- a/frontend/src/app/main/ui/workspace/palette.scss
+++ b/frontend/src/app/main/ui/workspace/palette.scss
@@ -31,6 +31,7 @@
   padding: $s-0 $s-0 $s-8 $s-8;
   border-radius: $br-8;
   background-color: var(--palette-background-color);
+  border: $s-2 solid var(--panel-border-color);
   transition:
     right 0.3s,
     opacity 0.2s,
diff --git a/frontend/src/app/main/ui/workspace/top_toolbar.scss b/frontend/src/app/main/ui/workspace/top_toolbar.scss
index d6140e99ec..993953c898 100644
--- a/frontend/src/app/main/ui/workspace/top_toolbar.scss
+++ b/frontend/src/app/main/ui/workspace/top_toolbar.scss
@@ -17,6 +17,7 @@
   height: $s-56;
   padding: $s-8 $s-16;
   border-radius: $s-8;
+  border: $s-2 solid var(--panel-border-color);
   z-index: $z-index-10;
   background-color: var(--color-background-primary);
   transition: