diff --git a/browser/base/content/aboutTabCrashed.xhtml b/browser/base/content/aboutTabCrashed.xhtml
index 446e9e3f3e2d..0f8fa01e5f59 100644
--- a/browser/base/content/aboutTabCrashed.xhtml
+++ b/browser/base/content/aboutTabCrashed.xhtml
@@ -77,7 +77,7 @@
       <div class="button-container">
         <button id="closeTab" data-l10n-id="crashed-close-tab-button"></button>
         <button id="restoreTab" class="primary" data-l10n-id="crashed-restore-tab-button"></button>
-        <button id="restoreAll" autofocus="true" data-l10n-id="crashed-restore-all-button"/>
+        <button id="restoreAll" autofocus="true" class="primary" data-l10n-id="crashed-restore-all-button"></button>
       </div>
     </div>
   </body>
diff --git a/browser/components/aboutconfig/content/aboutconfig.html b/browser/components/aboutconfig/content/aboutconfig.html
index efcb19566fa4..872fb4b6905e 100644
--- a/browser/components/aboutconfig/content/aboutconfig.html
+++ b/browser/components/aboutconfig/content/aboutconfig.html
@@ -37,7 +37,7 @@
       </div>
 
       <div class="button-container">
-        <button autofocus onclick="onWarningButtonClick();"
+        <button autofocus class="primary" onclick="onWarningButtonClick();"
                 data-l10n-id="about-config-warning-button"></button>
       </div>
     </div>
diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css
index 53e76ba335d7..18ad08e329fd 100644
--- a/toolkit/themes/shared/in-content/common.inc.css
+++ b/toolkit/themes/shared/in-content/common.inc.css
@@ -255,19 +255,16 @@ xul|menulist[disabled="true"] {
   opacity: 0.4;
 }
 
-html|button[autofocus],
 *|button.primary {
   background-color: var(--in-content-primary-button-background);
   color: var(--in-content-selected-text) !important;
 }
 
-html|button[autofocus]:enabled:hover,
 html|button.primary:enabled:hover,
 xul|button.primary:not([disabled="true"]):hover {
   background-color: var(--in-content-primary-button-background-hover);
 }
 
-html|button[autofocus]:enabled:hover:active,
 html|button.primary:enabled:hover:active,
 xul|button.primary:not([disabled="true"]):hover:active {
   background-color: var(--in-content-primary-button-background-active);