diff --git a/src/app/address/AddressForm.scss b/src/app/address/AddressForm.scss
deleted file mode 100644
index 0e87848620..0000000000
--- a/src/app/address/AddressForm.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-@import "../ui/Base";
-
-.checkout-address {
-    display: flex;
-    flex-flow: row wrap;
-    margin-left: -1 * spacing("half");
-    margin-right: -1 * spacing("half");
-
-    .dynamic-form-addressState,
-    .dynamic-form-field {
-        display: block;
-        flex: 1;
-        flex-basis: 100%;
-        max-width: 100%;
-        padding: 0 spacing("half");
-    }
-
-    .dynamic-form-field--province,
-    .dynamic-form-field--provinceCode,
-    .dynamic-form-field--firstName,
-    .dynamic-form-field--lastName,
-    .dynamic-form-field--phone,
-    .dynamic-form-field--city {
-        @include breakpoint("small") {
-            flex-basis: 50%;
-        }
-    }
-
-    .dynamic-form-field--postCode {
-        @include breakpoint("small") {
-            flex-basis: 30%;
-        }
-    }
-}
-
-.dynamic-form-field {
-    margin-bottom: spacing("half");
-
-    &:last-child {
-        margin-bottom: 0;
-    }
-}
diff --git a/src/app/address/AddressForm.tsx b/src/app/address/AddressForm.tsx
index 452874889c..7c1bb586a8 100644
--- a/src/app/address/AddressForm.tsx
+++ b/src/app/address/AddressForm.tsx
@@ -7,7 +7,6 @@ import { withLanguage, WithLanguageProps } from '../locale';
 import { AutocompleteItem } from '../ui/autocomplete';
 
 import { mapToAddress, GoogleAutocompleteFormField } from './googleAutocomplete';
-import './AddressForm.scss';
 import AddressFormField from './AddressFormField';
 import { AddressKeyMap } from './DynamicFormField';
 import DynamicFormFieldType from './DynamicFormFieldType';
diff --git a/src/app/address/AddressSelect.tsx b/src/app/address/AddressSelect.tsx
index 4ea8f25dbd..8166beff1d 100644
--- a/src/app/address/AddressSelect.tsx
+++ b/src/app/address/AddressSelect.tsx
@@ -6,7 +6,6 @@ import { TranslatedString } from '../locale';
 import { DropdownTrigger } from '../ui/dropdown';
 
 import isEqualAddress from './isEqualAddress';
