diff --git a/packages/gamut/src/Form/styles/Checkbox-styles.ts b/packages/gamut/src/Form/styles/Checkbox-styles.ts
index f09ad111b87..60075e69b3c 100644
--- a/packages/gamut/src/Form/styles/Checkbox-styles.ts
+++ b/packages/gamut/src/Form/styles/Checkbox-styles.ts
@@ -37,8 +37,8 @@ export const checkboxElement = system.css({
   minWidth: 22,
   width: 22,
   height: 22,
-  borderColor: 'currentColor',
-  borderRadius: '4px' as keyof typeof theme.borderRadii, // hardcoded so that it is not impacted by the theme’s border-radius token
+  borderColor: 'border-primary',
+  borderRadius: '4px' as keyof typeof theme.borderRadii, // hardcoded so that it is not impacted by the theme's border-radius token
   borderStyle: 'solid',
   borderWidth: '2px',
   transition: transitionConcat(
@@ -69,6 +69,7 @@ export const checkboxElementStates = system.states({
   },
   active: {
     color: 'primary',
+    borderColor: 'primary',
   },
   disabled: {
     color: 'text-disabled',
diff --git a/packages/gamut/src/Form/styles/Radio-styles.ts b/packages/gamut/src/Form/styles/Radio-styles.ts
index 950e05dfd29..21aeccaa029 100644
--- a/packages/gamut/src/Form/styles/Radio-styles.ts
+++ b/packages/gamut/src/Form/styles/Radio-styles.ts
@@ -40,7 +40,7 @@ export const radioLabel = css({
   [InputSelectors.BEFORE_AND_AFTER]: consistentLabelStyles,
   [InputSelectors.BEFORE]: {
     bg: 'background',
-    boxShadow: `0 0 0 1px ${theme.colors[`text-disabled`]}`,
+    boxShadow: `0 0 0 1px ${theme.colors[`border-primary`]}`,
     transition: timing.medium,
   },
   [InputSelectors.AFTER]: {