diff --git a/lib/src/base-styles/_nx-colors.scss b/lib/src/base-styles/_nx-colors.scss
index b5750923a9..f6ae575884 100644
--- a/lib/src/base-styles/_nx-colors.scss
+++ b/lib/src/base-styles/_nx-colors.scss
@@ -14,6 +14,7 @@
   --nx-color-border-secondary: var(--nx-swatch-indigo-95);
 
   --nx-color-component-background: var(--nx-swatch-white);
+  --nx-color-component-border: var(--nx-swatch-indigo-80);
 
   --nx-color-site-background: var(--nx-swatch-indigo-97);
 
@@ -391,6 +392,7 @@
     --nx-color-border-secondary: var(--nx-swatch-indigo-35);
 
     --nx-color-component-background: var(--nx-swatch-indigo-20);
+    --nx-color-component-border: var(--nx-swatch-indigo-40);
 
     --nx-color-site-background: var(--nx-swatch-indigo-15);
 
diff --git a/lib/src/base-styles/_nx-tile.scss b/lib/src/base-styles/_nx-tile.scss
index 5ef8ab3076..ada15e7e21 100644
--- a/lib/src/base-styles/_nx-tile.scss
+++ b/lib/src/base-styles/_nx-tile.scss
@@ -21,6 +21,7 @@
   border-radius: var(--nx-border-radius);
   margin: var(--nx-spacing-2x) 0 var(--nx-spacing-6x) 0;
   padding: var(--nx-tile-spacing);
+  border: var(--nx-border-component);
 
   > .nx-footer, > .nx-form > .nx-footer {
     margin-top: var(--nx-spacing-8x);
diff --git a/lib/src/base-styles/_nx-variables.scss b/lib/src/base-styles/_nx-variables.scss
index a6cd89468d..e89cff89c6 100644
--- a/lib/src/base-styles/_nx-variables.scss
+++ b/lib/src/base-styles/_nx-variables.scss
@@ -54,6 +54,7 @@
   --nx-border-default: var(--nx-border-width) solid var(--nx-color-border);
   --nx-border-2x: 2px solid var(--nx-color-border);
   --nx-border-secondary: 1px solid var(--nx-color-border-secondary);
+  --nx-border-component: 1px solid var(--nx-color-component-border);
 
   --nx-focus-outline-width: 2px;
   --nx-focus-outline-offset: 2px;
diff --git a/lib/src/components/NxCombobox/NxCombobox.scss b/lib/src/components/NxCombobox/NxCombobox.scss
index d647e0d3b4..0276d0296c 100644
--- a/lib/src/components/NxCombobox/NxCombobox.scss
+++ b/lib/src/components/NxCombobox/NxCombobox.scss
@@ -13,6 +13,7 @@
   &__menu {
     position: absolute;
     width: 100%;
+    border: var(--nx-border-component);
   }
 
   &__input {
diff --git a/lib/src/components/NxDrawer/NxDrawer.scss b/lib/src/components/NxDrawer/NxDrawer.scss
index d9056a4798..47d8e2649d 100644
--- a/lib/src/components/NxDrawer/NxDrawer.scss
+++ b/lib/src/components/NxDrawer/NxDrawer.scss
@@ -62,6 +62,7 @@
   padding: $padding;
   padding-bottom: 0;
   width: 520px;
+  border-left: var(--nx-border-component);
 
   &::backdrop {
     // Chrome tries to add its own subtle mask here which doubles up with our own
diff --git a/lib/src/components/NxDropdown/NxDropdown.scss b/lib/src/components/NxDropdown/NxDropdown.scss
index dcb1493346..b18f96a839 100644
--- a/lib/src/components/NxDropdown/NxDropdown.scss
+++ b/lib/src/components/NxDropdown/NxDropdown.scss
@@ -29,6 +29,10 @@
   color: var(--nx-color-text-stark);
 }
 
+.nx-dropdown-menu {
+  border: var(--nx-border-component);
+}
+
 .nx-dropdown--short {
   width: 150px;
 
diff --git a/lib/src/components/NxModal/NxModal.scss b/lib/src/components/NxModal/NxModal.scss
index 6afdb49b33..b92b6f7433 100644
--- a/lib/src/components/NxModal/NxModal.scss
+++ b/lib/src/components/NxModal/NxModal.scss
@@ -21,6 +21,7 @@
   margin: 100px 0;
   padding: var(--nx-modal-padding);
   width: 800px;
+  border: var(--nx-border-component);
 
   @include nx-container-helpers.container-vertical;
 
diff --git a/lib/src/components/NxSubmitMask/NxSubmitMask.scss b/lib/src/components/NxSubmitMask/NxSubmitMask.scss
index e3150e3a56..4b81f70b69 100644
--- a/lib/src/components/NxSubmitMask/NxSubmitMask.scss
+++ b/lib/src/components/NxSubmitMask/NxSubmitMask.scss
@@ -13,6 +13,7 @@
 
   .nx-submit-mask__message {
     margin-top: 200px;
+    border: var(--nx-border-component);
   }
 }