diff --git a/browser/components/aboutlogins/content/components/login-item.css b/browser/components/aboutlogins/content/components/login-item.css
index 1979a57148c9..69f46ebaa1b6 100644
--- a/browser/components/aboutlogins/content/components/login-item.css
+++ b/browser/components/aboutlogins/content/components/login-item.css
@@ -337,6 +337,16 @@ input[name="password"] {
   background-image: url("chrome://browser/content/aboutlogins/icons/hide-password.svg") !important;
 }
 
+.reveal-password-checkbox:-moz-focusring {
+  outline: 2px solid var(--in-content-border-active);
+  /* offset outline to align with 1px border-width set for buttons/menulists above. */
+  outline-offset: -1px;
+  /* Make outline-radius slightly bigger than the border-radius set above,
+   * to make the thicker outline corners look smooth */
+  -moz-outline-radius: 3px;
+  box-shadow: 0 0 0 4px var(--in-content-border-active-shadow);
+}
+
 .login-item-favicon {
   width: 24px;
 }
diff --git a/browser/components/aboutlogins/content/components/login-list.css b/browser/components/aboutlogins/content/components/login-list.css
index 3a6e386e0b9b..1a5eb2d337f9 100644
--- a/browser/components/aboutlogins/content/components/login-list.css
+++ b/browser/components/aboutlogins/content/components/login-list.css
@@ -126,8 +126,8 @@ ol {
 }
 
 .login-list-item.keyboard-selected {
-  border-inline-start-color: var(--in-content-border-color);
-  background-color: var(--in-content-page-background);
+  border-inline-start-color: var(--in-content-border-active-shadow);
+  background-color: var(--in-content-box-background-odd);
 }
 
 .login-list-item.selected {
diff --git a/browser/extensions/formautofill/skin/shared/editAddress.css b/browser/extensions/formautofill/skin/shared/editAddress.css
index 8785835a083b..41c0bf7c6b85 100644
--- a/browser/extensions/formautofill/skin/shared/editAddress.css
+++ b/browser/extensions/formautofill/skin/shared/editAddress.css
@@ -43,7 +43,7 @@ dialog:not([subdialog]) .editAddressForm {
 /* When there is focus within any of the name fields, the border of the inputs
  * should be the focused color, except for inner ones which get overriden below. */
 #name-container:focus-within input {
-  border-color: var(--in-content-focus-outline-color);
+  border-color: var(--in-content-border-active);
 }
 
 /* Invalid name fields should show the error outline instead of the focus border */
diff --git a/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js b/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
index 1a57afef40bf..9ecc495f6e3b 100644
--- a/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
+++ b/browser/extensions/formautofill/test/browser/browser_editAddressDialog.js
@@ -714,7 +714,7 @@ add_task(async function test_combined_name_fields() {
     let borderColorFocused = "rgb(0, 0, 255)";
     doc.body.style.setProperty("--in-content-box-border-color", borderColor);
     doc.body.style.setProperty(
-      "--in-content-focus-outline-color",
+      "--in-content-border-active",
       borderColorFocused
     );
 
diff --git a/toolkit/components/certviewer/content/components/certificate-section.css b/toolkit/components/certviewer/content/components/certificate-section.css
index c111a158ec05..5dbd7a3ade5c 100644
--- a/toolkit/components/certviewer/content/components/certificate-section.css
+++ b/toolkit/components/certviewer/content/components/certificate-section.css
@@ -11,7 +11,7 @@ h1 {
 .certificate-tabs {
   display: flex;
   text-align: center;
-  border-bottom: 1px solid var(--in-content-border-color);
+  border-bottom: 1px solid var(--in-content-border-active);
   box-shadow: var(--card-shadow);
 }
 
@@ -60,12 +60,12 @@ h1 {
 }
 
 .tab:hover {
-  border-bottom-color: var(--in-content-border-color);
+  border-bottom-color: var(--in-content-border-active-shadow);
 }
 
 .tab.selected {
-  border-bottom-color: currentColor;
-  color: var(--in-content-accent-color);
+  border-bottom-color: var(--in-content-border-active);
+  color: var(--in-content-link-color);
   text-overflow: unset;
   overflow: visible;
 }
diff --git a/toolkit/components/printing/content/toggle-group.css b/toolkit/components/printing/content/toggle-group.css
index c3491bd1875d..fb28981a778c 100644
--- a/toolkit/components/printing/content/toggle-group.css
+++ b/toolkit/components/printing/content/toggle-group.css
@@ -56,12 +56,16 @@
 }
 
 .toggle-group-input:-moz-focusring + .toggle-group-label {
-  outline: 2px solid var(--in-content-focus-outline-color);
-  outline-offset: 2px;
+  box-shadow: 0 0 0 1px var(--border-color), 0 0 0 4px rgba(10, 132, 255, 0.3);
+  outline: none;
   z-index: 1;
 }
 
-.toggle-group-input:enabled:checked + .toggle-group-label {
+.toggle-group-input:checked:-moz-focusring + .toggle-group-label {
+  box-shadow: 0 0 0 1px var(--in-content-border-active), 0 0 0 4px rgba(10, 132, 255, 0.3);
+}
+
+.toggle-group-input:enabled:checked + .toggle-group-label{
   background-color: var(--in-content-primary-button-background);
   color: var(--in-content-selected-text);
 }
diff --git a/toolkit/themes/osx/global/in-content/common.css b/toolkit/themes/osx/global/in-content/common.css
index aa3a80ed69cc..143809785ae6 100644
--- a/toolkit/themes/osx/global/in-content/common.css
+++ b/toolkit/themes/osx/global/in-content/common.css
@@ -40,6 +40,20 @@ xul|*.text-link:-moz-focusring {
   box-shadow: none;
 }
 
+xul|checkbox:-moz-focusring > .checkbox-check,
+xul|radio[focused="true"] > .radio-check,
+xul|tab:-moz-focusring > .tab-middle {
+  outline: 2px solid var(--in-content-focus-outline-color);
+  /* offset outline to align with 1px border-width set for buttons/menulists above. */
+  outline-offset: var(--in-content-focus-outline-offset);
+  -moz-outline-radius: var(--in-content-focus-outline-radius);
+  box-shadow: 0 0 0 4px var(--in-content-button-box-shadow);
+}
+
+xul|radio[focused="true"] > .radio-check {
+  -moz-outline-radius: 100%;
+}
+
 xul|search-textbox::part(search-sign) {
   -moz-context-properties: fill, fill-opacity;
   fill: currentColor;
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 6e4c1dc32093..98721524eef8 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -21,9 +21,12 @@
   --in-content-accent-color: #0a84ff;
   --in-content-accent-color-active: #0060df;
   --in-content-border-hover: var(--grey-90-a50);
+  --in-content-border-active: var(--blue-50);
+  --in-content-border-active-shadow: var(--blue-50-a30);
   --in-content-border-invalid: var(--red-50);
   --in-content-border-invalid-shadow: var(--red-50-a30);
   --in-content-border-color: #d7d7db;
+  --in-content-category-outline-focus: 1px dotted #0a84ff;
   --in-content-link-color: var(--blue-60);
   --in-content-link-color-hover: var(--blue-70);
   --in-content-link-color-active: var(--blue-80);
@@ -35,11 +38,17 @@
   --in-content-primary-button-background: #0061e0;
   --in-content-primary-button-background-hover: #0250bb;
   --in-content-primary-button-background-active: #053e94;
+  /* Once proton ships, these can probably stop being variables. */
+  --in-content-button-border-radius: 4px;
+  /* Make outline-radius slightly bigger than the border-radius,
+   * to make the thicker outline corners look smooth */
+  --in-content-focus-outline-radius: 6px;
+  --in-content-focus-outline-offset: 2px;
   --in-content-focus-outline-color: var(--in-content-primary-button-background);
+  --in-content-button-box-shadow: transparent;
 
   /* Note: 1px smaller than we want because we have a 1px transparent border. */
   /* Once proton ships, these can probably stop being variables. */
-  --in-content-button-border-radius: 4px;
   --in-content-button-horizontal-padding: 15px;
   --in-content-button-vertical-padding: 7px;
 
@@ -110,11 +119,15 @@
   --in-content-primary-button-background-hover: var(--blue-70);
   --in-content-primary-button-background-active: var(--blue-80);
   --in-content-button-border-radius: 2px;
-  --in-content-focus-outline-color: var(--blue-50);
+  --in-content-focus-outline-radius: 3px;
+  --in-content-focus-outline-offset: -1px;
+  --in-content-focus-outline-color: var(--in-content-border-active);
 
   --in-content-button-horizontal-padding: 8px;
   --in-content-button-vertical-padding: 0;
 
+  --in-content-button-box-shadow: var(--in-content-border-active-shadow);
+
   --in-content-table-background: #ebebeb;
 }
 }
@@ -302,18 +315,15 @@ html|button {
 button:-moz-focusring,
 html|select:-moz-focusring,
 html|input:is([type="checkbox"], [type="color"], [type="radio"]):-moz-focusring,
-xul|menulist:-moz-focusring,
-xul|checkbox:not([native]):-moz-focusring > .checkbox-check, /* :not([native]) to win specificity over checkbox.css */
-xul|radio[focused="true"] > .radio-check,
-xul|tab:-moz-focusring > .tab-middle > .tab-text {
-  box-shadow: none;
+xul|menulist:-moz-focusring {
   outline: 2px solid var(--in-content-focus-outline-color);
-  outline-offset: 2px;
-  -moz-outline-radius: 6px;
+  /* offset outline to align with 1px border-width set for buttons/menulists above. */
+  outline-offset: var(--in-content-focus-outline-offset);
+  -moz-outline-radius: var(--in-content-focus-outline-radius);
+  box-shadow: 0 0 0 4px var(--in-content-button-box-shadow);
 }
 
-html|input[type="radio"]:-moz-focusring,
-xul|radio[focused="true"] > .radio-check {
+html|input[type="radio"]:-moz-focusring {
   -moz-outline-radius: 100%;
 }
 
@@ -522,27 +532,22 @@ xul|search-textbox:not([disabled="true"], [focused]):hover {
 html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):focus,
 html|textarea:focus,
 xul|search-textbox[focused] {
-  border-color: var(--in-content-focus-outline-color);
-  outline: 1px solid var(--in-content-focus-outline-color);
+  border-color: var(--in-content-border-active);
+  box-shadow: 0 0 0 1px var(--in-content-border-active),
+    0 0 0 4px var(--in-content-border-active-shadow);
+  outline: none;
 }
 
 html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid,
 html|textarea:-moz-ui-invalid {
   border-color: var(--in-content-border-invalid);
-  outline: 1px solid var(--in-content-border-invalid);
 }
 
-@supports not -moz-bool-pref("browser.proton.enabled") {
-html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):focus,
-html|textarea:focus,
-xul|search-textbox[focused] {
-  box-shadow: 0 0 0 4px var(--blue-50-a30);
+/* Don't show the field error outlines and focus borders at the same time. */
+html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid:focus,
+html|textarea:-moz-ui-invalid:focus {
+  box-shadow: 0 0 0 3px var(--in-content-border-invalid-shadow);
 }
-html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid,
-html|textarea:-moz-ui-invalid {
-  box-shadow: 0 0 0 4px var(--red-50-a30);
-}
-} /*** END !proton ***/
 
 html|input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled,
 html|textarea:disabled,
@@ -737,7 +742,7 @@ xul|label[disabled="true"] {
   margin: 70px 0 0;
   border-width: 0;
   width: var(--in-content-sidebar-width);
-  outline: none;
+  box-shadow: none;
 }
 
 @media print {
@@ -752,7 +757,6 @@ html|*#categories {
 }
 
 #categories > .category {
-  border-radius: 4px;
   min-height: 48px;
   appearance: none;
   margin-inline-start: 34px;
@@ -781,6 +785,7 @@ html|*#categories > html|*.category:dir(rtl) {
 
 #categories > .category:hover {
   background-color: var(--in-content-button-background-hover);
+  border-radius: 4px;
 }
 
 #categories > .category:hover:active {
@@ -788,12 +793,9 @@ html|*#categories > html|*.category:dir(rtl) {
 }
 
 @supports not -moz-bool-pref("browser.proton.enabled") {
-#categories > .category {
-  border-radius: 2px;
-}
-
 #categories > .category:hover {
   background-color: var(--in-content-button-background);
+  border-radius: 2px;
 }
 
 #categories > .category:hover:active {
@@ -816,14 +818,13 @@ html|*#categories > html|*.category:dir(rtl) {
   color: var(--in-content-accent-color-active) !important;
 }
 
-#categories[keyboard-navigation="true"]:-moz-focusring > .category[current],
-#categories > .category:-moz-focusring {
-  outline: 2px solid var(--in-content-focus-outline-color);
-  outline-offset: -2px;
+#categories[keyboard-navigation="true"]:-moz-focusring > .category[current] {
+  outline: var(--in-content-category-outline-focus);
 }
 
 html|*#categories[last-input-type="mouse"] > html|button.category:-moz-focusring {
   outline: none;
+  box-shadow: none;
 }
 
 .category-name {
@@ -976,8 +977,9 @@ xul|tree {
 
 xul|tree:-moz-focusring,
 xul|richlistbox:-moz-focusring {
-  border-color: var(--in-content-focus-outline-color);
-  outline: 1px solid var(--in-content-focus-outline-color);
+  border-color: var(--in-content-border-active);
+  box-shadow: 0 0 0 1px var(--in-content-border-active),
+    0 0 0 4px var(--in-content-border-active-shadow);
 }
 
 xul|treecols {
@@ -1141,7 +1143,7 @@ input[type="text"][warning]:enabled:not(:focus) {
 .sidebar-footer-link {
   height: 36px;
   cursor: default;
-  border-radius: 4px;
+  border-radius: 2px;
   display: flex;
   align-items: center;
 
@@ -1164,10 +1166,6 @@ xul|*.sidebar-footer-link {
 }
 
 @supports not -moz-bool-pref("browser.proton.enabled") {
-.sidebar-footer-link {
-  border-radius: 2px;
-}
-
 .sidebar-footer-link:hover {
   background-color: var(--in-content-button-background);
 }
@@ -1178,9 +1176,8 @@ xul|*.sidebar-footer-link {
 } /*** END !proton ***/
 
 .sidebar-footer-link:-moz-focusring {
-  outline: 2px solid var(--in-content-focus-outline-color);
-  outline-offset: -2px;
-  -moz-outline-radius: 6px;
+  outline: var(--in-content-category-outline-focus);
+  outline-offset: -1px;
 }
 
 .sidebar-footer-icon {
diff --git a/toolkit/themes/shared/in-content/toggle-button.css b/toolkit/themes/shared/in-content/toggle-button.css
index 10b351f9ee05..a64f5dc13029 100644
--- a/toolkit/themes/shared/in-content/toggle-button.css
+++ b/toolkit/themes/shared/in-content/toggle-button.css
@@ -36,8 +36,10 @@ input[type="checkbox"].toggle-button:enabled:active {
   border-color: var(--border-color);
 }
 input[type="checkbox"].toggle-button:focus {
-  outline: 2px solid var(--in-content-focus-outline-color);
-  outline-offset: var(--in-content-focus-outline-offset);
+  box-shadow: 0 0 0 1px var(--border-color), 0 0 0 4px rgba(10, 132, 255, 0.3);
+}
+input[type="checkbox"].toggle-button:checked:focus {
+  box-shadow: 0 0 0 1px var(--in-content-border-active), 0 0 0 4px rgba(10, 132, 255, 0.3);
 }
 
 input[type="checkbox"].toggle-button:checked {