diff --git a/.changeset/red-flowers-own.md b/.changeset/red-flowers-own.md
new file mode 100644
index 0000000000..45c0f5ab69
--- /dev/null
+++ b/.changeset/red-flowers-own.md
@@ -0,0 +1,5 @@
+---
+"@primer/css": patch
+---
+
+Use `control` borders for subnav + disabled button fix
diff --git a/src/buttons/button.scss b/src/buttons/button.scss
index b597521052..bf3995ade5 100644
--- a/src/buttons/button.scss
+++ b/src/buttons/button.scss
@@ -93,8 +93,8 @@
   &.disabled,
   &[aria-disabled='true'] {
     color: var(--fgColor-disabled, var(--color-primer-fg-disabled));
-    background-color: var(--button-default-bgColor-rest, var(--color-btn-bg));
-    border-color: var(--button-default-borderColor-rest, var(--color-btn-border));
+    background-color: var(--button-default-bgColor-disabled, var(--color-btn-bg));
+    border-color: var(--button-default-borderColor-disabled, var(--color-btn-border));
 
     .octicon {
       color: var(--fgColor-disabled, var(--color-primer-fg-disabled));
diff --git a/src/navigation/subnav.scss b/src/navigation/subnav.scss
index eca46552b8..acfe1639c9 100644
--- a/src/navigation/subnav.scss
+++ b/src/navigation/subnav.scss
@@ -28,7 +28,7 @@
   // stylelint-disable-next-line primer/typography
   line-height: 20px;
   color: var(--fgColor-default, var(--color-fg-default));
-  border: $border-width $border-style var(--borderColor-default, var(--color-border-default));
+  border: $border-width $border-style var(--control-borderColor-rest, var(--color-border-default));
 
   + .subnav-item {
     // stylelint-disable-next-line primer/spacing