2 files changed, 15 insertions, 15 deletions
diff --git a/browser/themes/shared/customizableui/customizeMode.css b/browser/themes/shared/customizableui/customizeMode.css
index b3ee1ada6c..a1bb6a62f9 100644
--- a/browser/themes/shared/customizableui/customizeMode.css
+++ b/browser/themes/shared/customizableui/customizeMode.css
@@ -24,18 +24,18 @@
   background-color: var(--toolbar-non-lwt-bgcolor);
   color: var(--toolbar-color);
   color-scheme: var(--toolbar-color-scheme);
-}
 
-#customization-container:-moz-lwtheme {
-  /* Ensure this displays on top of the non-lwt bgcolor, to make sure it's not
-   * semi-transparent */
-  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
-}
+  :root[lwtheme] & {
+    /* Ensure this displays on top of the non-lwt bgcolor, to make sure it's not
+     * semi-transparent */
+    background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
+  }
 
-:root[lwtheme-image] #customization-container {
-  background-image: none;
-  color: var(--toolbar-non-lwt-textcolor);
-  text-shadow: none;
+  :root[lwtheme-image] & {
+    background-image: none;
+    color: var(--toolbar-non-lwt-textcolor);
+    text-shadow: none;
+  }
 }
 
 :root[lwtheme-image] #customization-palette .toolbarbutton-1 {
diff --git a/browser/themes/shared/customizableui/panelUI-shared.css b/browser/themes/shared/customizableui/panelUI-shared.css
index 51ab66b25a..07994d3233 100644
--- a/browser/themes/shared/customizableui/panelUI-shared.css
+++ b/browser/themes/shared/customizableui/panelUI-shared.css
@@ -33,7 +33,7 @@
 
   --panel-and-palette-icon-size: 16px;
 
-  &:not(:-moz-lwtheme) {
+  &:not([lwtheme]) {
     --panel-separator-zap-gradient: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%);
   }
 
@@ -1655,13 +1655,13 @@ radiogroup:focus-visible > .subviewradio[focused="true"] {
 }
 
 #protections-popup {
-  #messaging-system-message-container {
+  #info-message-container {
     height: 260px;
     overflow: hidden;
     transition: margin-bottom .25s;
   }
 
-  #messaging-system-message-container[disabled] {
+  #info-message-container[disabled] {
     /* Offset the height when hidden. This makes the panel content
     * cover the info message and reveal it as it slides down, rather
     * than the info message growing in height. */
@@ -1669,7 +1669,7 @@ radiogroup:focus-visible > .subviewradio[focused="true"] {
    pointer-events: none;
  }
 
-  #messaging-system-message-container[disabled] #protections-popup-message {
+  #info-message-container[disabled] #protections-popup-message {
     opacity: 0;
   }
 }
@@ -2122,7 +2122,7 @@ panelview {
 
   &.sent-view {
     @media not (prefers-contrast) {
-      background-color: var(--color-background-success);
+      background-color: var(--background-color-success);
     }
 
     > .panel-header {