diff --git a/browser/actors/EncryptedMediaParent.jsm b/browser/actors/EncryptedMediaParent.jsm
index e05f03b54e11..4fa3d7755573 100644
--- a/browser/actors/EncryptedMediaParent.jsm
+++ b/browser/actors/EncryptedMediaParent.jsm
@@ -30,8 +30,8 @@ XPCOMUtils.defineLazyGetter(this, "gFluentStrings", function() {
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
-  "gProtonDoorhangersEnabled",
-  "browser.proton.doorhangers.enabled",
+  "gProtonEnabled",
+  "browser.proton.enabled",
   false
 );
 
@@ -246,7 +246,7 @@ class EncryptedMediaParent extends JSWindowActorParent {
         aBrowser.ownerGlobal.openPreferences("general-drm");
       },
       dismiss: true,
-      disableHighlight: gProtonDoorhangersEnabled,
+      disableHighlight: gProtonEnabled,
     };
 
     let secondaryActions = [
diff --git a/browser/actors/WebRTCParent.jsm b/browser/actors/WebRTCParent.jsm
index a0f7f44224a0..bd4f7baababb 100644
--- a/browser/actors/WebRTCParent.jsm
+++ b/browser/actors/WebRTCParent.jsm
@@ -47,8 +47,8 @@ XPCOMUtils.defineLazyServiceGetter(
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
-  "gProtonDoorhangersEnabled",
-  "browser.proton.doorhangers.enabled",
+  "gProtonEnabled",
+  "browser.proton.enabled",
   false
 );
 
@@ -1112,7 +1112,7 @@ function prompt(aActor, aBrowser, aRequest) {
         "webRTC-selectMicrophone-menupopup"
       );
       let describedByIDs = ["webRTC-shareDevices-notification-description"];
-      let describedBySuffix = gProtonDoorhangersEnabled ? "icon" : "label";
+      let describedBySuffix = gProtonEnabled ? "icon" : "label";
 
       if (sharingScreen) {
         listScreenShareDevices(windowMenupopup, videoDevices);
@@ -1324,7 +1324,7 @@ function prompt(aActor, aBrowser, aRequest) {
   }
   let anchorId = "webRTC-share" + iconType + "-notification-icon";
 
-  if (!gProtonDoorhangersEnabled) {
+  if (!gProtonEnabled) {
     let iconClass = iconType.toLowerCase();
     if (iconClass == "devices") {
       iconClass = "camera";
@@ -1339,7 +1339,7 @@ function prompt(aActor, aBrowser, aRequest) {
     );
   }
 
-  if (gProtonDoorhangersEnabled) {
+  if (gProtonEnabled) {
     mainAction.disableHighlight = true;
   }
 
diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 2e3d3845379c..4f1d858d4d85 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -1679,7 +1679,7 @@ var BookmarkingUI = {
       entry: "subviewbutton",
     };
 
-    if (!gProtonDoorhangers) {
+    if (!gProton) {
       extraClasses.footer = "panel-subview-footer";
     }
 
diff --git a/browser/base/content/browser-siteIdentity.js b/browser/base/content/browser-siteIdentity.js
index 0572abe547a0..5415049c0c14 100644
--- a/browser/base/content/browser-siteIdentity.js
+++ b/browser/base/content/browser-siteIdentity.js
@@ -423,7 +423,7 @@ var gIdentityHandler = {
     XPCOMUtils.defineLazyPreferenceGetter(
       this,
       "_protonEnabled",
-      "browser.proton.doorhangers.enabled",
+      "browser.proton.enabled",
       false
     );
     return this._protonEnabled;
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 1db5e7cc7668..a22e7b31a746 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -154,7 +154,7 @@ panelview[mainview] > .panel-header {
   transition: height var(--panelui-subview-transition-duration);
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 :is(panel, menupopup)::part(arrow) {
   display: none;
 }
@@ -1662,7 +1662,7 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
  * End Dialogs
  */
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 /* Password update/save doorhanger */
 #password-notification-username,
 #password-notification-password {
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 355b90a0b50a..9f02c3a1e3b9 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -573,7 +573,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
   "gProtonDoorhangers",
-  "browser.proton.doorhangers.enabled",
+  "browser.proton.enabled",
   false
 );
 
@@ -7513,7 +7513,7 @@ var IndexedDBPromptHelper = {
           Ci.nsIPermissionManager.ALLOW_ACTION
         );
       },
-      disableHighlight: gProtonDoorhangers,
+      disableHighlight: gProton,
     };
 
     var secondaryActions = [
@@ -7612,7 +7612,7 @@ var CanvasPermissionPromptHelper = {
           state && state.checkboxChecked
         );
       },
-      disableHighlight: gProtonDoorhangers,
+      disableHighlight: gProton,
     };
 
     let secondaryActions = [
@@ -7786,7 +7786,7 @@ var WebAuthnPromptHelper = {
       }
     };
 
-    if (gProtonDoorhangers) {
+    if (gProton) {
       mainAction.disableHighlight = true;
     }
 
diff --git a/browser/base/content/test/popupNotifications/head.js b/browser/base/content/test/popupNotifications/head.js
index 80e16a05c5ca..25d9c8e05b13 100644
--- a/browser/base/content/test/popupNotifications/head.js
+++ b/browser/base/content/test/popupNotifications/head.js
@@ -211,7 +211,7 @@ function checkPopup(popup, notifyObj) {
   // With Proton enabled, PopupNotifications are not expected to show icons
   // unless popupIconURL or popupIconClass is passed in the options object.
   if (
-    !gProtonDoorhangers ||
+    !gProton ||
     notifyObj.options.popupIconURL ||
     notifyObj.options.popupIconClass
   ) {
diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media.js b/browser/base/content/test/webrtc/browser_devices_get_user_media.js
index ca6131ca6940..d83caf881d52 100644
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media.js
@@ -26,7 +26,7 @@ var gTests = [
       checkDeviceSelectors(true, true);
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
           "iconclass"
         );
@@ -75,7 +75,7 @@ var gTests = [
       checkDeviceSelectors(true);
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
           "iconclass"
         );
@@ -126,7 +126,7 @@ var gTests = [
       checkDeviceSelectors(false, true);
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
           "iconclass"
         );
diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media_default_permissions.js b/browser/base/content/test/webrtc/browser_devices_get_user_media_default_permissions.js
index 59c97259b402..43a502437c12 100644
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_default_permissions.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_default_permissions.js
@@ -46,7 +46,7 @@ var gTests = [
       checkDeviceSelectors(true);
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
           "iconclass"
         );
@@ -151,7 +151,7 @@ var gTests = [
       checkDeviceSelectors(false, true);
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
           "iconclass"
         );
diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media_in_xorigin_frame.js b/browser/base/content/test/webrtc/browser_devices_get_user_media_in_xorigin_frame.js
index 91031e235579..07b9b5f628de 100644
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_in_xorigin_frame.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_in_xorigin_frame.js
@@ -99,7 +99,7 @@ async function promptNoDelegateScreenSharing(aThirdPartyOrgin) {
   const notification = PopupNotifications.panel.firstElementChild;
 
   // With Proton enabled, the icon does not appear in the panel.
-  if (!gProtonDoorhangers) {
+  if (!gProton) {
     const iconclass = notification.getAttribute("iconclass");
     ok(iconclass.includes("screen-icon"), "panel using screen icon");
   }
@@ -228,7 +228,7 @@ var gTests = [
       const notification = PopupNotifications.panel.firstElementChild;
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         const iconclass = notification.getAttribute("iconclass");
         ok(iconclass.includes("screen-icon"), "panel using screen icon");
       }
diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js b/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js
index d1a293c86312..de965453a229 100644
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js
@@ -333,7 +333,7 @@ var gTests = [
       let notification = PopupNotifications.panel.firstElementChild;
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = notification.getAttribute("iconclass");
         ok(iconclass.includes("screen-icon"), "panel using screen icon");
       }
diff --git a/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js b/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
index 63b4d4e32ea0..0b56b25d9c09 100644
--- a/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
+++ b/browser/base/content/test/webrtc/browser_devices_get_user_media_screen.js
@@ -46,7 +46,7 @@ var gTests = [
       let notification = PopupNotifications.panel.firstElementChild;
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = notification.getAttribute("iconclass");
         ok(iconclass.includes("screen-icon"), "panel using screen icon");
       }
@@ -220,7 +220,7 @@ var gTests = [
       let notification = PopupNotifications.panel.firstElementChild;
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = notification.getAttribute("iconclass");
         ok(iconclass.includes("screen-icon"), "panel using screen icon");
       }
@@ -433,7 +433,7 @@ var gTests = [
       checkDeviceSelectors(true, false, true);
 
       // With Proton enabled, the icon does not appear in the panel.
-      if (!gProtonDoorhangers) {
+      if (!gProton) {
         let iconclass = PopupNotifications.panel.firstElementChild.getAttribute(
           "iconclass"
         );
diff --git a/browser/components/customizableui/test/browser_981305_separator_insertion.js b/browser/components/customizableui/test/browser_981305_separator_insertion.js
index db6c9d4e50b1..4afbceadc0e4 100644
--- a/browser/components/customizableui/test/browser_981305_separator_insertion.js
+++ b/browser/components/customizableui/test/browser_981305_separator_insertion.js
@@ -72,9 +72,10 @@ async function checkSeparatorInsertion(menuId, buttonId, subviewId) {
 }
 
 add_task(async function check_devtools_separator() {
-  const protonEnabled =
-    Services.prefs.getBoolPref("browser.proton.doorhangers.enabled", false) &&
-    Services.prefs.getBoolPref("browser.proton.enabled", false);
+  const protonEnabled = Services.prefs.getBoolPref(
+    "browser.proton.enabled",
+    false
+  );
   const panelviewId = protonEnabled ? "appmenu-moreTools" : "PanelUI-developer";
 
   await checkSeparatorInsertion(
diff --git a/browser/components/customizableui/test/browser_proton_moreTools_panel.js b/browser/components/customizableui/test/browser_proton_moreTools_panel.js
index 097b1b4c22f9..f87a62d36b9d 100644
--- a/browser/components/customizableui/test/browser_proton_moreTools_panel.js
+++ b/browser/components/customizableui/test/browser_proton_moreTools_panel.js
@@ -15,10 +15,7 @@ add_task(async function testMoreToolsPanelInToolbar() {
   // proton prefs are applied to the new browser window for this test.
   DevToolsStartup.developerToggleCreated = false;
   await SpecialPowers.pushPrefEnv({
-    set: [
-      ["browser.proton.enabled", true],
-      ["browser.proton.doorhangers.enabled", true],
-    ],
+    set: [["browser.proton.enabled", true]],
   });
   CustomizableUI.destroyWidget("developer-button");
 
diff --git a/browser/components/downloads/content/downloads.css b/browser/components/downloads/content/downloads.css
index 3e4eb1a276fa..a8dc1be4ce0a 100644
--- a/browser/components/downloads/content/downloads.css
+++ b/browser/components/downloads/content/downloads.css
@@ -88,7 +88,7 @@
   max-width: unset;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #downloadsPanel-blockedSubview,
 #downloadsPanel-mainView {
   font: caption;
diff --git a/browser/components/fxmonitor/FirefoxMonitor.jsm b/browser/components/fxmonitor/FirefoxMonitor.jsm
index 217d8c4833f5..aa1c761df1f7 100644
--- a/browser/components/fxmonitor/FirefoxMonitor.jsm
+++ b/browser/components/fxmonitor/FirefoxMonitor.jsm
@@ -37,7 +37,7 @@ this.FirefoxMonitor = {
   strings: null,
 
   kEnabledPref: "extensions.fxmonitor.enabled",
-  kProtonPref: "browser.proton.doorhangers.enabled",
+  kProtonPref: "browser.proton.enabled",
 
   // This is here for documentation, will be redefined to a pref getter
   // using XPCOMUtils.defineLazyPreferenceGetter in delayedInit().
diff --git a/browser/components/fxmonitor/test/browser/browser_fxmonitor_doorhanger.js b/browser/components/fxmonitor/test/browser/browser_fxmonitor_doorhanger.js
index 246e97e4f614..81d8209205e7 100644
--- a/browser/components/fxmonitor/test/browser/browser_fxmonitor_doorhanger.js
+++ b/browser/components/fxmonitor/test/browser/browser_fxmonitor_doorhanger.js
@@ -76,7 +76,7 @@ add_task(async function setup() {
   // There is a test later in this file that checks that the panel doesn't appear
   // with Proton enabled.
   await SpecialPowers.pushPrefEnv({
-    set: [["browser.proton.doorhangers.enabled", false]],
+    set: [["browser.proton.enabled", false]],
   });
 });
 
@@ -310,7 +310,7 @@ add_task(async function test_proton_disabled() {
 
   // Enable proton
   await SpecialPowers.pushPrefEnv({
-    set: [["browser.proton.doorhangers.enabled", true]],
+    set: [["browser.proton.enabled", true]],
   });
 
   // Open a tab and wait for the alert.
diff --git a/browser/components/places/content/editBookmark.js b/browser/components/places/content/editBookmark.js
index 235eb7795c0b..496c8bb773e9 100644
--- a/browser/components/places/content/editBookmark.js
+++ b/browser/components/places/content/editBookmark.js
@@ -465,7 +465,7 @@ var gEditItemOverlay = {
       menupopup.removeChild(menupopup.lastElementChild);
     }
 
-    if (!this.protonDoorhangersEnabled) {
+    if (!this.protonEnabled) {
       this._folderMenuList.classList.add("panel-button");
     }
 
@@ -1341,8 +1341,8 @@ XPCOMUtils.defineLazyGetter(gEditItemOverlay, "_folderTree", () => {
 
 XPCOMUtils.defineLazyPreferenceGetter(
   gEditItemOverlay,
-  "protonDoorhangersEnabled",
-  "browser.proton.doorhangers.enabled",
+  "protonEnabled",
+  "browser.proton.enabled",
   false
 );
 
diff --git a/browser/modules/PermissionUI.jsm b/browser/modules/PermissionUI.jsm
index e66d1b3936a7..838593117013 100644
--- a/browser/modules/PermissionUI.jsm
+++ b/browser/modules/PermissionUI.jsm
@@ -99,8 +99,8 @@ XPCOMUtils.defineLazyGetter(this, "gBrowserBundle", function() {
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
-  "protonDoorhangersEnabled",
-  "browser.proton.doorhangers.enabled",
+  "protonEnabled",
+  "browser.doorhangers.enabled",
   false
 );
 
@@ -596,10 +596,7 @@ var PermissionPromptPrototype = {
       options.hideClose = true;
     }
 
-    if (
-      protonDoorhangersEnabled &&
-      !mainAction.hasOwnProperty("disableHighlight")
-    ) {
+    if (protonEnabled && !mainAction.hasOwnProperty("disableHighlight")) {
       mainAction.disableHighlight = true;
     }
 
diff --git a/browser/themes/linux/places/editBookmark.css b/browser/themes/linux/places/editBookmark.css
index 184de68d5e33..944879d30372 100644
--- a/browser/themes/linux/places/editBookmark.css
+++ b/browser/themes/linux/places/editBookmark.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #editBookmarkPanelRows > vbox {
   margin-bottom: .5em;
 }
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index c05d7e5b398a..57d4af669875 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -376,7 +376,7 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left {
   text-align: start;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #editBookmarkPanelRows > vbox > html|input,
 #editBookmarkPanelRows > vbox > hbox > html|input {
   appearance: none;
diff --git a/browser/themes/osx/downloads/downloads.css b/browser/themes/osx/downloads/downloads.css
index dd3c4d5262ac..d914d301826c 100644
--- a/browser/themes/osx/downloads/downloads.css
+++ b/browser/themes/osx/downloads/downloads.css
@@ -24,7 +24,7 @@
   outline-offset: -2px;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 @item@[verdict="Malware"]:not(:hover) {
   color: #aa1b08;
 }
diff --git a/browser/themes/osx/places/editBookmark.css b/browser/themes/osx/places/editBookmark.css
index a6d7963402e5..721e7f59d8ab 100644
--- a/browser/themes/osx/places/editBookmark.css
+++ b/browser/themes/osx/places/editBookmark.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #editBookmarkPanelRows > vbox {
   margin-bottom: .5em;
 }
diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index 1e3af0e2bbb9..2947b33ce85a 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -851,7 +851,7 @@ menupopup::part(drop-indicator) {
   flex: 1;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .webRTC-selectDevice-label {
   margin-top: 6px;
   font-weight: 600;
@@ -868,7 +868,11 @@ menupopup::part(drop-indicator) {
 }
 } /** END not Proton **/
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
+popupnotification {
+  font-size: var(--panel-font-size);
+}
+
 popupnotificationcontent {
   margin-block-start: 8px;
 }
diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css
index c2cc57cc4247..76d1b4d6d517 100644
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -25,6 +25,16 @@
   --height-offset: 0px;
 }
 
+@media not (-moz-proton) {
+#identity-popup,
+#permission-popup,
+#protections-popup {
+%if defined(XP_MACOSX) || defined(XP_WIN)
+  font-size: 1.18em;
+%endif
+}
+} /** END not PROTON **/
+
 #protections-popup {
   --protections-popup-switch-off-background: #f9f9fa;
   --protections-popup-switch-off-hover-background: #c9c9ca;
@@ -177,7 +187,7 @@
   background-position: calc(100% - 1em) 1em;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #identity-popup-securityView .identity-popup-security-content {
   border-bottom: 1px solid var(--panel-separator-color);
 }
@@ -243,7 +253,7 @@
 }
 } /** END not PROTON **/
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .identity-popup-security-content,
 #permission-popup-permissions-content {
   padding-block: 1em;
@@ -336,7 +346,7 @@
   margin-top: 4px;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #permission-popup-mainView-panel-header,
 #identity-popup-mainView-panel-header {
   padding: var(--vertical-section-padding) 2px;
@@ -387,7 +397,7 @@
 
 /* SECURITY */
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .identity-popup-connection-secure {
   color: #058B00;
 }
@@ -467,7 +477,7 @@
   padding-top: 4px;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #identity-popup-securityView-body {
   /* icon indent + 16px icon width + 6px description margin
     (total of 12px margin with the native 6px description margin) */
@@ -480,7 +490,7 @@
 }
 } /** END not PROTON **/
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #identity-popup-multiView {
   height: -moz-fit-content;
 }
@@ -894,7 +904,7 @@ description#identity-popup-content-verifier,
   margin-inline-start: 8px;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .permission-popup-permission-icon {
   margin-inline-start: 3px;
 }
@@ -1044,7 +1054,7 @@ description#identity-popup-content-verifier,
   transition: padding .2s ease;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 .protections-popup-tp-switch {
   min-width: 30px;
 }
@@ -1067,7 +1077,7 @@ description#identity-popup-content-verifier,
   padding-inline-start: 12px;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 .protections-popup-tp-switch[enabled] {
   padding-inline-start: 16px;
 }
@@ -1198,7 +1208,7 @@ description#identity-popup-content-verifier,
   stroke: #ffbd4f;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #protections-popup-mainView-panel-header-section {
   color: white;
   background: radial-gradient(circle farthest-side at top right, #9059FF, #0250BB);
@@ -1262,7 +1272,7 @@ description#identity-popup-content-verifier,
 }
 }/** END not PROTON **/
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #protections-popup-mainView-panel-header {
   min-height: 43.5px;
 }
diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css
index 96578b75a4fd..ae1716b67c4c 100644
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -399,7 +399,7 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv
   max-width: @standaloneSubviewWidth@;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #BMB_bookmarksPopup::part(arrowscrollbox) {
   border: 0;
 }
@@ -414,7 +414,7 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv
 }
 } /** END Proton **/
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #BMB_bookmarksPopup::part(arrowscrollbox) {
   padding: 0;
 }
@@ -1816,7 +1816,7 @@ menuitem.panel-subview-footer@menuStateActive@,
   margin-inline-end: 3px;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #BMB_bookmarksPopup menupopup > .bookmarks-actions-menuseparator {
   /* Hide bottom separator as the styled footer includes a top border serving the same purpose */
   display: none;
@@ -2472,7 +2472,7 @@ panelview:not([mainview]) #PanelUI-whatsNew-title {
   margin: 0 calc(-10px + var(--horizontal-padding)) var(--vertical-section-padding);
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #protections-popup-message .whatsNew-message-body {
   margin-inline: 6px;
 }
diff --git a/browser/themes/shared/downloads/downloads.inc.css b/browser/themes/shared/downloads/downloads.inc.css
index efcc37377598..c2b25eaf2b9b 100644
--- a/browser/themes/shared/downloads/downloads.inc.css
+++ b/browser/themes/shared/downloads/downloads.inc.css
@@ -26,7 +26,7 @@
   pointer-events: none;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #emptyDownloads {
   padding: 1.5em 0.62em 2.1em;
 }
@@ -130,7 +130,7 @@ button.downloadButton {
 }
 }/** END Proton **/
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 @item@ {
   height: var(--downloads-item-height);
   border-bottom: 1px solid var(--panel-separator-color);
@@ -224,7 +224,7 @@ button.downloadButton {
   padding-inline-end: 59px;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #downloadsHistory {
   padding-inline: 14px;
 }
diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css
index d96363d683ab..30778c85b613 100644
--- a/browser/themes/shared/notification-icons.inc.css
+++ b/browser/themes/shared/notification-icons.inc.css
@@ -224,7 +224,7 @@
   margin-inline-end: 0;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #webRTC-preview:not([hidden]) {
   min-width: 368px;
   min-height: 10em;
@@ -276,7 +276,7 @@
 }
 } /** END not Proton **/
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #webRTC-preview:not([hidden]) {
   border-radius: 4px;
   border: 1px solid var(--panel-separator-color);
@@ -492,7 +492,7 @@
 %endif
 
 /* UPDATE */
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 .popup-notification-icon[popupid="update-available"],
 .popup-notification-icon[popupid="update-downloading"],
 .popup-notification-icon[popupid="update-manual"],
@@ -510,7 +510,7 @@
 }
 } /** END Proton **/
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .popup-notification-icon[popupid="update-available"],
 .popup-notification-icon[popupid="update-downloading"],
 .popup-notification-icon[popupid="update-manual"],
diff --git a/browser/themes/shared/places/editBookmarkPanel.inc.css b/browser/themes/shared/places/editBookmarkPanel.inc.css
index e9366735a364..4970e339e786 100644
--- a/browser/themes/shared/places/editBookmarkPanel.inc.css
+++ b/browser/themes/shared/places/editBookmarkPanel.inc.css
@@ -160,7 +160,7 @@ html|img#editBookmarkPanelFavicon[src] {
   margin-bottom: 0;
 }
 
-@media (-moz-proton-doorhangers) {
+@media (-moz-proton) {
 #editBookmarkPanel {
   font: caption;
 }
@@ -277,7 +277,7 @@ html|img#editBookmarkPanelFavicon[src] {
 }
 } /** END Proton **/
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #editBookmarkPanelInfoArea {
   margin: 6px 8px 0;
 }
diff --git a/browser/themes/shared/tabs.inc.css b/browser/themes/shared/tabs.inc.css
index 407e9b7a1ee1..411a4e242746 100644
--- a/browser/themes/shared/tabs.inc.css
+++ b/browser/themes/shared/tabs.inc.css
@@ -1099,7 +1099,7 @@
   font-weight: bold;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .all-tabs-item[selected] {
   box-shadow: inset 4px 0 var(--blue-40);
 }
diff --git a/browser/themes/windows/downloads/downloads.css b/browser/themes/windows/downloads/downloads.css
index 61a1cc83ef12..46a865a44d1f 100644
--- a/browser/themes/windows/downloads/downloads.css
+++ b/browser/themes/windows/downloads/downloads.css
@@ -27,7 +27,7 @@
 }
 
 @media (-moz-windows-default-theme) {
-  @media not (-moz-proton-doorhangers) {
+  @media not (-moz-proton) {
   @item@[verdict="Malware"]:not(:hover) {
     color: #aa1b08;
   }
diff --git a/browser/themes/windows/places/editBookmark.css b/browser/themes/windows/places/editBookmark.css
index dffa87f93d74..ac7450a665d6 100644
--- a/browser/themes/windows/places/editBookmark.css
+++ b/browser/themes/windows/places/editBookmark.css
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 #editBookmarkPanelRows > vbox {
   margin-bottom: .5em;
 }
diff --git a/devtools/startup/DevToolsStartup.jsm b/devtools/startup/DevToolsStartup.jsm
index e583547c0711..8d0ff9ce13a7 100644
--- a/devtools/startup/DevToolsStartup.jsm
+++ b/devtools/startup/DevToolsStartup.jsm
@@ -561,9 +561,10 @@ DevToolsStartup.prototype = {
       return;
     }
 
-    const protonEnabled =
-      Services.prefs.getBoolPref("browser.proton.doorhangers.enabled", false) &&
-      Services.prefs.getBoolPref("browser.proton.enabled", false);
+    const protonEnabled = Services.prefs.getBoolPref(
+      "browser.proton.enabled",
+      false
+    );
     const panelviewId = protonEnabled
       ? "appmenu-moreTools"
       : "PanelUI-developer";
diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
index 4c23620dd150..a9c813d7923e 100644
--- a/servo/components/style/gecko/media_features.rs
+++ b/servo/components/style/gecko/media_features.rs
@@ -663,7 +663,7 @@ macro_rules! bool_pref_feature {
 /// to support new types in these entries and (2) ensuring that either
 /// nsPresContext::MediaFeatureValuesChanged is called when the value that
 /// would be returned by the evaluator function could change.
-pub static MEDIA_FEATURES: [MediaFeatureDescription; 62] = [
+pub static MEDIA_FEATURES: [MediaFeatureDescription; 61] = [
     feature!(
         atom!("width"),
         AllowsRanges::Yes,
@@ -907,6 +907,5 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 62] = [
     bool_pref_feature!(atom!("-moz-proton"), "browser.proton.enabled"),
     bool_pref_feature!(atom!("-moz-proton-modals"), "browser.proton.modals.enabled"),
     bool_pref_feature!(atom!("-moz-proton-contextmenus"), "browser.proton.contextmenus.enabled"),
-    bool_pref_feature!(atom!("-moz-proton-doorhangers"), "browser.proton.doorhangers.enabled"),
     bool_pref_feature!(atom!("-moz-proton-places-tooltip"), "browser.proton.places-tooltip.enabled"),
 ];
diff --git a/toolkit/components/passwordmgr/LoginManagerPrompter.jsm b/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
index 0bf968ec96ac..f17ec53e23cc 100644
--- a/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
+++ b/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
@@ -33,8 +33,8 @@ XPCOMUtils.defineLazyGetter(this, "strBundle", () => {
 
 XPCOMUtils.defineLazyPreferenceGetter(
   this,
-  "gProtonDoorhangersEnabled",
-  "browser.proton.doorhangers.enabled",
+  "gProtonEnabled",
+  "browser.proton.enabled",
   false
 );
 
@@ -778,7 +778,7 @@ class LoginManagerPrompter {
       showOptions
     );
 
-    if (gProtonDoorhangersEnabled) {
+    if (gProtonEnabled) {
       mainAction.disableHighlight = true;
     }
 
diff --git a/toolkit/themes/linux/global/popupnotification.css b/toolkit/themes/linux/global/popupnotification.css
index 52a718e70055..ffc6d5fc8664 100644
--- a/toolkit/themes/linux/global/popupnotification.css
+++ b/toolkit/themes/linux/global/popupnotification.css
@@ -5,7 +5,7 @@
 %endif
 %include ../../shared/popupnotification.inc.css
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
   border-inline-start: 1px solid var(--panel-separator-color);
 }
diff --git a/toolkit/themes/osx/global/popupnotification.css b/toolkit/themes/osx/global/popupnotification.css
index 52a718e70055..ffc6d5fc8664 100644
--- a/toolkit/themes/osx/global/popupnotification.css
+++ b/toolkit/themes/osx/global/popupnotification.css
@@ -5,7 +5,7 @@
 %endif
 %include ../../shared/popupnotification.inc.css
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
   border-inline-start: 1px solid var(--panel-separator-color);
 }
diff --git a/toolkit/themes/shared/global.inc.css b/toolkit/themes/shared/global.inc.css
index b94176cd9e5f..aa1385a91068 100644
--- a/toolkit/themes/shared/global.inc.css
+++ b/toolkit/themes/shared/global.inc.css
@@ -33,7 +33,7 @@
   --toolbarbutton-icon-fill: currentColor;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 :root {
   --popup-notification-body-width: 25em;
 }
@@ -161,7 +161,7 @@ xul|label[disabled="true"] {
 
 /* Panel footers */
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .panel-footer {
   background-color: var(--arrowpanel-dimmed);
 }
diff --git a/toolkit/themes/shared/popupnotification.inc.css b/toolkit/themes/shared/popupnotification.inc.css
index 01ee8e09668a..ec91a8a4b220 100644
--- a/toolkit/themes/shared/popupnotification.inc.css
+++ b/toolkit/themes/shared/popupnotification.inc.css
@@ -76,7 +76,7 @@
   flex: 1;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .popup-notification-dropmarker {
   flex: none;
   padding: 0 15px !important;
@@ -112,11 +112,7 @@
 }
 
 /** PopupNotifications **/
-@media (-moz-proton-doorhangers) {
-popupnotification {
-  font: caption;
-}
-
+@media (-moz-proton) {
 .panel-footer {
   justify-content: flex-end;
   margin: 8px 16px 16px;
diff --git a/toolkit/themes/windows/global/popupnotification.css b/toolkit/themes/windows/global/popupnotification.css
index 2855401fd56f..76de7a02815c 100644
--- a/toolkit/themes/windows/global/popupnotification.css
+++ b/toolkit/themes/windows/global/popupnotification.css
@@ -17,7 +17,7 @@
   order: -1;
 }
 
-@media not (-moz-proton-doorhangers) {
+@media not (-moz-proton) {
 .popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) {
   border-inline-end: 1px solid var(--panel-separator-color);
 }
diff --git a/widget/nsXPLookAndFeel.cpp b/widget/nsXPLookAndFeel.cpp
index 4c2a4104006e..448e0a78616a 100644
--- a/widget/nsXPLookAndFeel.cpp
+++ b/widget/nsXPLookAndFeel.cpp
@@ -420,7 +420,6 @@ static constexpr nsLiteralCString kMediaQueryPrefs[] = {
     "browser.proton.enabled"_ns,
     "browser.proton.contextmenus.enabled"_ns,
     "browser.proton.modals.enabled"_ns,
-    "browser.proton.doorhangers.enabled"_ns,
     "browser.proton.places-tooltip.enabled"_ns,
     "browser.theme.toolbar-theme"_ns,
 };