1 files changed, 8 insertions, 12 deletions
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index c4c2f814c7..982a7a9616 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -35,7 +35,7 @@
       --toolbox-non-lwt-bgcolor-inactive: InactiveCaption;
       --toolbox-non-lwt-textcolor-inactive: InactiveCaptionText;
 
-      #TabsToolbar:not(:-moz-lwtheme) {
+      &:not([lwtheme]) #TabsToolbar {
         /* These colors match the Linux/HCM default button colors. We need to
          * override these on the tabs toolbar because the accent color is
          * arbitrary, so the hardcoded colors from browser-custom-colors might
@@ -58,7 +58,7 @@
 /* When temporarily showing the menu bar, make it at least as tall as the
  * tab bar such that the window controls don't appear to move up. */
 :root[tabsintitlebar] #toolbar-menubar[autohide="true"] {
-  height: calc(var(--tab-min-height) - var(--tabs-navbar-shadow-size));
+  height: var(--tab-min-height);
 }
 
 /* Titlebar */
@@ -76,12 +76,6 @@
 
 .titlebar-buttonbox-container {
   align-items: stretch;
-
-  /* Prevent window controls from overlapping the nav bar's shadow on the tab
-   * bar. */
-  #TabsToolbar > & {
-    margin-bottom: var(--tabs-navbar-shadow-size);
-  }
 }
 
 /* Window control buttons */
@@ -309,10 +303,12 @@
     --urlbar-box-hover-text-color: SelectedItemText;
   }
 
-  #urlbar:not(:-moz-lwtheme, [focused="true"]) > #urlbar-background,
-  #searchbar:not(:-moz-lwtheme, :focus-within),
-  .findbar-textbox:not(:-moz-lwtheme, :focus) {
-    border-color: ThreeDShadow;
+  :root:not([lwtheme]) {
+    #urlbar:not([focused="true"]) > #urlbar-background,
+    #searchbar:not(:focus-within),
+    .findbar-textbox:not(:focus) {
+      border-color: ThreeDShadow;
+    }
   }
 }