diff --git a/packages/raystack/components/checkbox/checkbox.module.css b/packages/raystack/components/checkbox/checkbox.module.css
index bbfc4261f..e2b65f5d9 100644
--- a/packages/raystack/components/checkbox/checkbox.module.css
+++ b/packages/raystack/components/checkbox/checkbox.module.css
@@ -47,10 +47,6 @@
 
 .checkbox:focus-visible {
   outline: var(--rs-focus-ring);
-}
-
-/* Checked = accent fill: offset the ring so it clears it. */
-.checkbox[data-checked]:focus-visible {
   outline-offset: var(--rs-focus-ring-offset-accent);
 }
 
diff --git a/packages/raystack/components/code-block/code-block.module.css b/packages/raystack/components/code-block/code-block.module.css
index 082daac8a..9f2a32aab 100644
--- a/packages/raystack/components/code-block/code-block.module.css
+++ b/packages/raystack/components/code-block/code-block.module.css
@@ -3,7 +3,6 @@
   border-radius: var(--rs-radius-2);
   overflow: hidden;
   width: 100%;
-  border: 0.5px solid var(--rs-color-overlay-base-a2);
   box-sizing: border-box;
 }
 
diff --git a/packages/raystack/components/radio/radio.module.css b/packages/raystack/components/radio/radio.module.css
index 617706a64..f868bc9f2 100644
--- a/packages/raystack/components/radio/radio.module.css
+++ b/packages/raystack/components/radio/radio.module.css
@@ -47,12 +47,8 @@
   background: var(--rs-color-background-base-primary-hover);
 }
 
-.radioitem:focus-visible {
+.radioitem:focus-visible:not([data-disabled]) {
   outline: var(--rs-focus-ring);
-}
-
-/* Checked = accent fill: offset the ring so it clears it. */
-.radioitem[data-checked]:focus-visible {
   outline-offset: var(--rs-focus-ring-offset-accent);
 }
 
diff --git a/packages/raystack/components/switch/switch.module.css b/packages/raystack/components/switch/switch.module.css
index b50da087a..f147df6fd 100644
--- a/packages/raystack/components/switch/switch.module.css
+++ b/packages/raystack/components/switch/switch.module.css
@@ -14,10 +14,6 @@
 
 .switch:focus-visible {
   outline: var(--rs-focus-ring);
-}
-
-/* Checked = accent track: offset the ring so it clears it. */
-.switch[data-checked]:focus-visible {
   outline-offset: var(--rs-focus-ring-offset-accent);
 }