diff --git a/src/lib/components/Button/_tools.scss b/src/lib/components/Button/_tools.scss
index d1287c672..aba8fab44 100644
--- a/src/lib/components/Button/_tools.scss
+++ b/src/lib/components/Button/_tools.scss
@@ -105,10 +105,6 @@
         opacity: theme.$disabled-opacity;
         cursor: theme.$disabled-cursor;
     }
-
-    &:-moz-focusring {
-        outline: 0;
-    }
 }
 
 @mixin button-size($size) {
diff --git a/src/lib/foundation.scss b/src/lib/foundation.scss
index f53980d4f..0fd9e9678 100644
--- a/src/lib/foundation.scss
+++ b/src/lib/foundation.scss
@@ -9,6 +9,7 @@
 
 @use "styles/generic/box-sizing";
 @use "normalize.css/normalize.css";
+@use "styles/generic/focus";
 @use "styles/generic/forms";
 @use "styles/generic/reset";
 @use "styles/generic/shared";
diff --git a/src/lib/styles/generic/_focus.scss b/src/lib/styles/generic/_focus.scss
new file mode 100644
index 000000000..ce8f0f37f
--- /dev/null
+++ b/src/lib/styles/generic/_focus.scss
@@ -0,0 +1,11 @@
+@use "../tools/accessibility";
+
+// Remove focus outline as we implement custom appearance of focus state. Increase specificity where necessary to
+// override normalize.css.
+:where(button, input, select, textarea):focus {
+    outline: none;
+}
+
+:is(a, button, input, select, textarea, [type="button"], [type="submit"]) {
+    @include accessibility.focus-ring();
+}
diff --git a/src/lib/styles/generic/_forms.scss b/src/lib/styles/generic/_forms.scss
index 7996bbfba..223b98c59 100644
--- a/src/lib/styles/generic/_forms.scss
+++ b/src/lib/styles/generic/_forms.scss
@@ -1,15 +1,3 @@
-@use "../tools/accessibility";
-
-// Remove focus outline as we implement custom appearance of focus state. Increase specificity where necessary to
-// override normalize.css.
-:where(button, input, select, textarea):focus {
-    outline: none;
-}
-
-:is(a, button, input, select, textarea, [type="button"], [type="submit"]) {
-    @include accessibility.focus-ring();
-}
-
 // Reset Chrome and Firefox behaviour which sets a `min-width: min-content;` on fieldsets.
 fieldset {
     min-width: 0;
diff --git a/src/lib/styles/tools/_reset.scss b/src/lib/styles/tools/_reset.scss
index 45348bcb3..1417144f1 100644
--- a/src/lib/styles/tools/_reset.scss
+++ b/src/lib/styles/tools/_reset.scss
@@ -19,7 +19,6 @@
     &:hover,
     &:focus {
         text-decoration: none;
-        outline: none;
     }
 }