diff --git a/UNRELEASED-v8.md b/UNRELEASED-v8.md
index 1c61143fed9..e8e1d0332a2 100644
--- a/UNRELEASED-v8.md
+++ b/UNRELEASED-v8.md
@@ -28,6 +28,7 @@ Use [the changelog guidelines](/documentation/Versioning%20and%20changelog.md) t
 - Removed unnecessary `--p-border-radius-` properties and moved border-radius custom properties to tokens ([#4763](https://github.com/Shopify/polaris-react/pull/4763))
 - Dropped support for node < 16 ([#4778](https://github.com/Shopify/polaris-react/pull/4778))
 - Removed `build/styles` directory from build output ([#4728](https://github.com/Shopify/polaris-react/pull/4728))
+- Removed the border-radius() function and replaced any instances with tokens ([#4793](https://github.com/Shopify/polaris-react/pull/4793))
 
 ### New components
 
diff --git a/src/components/ActionList/ActionList.scss b/src/components/ActionList/ActionList.scss
index 2fee5911670..947e8e78260 100644
--- a/src/components/ActionList/ActionList.scss
+++ b/src/components/ActionList/ActionList.scss
@@ -121,7 +121,7 @@
   align-items: center;
   height: var(--pc-action-list-image-size);
   width: var(--pc-action-list-image-size);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
 
   // We need the negative margin to ensure that the image does not set
   // the minimum height of the action item.
diff --git a/src/components/Autocomplete/components/MappedAction/MappedAction.scss b/src/components/Autocomplete/components/MappedAction/MappedAction.scss
index d5c4827be91..d244029edd4 100644
--- a/src/components/Autocomplete/components/MappedAction/MappedAction.scss
+++ b/src/components/Autocomplete/components/MappedAction/MappedAction.scss
@@ -93,7 +93,7 @@
   align-items: center;
   height: var(--pc-mapped-actions-image-size);
   width: var(--pc-mapped-actions-image-size);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
 
   // We need the negative margin to ensure that the image does not set
   // the minimum height of the action item.
diff --git a/src/components/Avatar/Avatar.scss b/src/components/Avatar/Avatar.scss
index 919dfb68a96..70e60e95679 100644
--- a/src/components/Avatar/Avatar.scss
+++ b/src/components/Avatar/Avatar.scss
@@ -12,7 +12,7 @@
   max-width: 100%;
   background: var(--p-surface-neutral);
   color: var(--p-icon-subdued);
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   user-select: none;
 
   @media (forced-colors: active) {
@@ -82,7 +82,7 @@
   width: 100%;
   height: 100%;
   background-color: var(--p-background);
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   transform: translate(-50%, -50%);
   object-fit: cover;
 }
diff --git a/src/components/Badge/Badge.scss b/src/components/Badge/Badge.scss
index ef0b7749ed8..5e5d42babd6 100644
--- a/src/components/Badge/Badge.scss
+++ b/src/components/Badge/Badge.scss
@@ -71,7 +71,7 @@
     var(--pc-badge-vertical-padding) - var(--pc-badge-pip-spacing)
   );
   border: border-width(thick) solid currentColor;
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   flex-shrink: 0;
 }
 
diff --git a/src/components/Banner/Banner.scss b/src/components/Banner/Banner.scss
index a95c2c972d5..fa6959ccb3f 100644
--- a/src/components/Banner/Banner.scss
+++ b/src/components/Banner/Banner.scss
@@ -169,7 +169,7 @@
 }
 
 .withinPage {
-  border-radius: 0 0 border-radius() border-radius();
+  border-radius: 0 0 var(--p-border-radius-base) var(--p-border-radius-base);
   padding: var(--p-space-5);
 
   @include banner-variants(true);
diff --git a/src/components/CheckableButton/CheckableButton.scss b/src/components/CheckableButton/CheckableButton.scss
index 6f9daabbcfd..3f9faaa0414 100644
--- a/src/components/CheckableButton/CheckableButton.scss
+++ b/src/components/CheckableButton/CheckableButton.scss
@@ -60,7 +60,7 @@ $button-vertical-padding: ($button-min-height - line-height(body) - 2px) / 2;
   }
 
   &.CheckableButton-plain {
-    border-radius: border-radius();
+    border-radius: var(--p-border-radius-base);
     box-shadow: none;
     background: transparent;
     border: none;
diff --git a/src/components/ColorPicker/ColorPicker.scss b/src/components/ColorPicker/ColorPicker.scss
index 29b55ebef26..de8265df378 100644
--- a/src/components/ColorPicker/ColorPicker.scss
+++ b/src/components/ColorPicker/ColorPicker.scss
@@ -77,7 +77,7 @@
   will-change: transform;
   background: transparent;
   border: var(--p-border-radius-1) solid var(--p-surface);
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   pointer-events: none;
 }
 
diff --git a/src/components/DropZone/DropZone.scss b/src/components/DropZone/DropZone.scss
index 72a2e19bab0..4236e5d1995 100755
--- a/src/components/DropZone/DropZone.scss
+++ b/src/components/DropZone/DropZone.scss
@@ -17,7 +17,7 @@ $dropzone-min-height-small: 50px;
 }
 
 @mixin set-border-radius {
-  border-radius: calc(var(--p-border-radius-1) + #{border-width()} + #{1px});
+  border-radius: calc(var(--p-border-radius-1) + #{border-width()} + 1px);
 }
 
 .DropZone {
diff --git a/src/components/ExceptionList/ExceptionList.scss b/src/components/ExceptionList/ExceptionList.scss
index f921054f44a..affe939bbf9 100644
--- a/src/components/ExceptionList/ExceptionList.scss
+++ b/src/components/ExceptionList/ExceptionList.scss
@@ -41,7 +41,7 @@
 .Bullet {
   width: 6px;
   height: 6px;
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   background-color: var(--p-icon-subdued);
 
   .statusWarning & {
diff --git a/src/components/Frame/Frame.scss b/src/components/Frame/Frame.scss
index 5900f8ecc21..79bd98910d5 100644
--- a/src/components/Frame/Frame.scss
+++ b/src/components/Frame/Frame.scss
@@ -83,7 +83,7 @@
   margin: var(--p-space-4);
   padding: 0;
   border: none;
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   background: none;
   opacity: 0;
   pointer-events: none;
@@ -99,7 +99,7 @@
   &:focus {
     @include focus-ring($style: focused);
     position: absolute;
-    border-radius: border-radius();
+    border-radius: var(--p-border-radius-base);
     outline: none;
   }
 
diff --git a/src/components/Icon/Icon.scss b/src/components/Icon/Icon.scss
index 2812695996a..c115a1eaa5a 100644
--- a/src/components/Icon/Icon.scss
+++ b/src/components/Icon/Icon.scss
@@ -26,7 +26,7 @@
     bottom: calc(-1 * var(--p-space-1));
     left: calc(-1 * var(--p-space-1));
     right: calc(-1 * var(--p-space-1));
-    border-radius: var(--p-border-radius-6);
+    border-radius: var(--p-border-radius-half);
   }
 }
 
diff --git a/src/components/IndexTable/IndexTable.scss b/src/components/IndexTable/IndexTable.scss
index 94cdeb16e25..a79223f992b 100644
--- a/src/components/IndexTable/IndexTable.scss
+++ b/src/components/IndexTable/IndexTable.scss
@@ -418,7 +418,6 @@ $loading-panel-height: 53px;
 $scroll-bar-size: var(--p-space-2);
 
 .ScrollBarContainer {
-  --pc-scroll-bar-container-border-radius: 4px;
   position: sticky;
   z-index: var(--pc-index-table-scroll-bar);
   bottom: 0;
@@ -442,7 +441,7 @@ $scroll-bar-size: var(--p-space-2);
 }
 
 .ScrollBar::-webkit-scrollbar-track {
-  border-radius: var(--pc-scroll-bar-container-border-radius);
+  border-radius: var(--p-border-radius-1);
   background-color: transparent;
 }
 
@@ -454,7 +453,7 @@ $scroll-bar-size: var(--p-space-2);
 }
 
 .ScrollBar::-webkit-scrollbar-thumb {
-  border-radius: var(--pc-scroll-bar-container-border-radius);
+  border-radius: var(--p-border-radius-1);
   background-color: var(--p-border-neutral-subdued);
   transition: background-color var(--p-duration-100) ease-out;
 }
diff --git a/src/components/Indicator/Indicator.scss b/src/components/Indicator/Indicator.scss
index f2110ce7e3c..f841400a36b 100644
--- a/src/components/Indicator/Indicator.scss
+++ b/src/components/Indicator/Indicator.scss
@@ -13,7 +13,7 @@ $base-position: -4px;
     top: $base-position;
     width: $size;
     height: $size;
-    border-radius: var(--p-border-radius-6);
+    border-radius: var(--p-border-radius-half);
     border: calc(#{$size} / 2) solid transparent;
   }
 }
diff --git a/src/components/Link/Link.scss b/src/components/Link/Link.scss
index 0706b318df2..dcc8305db36 100644
--- a/src/components/Link/Link.scss
+++ b/src/components/Link/Link.scss
@@ -37,7 +37,7 @@
       left: -5px;
       display: block;
 
-      border-radius: border-radius();
+      border-radius: var(--p-border-radius-base);
     }
   }
 
diff --git a/src/components/MessageIndicator/MessageIndicator.scss b/src/components/MessageIndicator/MessageIndicator.scss
index 574094ab767..ec095dfd667 100644
--- a/src/components/MessageIndicator/MessageIndicator.scss
+++ b/src/components/MessageIndicator/MessageIndicator.scss
@@ -14,7 +14,7 @@ $indicator-position: -3px;
   right: $indicator-position;
   width: $indicator-size;
   height: $indicator-size;
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   background-color: var(--p-icon-highlight);
   border: solid 2px var(--p-background);
 }
diff --git a/src/components/Modal/components/CloseButton/CloseButton.scss b/src/components/Modal/components/CloseButton/CloseButton.scss
index 7df0a4c075b..55ff07b380a 100644
--- a/src/components/Modal/components/CloseButton/CloseButton.scss
+++ b/src/components/Modal/components/CloseButton/CloseButton.scss
@@ -6,7 +6,7 @@
   margin-left: var(--p-space-5);
   margin-right: calc(-1 * var(--p-space-2));
   padding: var(--p-space-2);
-  border-radius: border-radius(large);
+  border-radius: var(--p-border-radius-large);
 
   &:hover {
     background: var(--p-surface-hovered);
diff --git a/src/components/README.md b/src/components/README.md
index 47d28c1cebb..c3055c0cd51 100644
--- a/src/components/README.md
+++ b/src/components/README.md
@@ -108,7 +108,7 @@ Wrap your application in a div that contains the Polaris CSS variables. This is
 
 ```html
 <div
-  style="background-color: rgb(246, 246, 247); color: rgb(32, 34, 35); --p-background:rgba(246, 246, 247, 1); --p-background-hovered:rgba(241, 242, 243, 1); --p-background-pressed:rgba(237, 238, 239, 1); --p-background-selected:rgba(237, 238, 239, 1); --p-surface:rgba(255, 255, 255, 1); --p-surface-neutral:rgba(228, 229, 231, 1); --p-surface-neutral-hovered:rgba(219, 221, 223, 1); --p-surface-neutral-pressed:rgba(201, 204, 208, 1); --p-surface-neutral-disabled:rgba(241, 242, 243, 1); --p-surface-neutral-subdued:rgba(246, 246, 247, 1); --p-surface-subdued:rgba(250, 251, 251, 1); --p-surface-disabled:rgba(250, 251, 251, 1); --p-surface-hovered:rgba(246, 246, 247, 1); --p-surface-pressed:rgba(241, 242, 243, 1); --p-surface-depressed:rgba(237, 238, 239, 1); --p-backdrop:rgba(0, 0, 0, 0.5); --p-overlay:rgba(255, 255, 255, 0.5); --p-shadow-from-dim-light:rgba(0, 0, 0, 0.2); --p-shadow-from-ambient-light:rgba(23, 24, 24, 0.05); --p-shadow-from-direct-light:rgba(0, 0, 0, 0.15); --p-hint-from-direct-light:rgba(0, 0, 0, 0.15); --p-surface-search-field:rgba(241, 242, 243, 1); --p-border:rgba(140, 145, 150, 1); --p-border-neutral-subdued:rgba(186, 191, 195, 1); --p-border-hovered:rgba(153, 158, 164, 1); --p-border-disabled:rgba(210, 213, 216, 1); --p-border-subdued:rgba(201, 204, 207, 1); --p-border-depressed:rgba(87, 89, 89, 1); --p-border-shadow:rgba(174, 180, 185, 1); --p-border-shadow-subdued:rgba(186, 191, 196, 1); --p-divider:rgba(225, 227, 229, 1); --p-icon:rgba(92, 95, 98, 1); --p-icon-hovered:rgba(26, 28, 29, 1); --p-icon-pressed:rgba(68, 71, 74, 1); --p-icon-disabled:rgba(186, 190, 195, 1); --p-icon-subdued:rgba(140, 145, 150, 1); --p-text:rgba(32, 34, 35, 1); --p-text-disabled:rgba(140, 145, 150, 1); --p-text-subdued:rgba(109, 113, 117, 1); --p-interactive:rgba(44, 110, 203, 1); --p-interactive-disabled:rgba(189, 193, 204, 1); --p-interactive-hovered:rgba(31, 81, 153, 1); --p-interactive-pressed:rgba(16, 50, 98, 1); --p-focused:rgba(69, 143, 255, 1); --p-surface-selected:rgba(242, 247, 254, 1); --p-surface-selected-hovered:rgba(237, 244, 254, 1); --p-surface-selected-pressed:rgba(229, 239, 253, 1); --p-icon-on-interactive:rgba(255, 255, 255, 1); --p-text-on-interactive:rgba(255, 255, 255, 1); --p-action-secondary:rgba(255, 255, 255, 1); --p-action-secondary-disabled:rgba(255, 255, 255, 1); --p-action-secondary-hovered:rgba(246, 246, 247, 1); --p-action-secondary-pressed:rgba(241, 242, 243, 1); --p-action-secondary-depressed:rgba(109, 113, 117, 1); --p-action-primary:rgba(0, 128, 96, 1); --p-action-primary-disabled:rgba(241, 241, 241, 1); --p-action-primary-hovered:rgba(0, 110, 82, 1); --p-action-primary-pressed:rgba(0, 94, 70, 1); --p-action-primary-depressed:rgba(0, 61, 44, 1); --p-icon-on-primary:rgba(255, 255, 255, 1); --p-text-on-primary:rgba(255, 255, 255, 1); --p-text-primary:rgba(0, 123, 92, 1); --p-text-primary-hovered:rgba(0, 108, 80, 1); --p-text-primary-pressed:rgba(0, 92, 68, 1); --p-surface-primary-selected:rgba(241, 248, 245, 1); --p-surface-primary-selected-hovered:rgba(179, 208, 195, 1); --p-surface-primary-selected-pressed:rgba(162, 188, 176, 1); --p-border-critical:rgba(253, 87, 73, 1); --p-border-critical-subdued:rgba(224, 179, 178, 1); --p-border-critical-disabled:rgba(255, 167, 163, 1); --p-icon-critical:rgba(215, 44, 13, 1); --p-surface-critical:rgba(254, 211, 209, 1); --p-surface-critical-subdued:rgba(255, 244, 244, 1); --p-surface-critical-subdued-hovered:rgba(255, 240, 240, 1); --p-surface-critical-subdued-pressed:rgba(255, 233, 232, 1); --p-surface-critical-subdued-depressed:rgba(254, 188, 185, 1); --p-text-critical:rgba(215, 44, 13, 1); --p-action-critical:rgba(216, 44, 13, 1); --p-action-critical-disabled:rgba(241, 241, 241, 1); --p-action-critical-hovered:rgba(188, 34, 0, 1); --p-action-critical-pressed:rgba(162, 27, 0, 1); --p-action-critical-depressed:rgba(108, 15, 0, 1); --p-icon-on-critical:rgba(255, 255, 255, 1); --p-text-on-critical:rgba(255, 255, 255, 1); --p-interactive-critical:rgba(216, 44, 13, 1); --p-interactive-critical-disabled:rgba(253, 147, 141, 1); --p-interactive-critical-hovered:rgba(205, 41, 12, 1); --p-interactive-critical-pressed:rgba(103, 15, 3, 1); --p-border-warning:rgba(185, 137, 0, 1); --p-border-warning-subdued:rgba(225, 184, 120, 1); --p-icon-warning:rgba(185, 137, 0, 1); --p-surface-warning:rgba(255, 215, 157, 1); --p-surface-warning-subdued:rgba(255, 245, 234, 1); --p-surface-warning-subdued-hovered:rgba(255, 242, 226, 1); --p-surface-warning-subdued-pressed:rgba(255, 235, 211, 1); --p-text-warning:rgba(145, 106, 0, 1); --p-border-highlight:rgba(68, 157, 167, 1); --p-border-highlight-subdued:rgba(152, 198, 205, 1); --p-icon-highlight:rgba(0, 160, 172, 1); --p-surface-highlight:rgba(164, 232, 242, 1); --p-surface-highlight-subdued:rgba(235, 249, 252, 1); --p-surface-highlight-subdued-hovered:rgba(228, 247, 250, 1); --p-surface-highlight-subdued-pressed:rgba(213, 243, 248, 1); --p-text-highlight:rgba(52, 124, 132, 1); --p-border-success:rgba(0, 164, 124, 1); --p-border-success-subdued:rgba(149, 201, 180, 1); --p-icon-success:rgba(0, 127, 95, 1); --p-surface-success:rgba(174, 233, 209, 1); --p-surface-success-subdued:rgba(241, 248, 245, 1); --p-surface-success-subdued-hovered:rgba(236, 246, 241, 1); --p-surface-success-subdued-pressed:rgba(226, 241, 234, 1); --p-text-success:rgba(0, 128, 96, 1); --p-decorative-one-icon:rgba(126, 87, 0, 1); --p-decorative-one-surface:rgba(255, 201, 107, 1); --p-decorative-one-text:rgba(61, 40, 0, 1); --p-decorative-two-icon:rgba(175, 41, 78, 1); --p-decorative-two-surface:rgba(255, 196, 176, 1); --p-decorative-two-text:rgba(73, 11, 28, 1); --p-decorative-three-icon:rgba(0, 109, 65, 1); --p-decorative-three-surface:rgba(146, 230, 181, 1); --p-decorative-three-text:rgba(0, 47, 25, 1); --p-decorative-four-icon:rgba(0, 106, 104, 1); --p-decorative-four-surface:rgba(145, 224, 214, 1); --p-decorative-four-text:rgba(0, 45, 45, 1); --p-decorative-five-icon:rgba(174, 43, 76, 1); --p-decorative-five-surface:rgba(253, 201, 208, 1); --p-decorative-five-text:rgba(79, 14, 31, 1); --p-border-radius-05:0.2rem; --p-border-radius-1:0.4rem; --p-border-radius-2:0.8rem; --p-border-radius-3:1.2rem; --p-border-radius-4:1.6rem; --p-border-radius-5:2rem; --p-border-radius-6:50%; --p-card-shadow:0px 0px 5px var(--p-shadow-from-ambient-light), 0px 1px 2px var(--p-shadow-from-direct-light); --p-popover-shadow:-1px 0px 20px var(--p-shadow-from-ambient-light), 0px 1px 5px var(--p-shadow-from-direct-light); --p-modal-shadow:0px 26px 80px var(--p-shadow-from-dim-light), 0px 0px 1px var(--p-shadow-from-dim-light); --p-top-bar-shadow:0 2px 2px -1px var(--p-shadow-from-direct-light); --p-button-drop-shadow:0 1px 0 rgba(0, 0, 0, 0.05); --p-button-inner-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.2); --p-button-pressed-inner-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.15); --p-override-none:none; --p-override-transparent:transparent; --p-override-one:1; --p-override-visible:visible; --p-override-zero:0; --p-override-loading-z-index:514; --p-non-null-content:''; --p-choice-size:2rem; --p-icon-size:1rem; --p-choice-margin:0.1rem; --p-control-border-width:0.2rem; --p-banner-border-default:inset 0 0.1rem 0 0 var(--p-border-neutral-subdued), inset 0 0 0 0.1rem var(--p-border-neutral-subdued); --p-banner-border-success:inset 0 0.1rem 0 0 var(--p-border-success-subdued), inset 0 0 0 0.1rem var(--p-border-success-subdued); --p-banner-border-highlight:inset 0 0.1rem 0 0 var(--p-border-highlight-subdued), inset 0 0 0 0.1rem var(--p-border-highlight-subdued); --p-banner-border-warning:inset 0 0.1rem 0 0 var(--p-border-warning-subdued), inset 0 0 0 0.1rem var(--p-border-warning-subdued); --p-banner-border-critical:inset 0 0.1rem 0 0 var(--p-border-critical-subdued), inset 0 0 0 0.1rem var(--p-border-critical-subdued); --p-badge-mix-blend-mode:luminosity; --p-thin-border-subdued:0.1rem solid var(--p-border-subdued); --p-text-field-spinner-offset:0.2rem; --p-text-field-focus-ring-offset:-0.4rem; --p-button-group-item-spacing:-0.1rem; --p-duration-0:0ms; --p-duration-50:50ms; --p-duration-100:100ms; --p-duration-150:150ms; --p-duration-200:200ms; --p-duration-250:250ms; --p-duration-300:300ms; --p-duration-350:350ms; --p-duration-400:400ms; --p-duration-450:450ms; --p-duration-500:500ms; --p-ease:cubic-bezier(0.25, 0.1, 0.25, 1);--p-ease-in:cubic-bezier(0.42, 0, 1, 1); --p-ease-out:cubic-bezier(0, 0, 0.58, 1); --p-ease-in-out:cubic-bezier(0.42, 0, 0.58, 1); --p-linear:cubic-bezier(0, 0, 1, 1); --p-range-slider-thumb-size-base:1.6rem; --p-range-slider-thumb-size-active:2.4rem; --p-range-slider-thumb-scale:1.5; --p-frame-offset:0px; --p-font-weight-regular: 400px; --p-font-weight-medium: 500px; --p-font-weight-semibold: 600px; --p-font-weight-bold: 700px;"
+  style="background-color: rgb(246, 246, 247); color: rgb(32, 34, 35); --p-background:rgba(246, 246, 247, 1); --p-background-hovered:rgba(241, 242, 243, 1); --p-background-pressed:rgba(237, 238, 239, 1); --p-background-selected:rgba(237, 238, 239, 1); --p-surface:rgba(255, 255, 255, 1); --p-surface-neutral:rgba(228, 229, 231, 1); --p-surface-neutral-hovered:rgba(219, 221, 223, 1); --p-surface-neutral-pressed:rgba(201, 204, 208, 1); --p-surface-neutral-disabled:rgba(241, 242, 243, 1); --p-surface-neutral-subdued:rgba(246, 246, 247, 1); --p-surface-subdued:rgba(250, 251, 251, 1); --p-surface-disabled:rgba(250, 251, 251, 1); --p-surface-hovered:rgba(246, 246, 247, 1); --p-surface-pressed:rgba(241, 242, 243, 1); --p-surface-depressed:rgba(237, 238, 239, 1); --p-backdrop:rgba(0, 0, 0, 0.5); --p-overlay:rgba(255, 255, 255, 0.5); --p-shadow-from-dim-light:rgba(0, 0, 0, 0.2); --p-shadow-from-ambient-light:rgba(23, 24, 24, 0.05); --p-shadow-from-direct-light:rgba(0, 0, 0, 0.15); --p-hint-from-direct-light:rgba(0, 0, 0, 0.15); --p-surface-search-field:rgba(241, 242, 243, 1); --p-border:rgba(140, 145, 150, 1); --p-border-neutral-subdued:rgba(186, 191, 195, 1); --p-border-hovered:rgba(153, 158, 164, 1); --p-border-disabled:rgba(210, 213, 216, 1); --p-border-subdued:rgba(201, 204, 207, 1); --p-border-depressed:rgba(87, 89, 89, 1); --p-border-shadow:rgba(174, 180, 185, 1); --p-border-shadow-subdued:rgba(186, 191, 196, 1); --p-divider:rgba(225, 227, 229, 1); --p-icon:rgba(92, 95, 98, 1); --p-icon-hovered:rgba(26, 28, 29, 1); --p-icon-pressed:rgba(68, 71, 74, 1); --p-icon-disabled:rgba(186, 190, 195, 1); --p-icon-subdued:rgba(140, 145, 150, 1); --p-text:rgba(32, 34, 35, 1); --p-text-disabled:rgba(140, 145, 150, 1); --p-text-subdued:rgba(109, 113, 117, 1); --p-interactive:rgba(44, 110, 203, 1); --p-interactive-disabled:rgba(189, 193, 204, 1); --p-interactive-hovered:rgba(31, 81, 153, 1); --p-interactive-pressed:rgba(16, 50, 98, 1); --p-focused:rgba(69, 143, 255, 1); --p-surface-selected:rgba(242, 247, 254, 1); --p-surface-selected-hovered:rgba(237, 244, 254, 1); --p-surface-selected-pressed:rgba(229, 239, 253, 1); --p-icon-on-interactive:rgba(255, 255, 255, 1); --p-text-on-interactive:rgba(255, 255, 255, 1); --p-action-secondary:rgba(255, 255, 255, 1); --p-action-secondary-disabled:rgba(255, 255, 255, 1); --p-action-secondary-hovered:rgba(246, 246, 247, 1); --p-action-secondary-pressed:rgba(241, 242, 243, 1); --p-action-secondary-depressed:rgba(109, 113, 117, 1); --p-action-primary:rgba(0, 128, 96, 1); --p-action-primary-disabled:rgba(241, 241, 241, 1); --p-action-primary-hovered:rgba(0, 110, 82, 1); --p-action-primary-pressed:rgba(0, 94, 70, 1); --p-action-primary-depressed:rgba(0, 61, 44, 1); --p-icon-on-primary:rgba(255, 255, 255, 1); --p-text-on-primary:rgba(255, 255, 255, 1); --p-text-primary:rgba(0, 123, 92, 1); --p-text-primary-hovered:rgba(0, 108, 80, 1); --p-text-primary-pressed:rgba(0, 92, 68, 1); --p-surface-primary-selected:rgba(241, 248, 245, 1); --p-surface-primary-selected-hovered:rgba(179, 208, 195, 1); --p-surface-primary-selected-pressed:rgba(162, 188, 176, 1); --p-border-critical:rgba(253, 87, 73, 1); --p-border-critical-subdued:rgba(224, 179, 178, 1); --p-border-critical-disabled:rgba(255, 167, 163, 1); --p-icon-critical:rgba(215, 44, 13, 1); --p-surface-critical:rgba(254, 211, 209, 1); --p-surface-critical-subdued:rgba(255, 244, 244, 1); --p-surface-critical-subdued-hovered:rgba(255, 240, 240, 1); --p-surface-critical-subdued-pressed:rgba(255, 233, 232, 1); --p-surface-critical-subdued-depressed:rgba(254, 188, 185, 1); --p-text-critical:rgba(215, 44, 13, 1); --p-action-critical:rgba(216, 44, 13, 1); --p-action-critical-disabled:rgba(241, 241, 241, 1); --p-action-critical-hovered:rgba(188, 34, 0, 1); --p-action-critical-pressed:rgba(162, 27, 0, 1); --p-action-critical-depressed:rgba(108, 15, 0, 1); --p-icon-on-critical:rgba(255, 255, 255, 1); --p-text-on-critical:rgba(255, 255, 255, 1); --p-interactive-critical:rgba(216, 44, 13, 1); --p-interactive-critical-disabled:rgba(253, 147, 141, 1); --p-interactive-critical-hovered:rgba(205, 41, 12, 1); --p-interactive-critical-pressed:rgba(103, 15, 3, 1); --p-border-warning:rgba(185, 137, 0, 1); --p-border-warning-subdued:rgba(225, 184, 120, 1); --p-icon-warning:rgba(185, 137, 0, 1); --p-surface-warning:rgba(255, 215, 157, 1); --p-surface-warning-subdued:rgba(255, 245, 234, 1); --p-surface-warning-subdued-hovered:rgba(255, 242, 226, 1); --p-surface-warning-subdued-pressed:rgba(255, 235, 211, 1); --p-text-warning:rgba(145, 106, 0, 1); --p-border-highlight:rgba(68, 157, 167, 1); --p-border-highlight-subdued:rgba(152, 198, 205, 1); --p-icon-highlight:rgba(0, 160, 172, 1); --p-surface-highlight:rgba(164, 232, 242, 1); --p-surface-highlight-subdued:rgba(235, 249, 252, 1); --p-surface-highlight-subdued-hovered:rgba(228, 247, 250, 1); --p-surface-highlight-subdued-pressed:rgba(213, 243, 248, 1); --p-text-highlight:rgba(52, 124, 132, 1); --p-border-success:rgba(0, 164, 124, 1); --p-border-success-subdued:rgba(149, 201, 180, 1); --p-icon-success:rgba(0, 127, 95, 1); --p-surface-success:rgba(174, 233, 209, 1); --p-surface-success-subdued:rgba(241, 248, 245, 1); --p-surface-success-subdued-hovered:rgba(236, 246, 241, 1); --p-surface-success-subdued-pressed:rgba(226, 241, 234, 1); --p-text-success:rgba(0, 128, 96, 1); --p-decorative-one-icon:rgba(126, 87, 0, 1); --p-decorative-one-surface:rgba(255, 201, 107, 1); --p-decorative-one-text:rgba(61, 40, 0, 1); --p-decorative-two-icon:rgba(175, 41, 78, 1); --p-decorative-two-surface:rgba(255, 196, 176, 1); --p-decorative-two-text:rgba(73, 11, 28, 1); --p-decorative-three-icon:rgba(0, 109, 65, 1); --p-decorative-three-surface:rgba(146, 230, 181, 1); --p-decorative-three-text:rgba(0, 47, 25, 1); --p-decorative-four-icon:rgba(0, 106, 104, 1); --p-decorative-four-surface:rgba(145, 224, 214, 1); --p-decorative-four-text:rgba(0, 45, 45, 1); --p-decorative-five-icon:rgba(174, 43, 76, 1); --p-decorative-five-surface:rgba(253, 201, 208, 1); --p-decorative-five-text:rgba(79, 14, 31, 1); --p-border-radius-05:0.125rem; --p-border-radius-base:0.188rem; --p-border-radius-1:0.25rem; --p-border-radius-large:0.375rem;  --p-border-radius-2:0.5rem; --p-border-radius-3:0.75rem; --p-border-radius-4:1rem; --p-border-radius-5:1.25rem; --p-border-radius-half:50%; --p-card-shadow:0px 0px 5px var(--p-shadow-from-ambient-light), 0px 1px 2px var(--p-shadow-from-direct-light); --p-popover-shadow:-1px 0px 20px var(--p-shadow-from-ambient-light), 0px 1px 5px var(--p-shadow-from-direct-light); --p-modal-shadow:0px 26px 80px var(--p-shadow-from-dim-light), 0px 0px 1px var(--p-shadow-from-dim-light); --p-top-bar-shadow:0 2px 2px -1px var(--p-shadow-from-direct-light); --p-button-drop-shadow:0 1px 0 rgba(0, 0, 0, 0.05); --p-button-inner-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.2); --p-button-pressed-inner-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.15); --p-override-none:none; --p-override-transparent:transparent; --p-override-one:1; --p-override-visible:visible; --p-override-zero:0; --p-override-loading-z-index:514; --p-non-null-content:''; --p-choice-size:2rem; --p-icon-size:1rem; --p-choice-margin:0.1rem; --p-control-border-width:0.2rem; --p-banner-border-default:inset 0 0.1rem 0 0 var(--p-border-neutral-subdued), inset 0 0 0 0.1rem var(--p-border-neutral-subdued); --p-banner-border-success:inset 0 0.1rem 0 0 var(--p-border-success-subdued), inset 0 0 0 0.1rem var(--p-border-success-subdued); --p-banner-border-highlight:inset 0 0.1rem 0 0 var(--p-border-highlight-subdued), inset 0 0 0 0.1rem var(--p-border-highlight-subdued); --p-banner-border-warning:inset 0 0.1rem 0 0 var(--p-border-warning-subdued), inset 0 0 0 0.1rem var(--p-border-warning-subdued); --p-banner-border-critical:inset 0 0.1rem 0 0 var(--p-border-critical-subdued), inset 0 0 0 0.1rem var(--p-border-critical-subdued); --p-badge-mix-blend-mode:luminosity; --p-thin-border-subdued:0.1rem solid var(--p-border-subdued); --p-text-field-spinner-offset:0.2rem; --p-text-field-focus-ring-offset:-0.4rem; --p-button-group-item-spacing:-0.1rem; --p-duration-0:0ms; --p-duration-50:50ms; --p-duration-100:100ms; --p-duration-150:150ms; --p-duration-200:200ms; --p-duration-250:250ms; --p-duration-300:300ms; --p-duration-350:350ms; --p-duration-400:400ms; --p-duration-450:450ms; --p-duration-500:500ms; --p-ease:cubic-bezier(0.25, 0.1, 0.25, 1);--p-ease-in:cubic-bezier(0.36, 0, 1, 1); --p-ease-out:cubic-bezier(0, 0, 0.42, 1); --p-ease-excite:cubic-bezier(0.18, 0.67, 0.6, 1.22); --p-range-slider-thumb-size-base:1.6rem; --p-range-slider-thumb-size-active:2.4rem; --p-range-slider-thumb-scale:1.5; --p-frame-offset:0px; --p-font-weight-regular: 400px; --p-font-weight-medium: 500px; --p-font-weight-semibold: 600px; --p-font-weight-bold: 700px;"
 ></div>
 ```
 
diff --git a/src/components/RadioButton/RadioButton.scss b/src/components/RadioButton/RadioButton.scss
index 444b94fea0f..b7e6001c8a7 100644
--- a/src/components/RadioButton/RadioButton.scss
+++ b/src/components/RadioButton/RadioButton.scss
@@ -14,7 +14,7 @@
 
     // stylelint-disable-next-line selector-max-specificity, selector-max-class
     &::after {
-      border-radius: var(--p-border-radius-6);
+      border-radius: var(--p-border-radius-half);
     }
   }
 
@@ -50,7 +50,7 @@
   width: 100%;
   height: 100%;
   border: var(--p-control-border-width) solid var(--p-border);
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   background-color: var(--p-surface);
   transition: border-color var(--p-duration-100) var(--p-ease);
 
@@ -65,7 +65,7 @@
     height: var(--p-icon-size);
     width: var(--p-icon-size);
     background-color: var(--p-interactive);
-    border-radius: var(--p-border-radius-6);
+    border-radius: var(--p-border-radius-half);
     transition: opacity var(--p-duration-100) var(--p-ease),
       transform var(--p-duration-100) var(--p-ease);
 
@@ -77,7 +77,7 @@
   @include focus-ring($border-width: var(--p-control-border-width));
 
   &::after {
-    border-radius: var(--p-border-radius-6);
+    border-radius: var(--p-border-radius-half);
   }
 
   &.hover,
diff --git a/src/components/RangeSlider/components/DualThumb/DualThumb.scss b/src/components/RangeSlider/components/DualThumb/DualThumb.scss
index 5ebafe361f8..b366bc81c8e 100644
--- a/src/components/RangeSlider/components/DualThumb/DualThumb.scss
+++ b/src/components/RangeSlider/components/DualThumb/DualThumb.scss
@@ -84,7 +84,7 @@ $range-thumb-border-error: 2px solid var(--p-border-critical);
   padding: 0;
   width: var(--pc-range-slider-thumb-size);
   height: var(--pc-range-slider-thumb-size);
-  border-radius: var(--p-border-radius-6);
+  border-radius: var(--p-border-radius-half);
   border: border-width() solid var(--p-interactive);
   background: linear-gradient(var(--p-interactive), var(--p-interactive));
   -webkit-tap-highlight-color: transparent;
@@ -161,7 +161,7 @@ $range-output-spacing: 16px;
   height: $range-output-size;
   background-color: var(--p-surface);
   box-shadow: var(--p-popover-shadow);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
   transition-property: transform;
   transition-duration: var(--p-duration-150);
   transition-timing-function: var(--p-ease);
diff --git a/src/components/RangeSlider/components/SingleThumb/SingleThumb.scss b/src/components/RangeSlider/components/SingleThumb/SingleThumb.scss
index c2b8307637a..cf7b58e6212 100644
--- a/src/components/RangeSlider/components/SingleThumb/SingleThumb.scss
+++ b/src/components/RangeSlider/components/SingleThumb/SingleThumb.scss
@@ -61,9 +61,7 @@
     var(--pc-single-thumb-progress-upper) 100%;
 
   @mixin rangeSliderThumbPosition($size) {
-    margin-top: calc(
-      -1 * (#{$size} - #{var(--pc-range-slider-track-height)}) / 2
-    );
+    margin-top: calc(-1 * (#{$size} - var(--pc-range-slider-track-height)) / 2);
   }
 
   &::-ms-tooltip {
@@ -93,7 +91,7 @@
     width: var(--pc-range-slider-thumb-size);
     height: var(--pc-range-slider-thumb-size);
     border: 1px solid transparent;
-    border-radius: var(--p-border-radius-6);
+    border-radius: var(--p-border-radius-half);
     background: linear-gradient(var(--p-interactive), var(--p-interactive));
     box-shadow: 0 0 0 0 var(--p-focused);
     appearance: none;
@@ -162,9 +160,7 @@
 /// Output value indicator
 $range-output-size: 32px;
 $range-output-translate-x: calc(
-  -50% + var(--Polaris-RangeSlider-output-factor) * #{var(
-      --pc-range-slider-thumb-size
-    )}
+  -50% + var(--Polaris-RangeSlider-output-factor) * var(--pc-range-slider-thumb-size)
 );
 
 $range-output-spacing: 16px;
@@ -188,7 +184,7 @@ $range-output-spacing: 16px;
     opacity: 1;
     visibility: visible;
     bottom: calc(
-      #{var(--pc-range-slider-thumb-size)} + #{$range-thumb-size-difference}
+      var(--pc-range-slider-thumb-size) + #{$range-thumb-size-difference}
     );
   }
 }
@@ -201,7 +197,7 @@ $range-output-spacing: 16px;
   min-width: $range-output-size;
   height: $range-output-size;
   background-color: var(--p-surface);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
   transition-property: transform;
   transition-duration: var(--p-duration-200);
   transition-timing-function: var(--p-ease);
diff --git a/src/components/Tag/Tag.scss b/src/components/Tag/Tag.scss
index 905f052e50e..e5ef6878592 100644
--- a/src/components/Tag/Tag.scss
+++ b/src/components/Tag/Tag.scss
@@ -69,7 +69,7 @@ $icon-size: 16px;
   height: $height;
   width: $height;
   margin-left: var(--p-space-1);
-  border-radius: 0 border-radius() border-radius() 0;
+  border-radius: 0 var(--p-border-radius-base) var(--p-border-radius-base) 0;
 
   &:hover {
     background: var(--p-surface-neutral-hovered);
diff --git a/src/components/TextStyle/TextStyle.scss b/src/components/TextStyle/TextStyle.scss
index 30e8b155943..73da1ef7246 100644
--- a/src/components/TextStyle/TextStyle.scss
+++ b/src/components/TextStyle/TextStyle.scss
@@ -11,7 +11,7 @@
 .variationCode {
   position: relative;
   padding: 0 var(--p-space-1);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
   background-color: var(--p-surface-subdued);
   display: inline-block;
   font-size: 1.15em;
diff --git a/src/components/Tooltip/components/TooltipOverlay/TooltipOverlay.scss b/src/components/Tooltip/components/TooltipOverlay/TooltipOverlay.scss
index ba34e7b1860..ddf0a17b9a9 100644
--- a/src/components/Tooltip/components/TooltipOverlay/TooltipOverlay.scss
+++ b/src/components/Tooltip/components/TooltipOverlay/TooltipOverlay.scss
@@ -28,7 +28,7 @@ $content-max-width: 200px;
 
 .Content {
   position: relative;
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
   background-color: var(--p-surface);
   color: var(--p-text);
   max-width: $content-max-width;
diff --git a/src/components/TopBar/TopBar.scss b/src/components/TopBar/TopBar.scss
index fe8979add9f..716477fdd91 100644
--- a/src/components/TopBar/TopBar.scss
+++ b/src/components/TopBar/TopBar.scss
@@ -66,7 +66,7 @@ $context-control-expand-after: 1400px;
   margin-left: calc(var(--p-space-2) + 2px);
   margin-right: var(--p-space-2);
   padding: var(--p-space-2);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
   fill: var(--p-icon); // Icon will inherit this fill
   transition: var(--p-duration-150) fill var(--p-ease) 33ms;
 
diff --git a/src/components/TopBar/components/Menu/Menu.scss b/src/components/TopBar/components/Menu/Menu.scss
index e9cb4620fc9..15ece2a3e3e 100644
--- a/src/components/TopBar/components/Menu/Menu.scss
+++ b/src/components/TopBar/components/Menu/Menu.scss
@@ -32,7 +32,7 @@ $activator-variables: (
   cursor: pointer;
   transition: menu(transition);
   margin-right: var(--p-space-2);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
 
   &:focus {
     @include focus-ring($style: 'focused');
diff --git a/src/styles/_common.scss b/src/styles/_common.scss
index 9ef86230647..b35ab8dada4 100644
--- a/src/styles/_common.scss
+++ b/src/styles/_common.scss
@@ -8,7 +8,6 @@
 @import './foundation/colors';
 @import './foundation/border-width';
 @import './foundation/borders';
-@import './foundation/border-radius';
 @import './foundation/layout';
 @import './foundation/shadows';
 @import './foundation/typography';
diff --git a/src/styles/_public-api.scss b/src/styles/_public-api.scss
index f81aae032d9..7c87e041630 100644
--- a/src/styles/_public-api.scss
+++ b/src/styles/_public-api.scss
@@ -21,7 +21,6 @@
 @import './foundation/spacing';
 @import './foundation/border-width';
 @import './foundation/borders';
-@import './foundation/border-radius';
 @import './foundation/layout';
 @import './foundation/shadows';
 @import './foundation/typography';
diff --git a/src/styles/foundation/_border-radius.scss b/src/styles/foundation/_border-radius.scss
deleted file mode 100644
index b2f8ba7c4c6..00000000000
--- a/src/styles/foundation/_border-radius.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-$border-radius-data: (
-  base: 3px,
-  large: 6px,
-);
-
-/// Returns the border radius of the specified size.
-/// @param {String} $size - The border radius’s size.
-/// @return {Number} The border radius value.
-
-@function border-radius($size: base) {
-  @return map-get($border-radius-data, $size);
-}
diff --git a/src/styles/shared/_buttons.scss b/src/styles/shared/_buttons.scss
index 4ed8dd6b671..0ab05ed2acf 100644
--- a/src/styles/shared/_buttons.scss
+++ b/src/styles/shared/_buttons.scss
@@ -208,7 +208,7 @@
   padding: 2px 5px;
   margin: -2px -5px;
   background: var(--p-action-secondary-hovered);
-  border-radius: border-radius();
+  border-radius: var(--p-border-radius-base);
 }
 
 @mixin unstyled-button() {
diff --git a/src/styles/shared/_skeleton.scss b/src/styles/shared/_skeleton.scss
index bc3e71654f4..9ce8666d002 100644
--- a/src/styles/shared/_skeleton.scss
+++ b/src/styles/shared/_skeleton.scss
@@ -25,7 +25,7 @@ $thumbnail-sizes: (
     left: 0;
     display: block;
     background-color: var(--p-surface-neutral);
-    border-radius: border-radius();
+    border-radius: var(--p-border-radius-base);
 
     @media screen and (-ms-high-contrast: active) {
       background-color: ms-high-contrast-color('disabled-text');
diff --git a/src/tokens/_shape.ts b/src/tokens/_shape.ts
index 273c3ff55ec..11cc1e48fef 100644
--- a/src/tokens/_shape.ts
+++ b/src/tokens/_shape.ts
@@ -8,5 +8,7 @@ export const shape: TokenGroup = {
   'border-radius-3': rem('12px'),
   'border-radius-4': rem('16px'),
   'border-radius-5': rem('20px'),
-  'border-radius-6': '50%',
+  'border-radius-base': rem('3px'),
+  'border-radius-large': rem('6px'),
+  'border-radius-half': '50%',
 };