-import './AddressSelect.scss';
 import StaticAddress from './StaticAddress';
 
 export interface AddressSelectProps {
diff --git a/src/app/address/MultiCheckboxControl.scss b/src/app/address/MultiCheckboxControl.scss
deleted file mode 100644
index 83122b26f5..0000000000
--- a/src/app/address/MultiCheckboxControl.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import '../ui/Base';
-
-.multiCheckbox--controls {
-    list-style: none;
-    margin: 0 0 spacing("half");
-    padding: 0;
-}
-
-.multiCheckbox--control {
-    display: inline-block;
-    margin-right: spacing("quarter");
-}
diff --git a/src/app/address/MultiCheckboxControl.tsx b/src/app/address/MultiCheckboxControl.tsx
index b2484ece5b..6475139c05 100644
--- a/src/app/address/MultiCheckboxControl.tsx
+++ b/src/app/address/MultiCheckboxControl.tsx
@@ -2,8 +2,6 @@ import React, { memo, useCallback, FunctionComponent, MouseEvent } from 'react';
 
 import { TranslatedString } from '../locale';
 
-import './MultiCheckboxControl.scss';
-
 export interface MultiCheckboxControlProps {
     testId?: string;
     onSelectedAll(): void;
diff --git a/src/app/ui/Base.scss b/src/app/ui/Base.scss
index 2770c4d897..177535a08b 100644
--- a/src/app/ui/Base.scss
+++ b/src/app/ui/Base.scss
@@ -1,5 +1,4 @@
 @import '../../../node_modules/@bigcommerce/citadel/src/tools/toolkit';
 @import '../../../node_modules/@bigcommerce/citadel/src/settings/global/global';
-@import '../../scss/settings/foundation/foundation';
 
 $global-radius: 4px;
diff --git a/src/scss/components/_components.scss b/src/scss/components/_components.scss
index 852edbd1e7..4b11d9f94a 100644
--- a/src/scss/components/_components.scss
+++ b/src/scss/components/_components.scss
@@ -85,6 +85,9 @@
 // Checkout Steps
 @import "checkout/checkoutSteps/component";
 
+// Checkout Dropdown Select
+@import "checkout/dropdownSelect/component";
+
 // GenericModal
 @import "checkout/genericModal/component";
 
diff --git a/src/scss/components/checkout/checkoutAddress/_checkoutAddress.scss b/src/scss/components/checkout/checkoutAddress/_checkoutAddress.scss
index 69294232ec..534bec891f 100644
--- a/src/scss/components/checkout/checkoutAddress/_checkoutAddress.scss
+++ b/src/scss/components/checkout/checkoutAddress/_checkoutAddress.scss
@@ -11,8 +11,52 @@
     flex: 1; // 1
 }
 
+.checkout-address {
+    display: flex;
+    flex-flow: row wrap;
+    margin-left: -1 * spacing("half");
+    margin-right: -1 * spacing("half");
+
+    .dynamic-form-addressState,
+    .dynamic-form-field {
+        display: block;
+        flex: 1;
+        flex-basis: 100%;
+        max-width: 100%;
+        padding: 0 spacing("half");
+    }
+
+    .dynamic-form-field--province,
+    .dynamic-form-field--provinceCode,
+    .dynamic-form-field--firstName,
+    .dynamic-form-field--lastName,
+    .dynamic-form-field--phone,
+    .dynamic-form-field--city {
+        @include breakpoint("small") {
+            flex-basis: 50%;
+        }
+    }
+
+    .dynamic-form-field--postCode {
+        @include breakpoint("small") {
+            flex-basis: 30%;
+        }
+    }
+}
+
 .shipping-address {
     .address-line {
         margin-bottom: 0;
     }
 }
+
+.multiCheckbox--controls {
+    list-style: none;
+    margin: 0 0 spacing("half");
+    padding: 0;
+}
+
+.multiCheckbox--control {
+    display: inline-block;
+    margin-right: spacing("quarter");
+}
diff --git a/src/scss/components/checkout/dropdownSelect/_component.scss b/src/scss/components/checkout/dropdownSelect/_component.scss
new file mode 100644
index 0000000000..70f887eb43
--- /dev/null
+++ b/src/scss/components/checkout/dropdownSelect/_component.scss
@@ -0,0 +1,5 @@
+// =============================================================================
+// DROPDOWN SELECT
+// =============================================================================
+
+@import "dropdownSelect";
diff --git a/src/app/address/AddressSelect.scss b/src/scss/components/checkout/dropdownSelect/_dropdownSelect.scss
similarity index 65%
rename from src/app/address/AddressSelect.scss
rename to src/scss/components/checkout/dropdownSelect/_dropdownSelect.scss
index c6ef8e2a3d..77cdc796ad 100644
--- a/src/app/address/AddressSelect.scss
+++ b/src/scss/components/checkout/dropdownSelect/_dropdownSelect.scss
@@ -1,4 +1,6 @@
-@import "../ui/Base";
+// =============================================================================
+// DROPDOWN SELECT (Component)
+// =============================================================================
 
 .dropdown--select {
     cursor: pointer;
@@ -8,7 +10,7 @@
 .dropdown-toggle--select {
     color: $input-font-color;
     margin-bottom: 0;
-    min-height: 3rem;
+    min-height: $dropdown-toggle-height--select;
     padding: $buttonSize-default-verticalPadding $input-horizontalPadding;
     text-align: left;
     text-transform: none;
@@ -20,6 +22,12 @@
     }
 }
 
+.dropdown-menu--select {
+    max-height: 20rem;
+    max-width: none;
+    overflow: auto;
+}
+
 .dropdown-menu-item--select {
     border-bottom: container("border");
 
diff --git a/src/scss/components/foundation/forms/_forms.scss b/src/scss/components/foundation/forms/_forms.scss
index 3416a2f6d0..fbd2102efd 100644
--- a/src/scss/components/foundation/forms/_forms.scss
+++ b/src/scss/components/foundation/forms/_forms.scss
@@ -28,6 +28,14 @@
         }
     }
 
+    .dynamic-form-field {
+        margin-bottom: spacing("half");
+
+        &:last-child {
+            margin-bottom: 0;
+        }
+    }
+
     .form-field {
         position: relative;