Fix a few minor issues

Author: K4sum1

browser/themes/shared/light-dark-overrides.css

@@ -64,15 +64,17 @@
     }
   }
 
-  @media (-moz-platform: windows-win8) {
-    @media (-moz-windows-default-theme) {
+  @media (-moz-platform: windows-win8),
+         (-moz-windows-default-theme),
+         (-moz-windows-glass)  {
+      @media not (-moz-windows-classic) {
       #TabsToolbar {
         color: black;
         --toolbarbutton-icon-fill: currentColor;
       }
-    }
-    #toolbar-menubar {
-      color: black;
+      #toolbar-menubar {
+        color: black;
+      }
     }
   }
 

browser/themes/shared/r3dfox.css

@@ -619,7 +619,7 @@
 
   #alltabs-button::after {
   padding: 4px 4px 4px 0px !important;
-  @media (-moz-platform: windows-xp), (-moz-windows-classic) {
+  @media (-moz-platform: windows-winxp), (-moz-windows-classic) {
     padding: 6px 5px 5px 0px !important;
   }
   border-radius: 0px 4px 4px 0px !important;

browser/themes/windows/browser.css

@@ -168,14 +168,16 @@
 }
 /* Titlebar */
 
-:root[tabsintitlebar][sizemode="normal"] #titlebar {
-  appearance: auto;
-  -moz-default-appearance: -moz-window-titlebar;
-}
+@media not (-moz-platform: windows-win10) {
+  :root[tabsintitlebar][sizemode="normal"] #titlebar {
+    appearance: auto;
+    -moz-default-appearance: -moz-window-titlebar;
+  }
 
-:root[tabsintitlebar][sizemode="maximized"] #titlebar {
-  appearance: auto;
-  -moz-default-appearance: -moz-window-titlebar-maximized;
+  :root[tabsintitlebar][sizemode="maximized"] #titlebar {
+    appearance: auto;
+    -moz-default-appearance: -moz-window-titlebar-maximized;
+  }
 }
 
 @media not (-moz-windows-compositor) {
@@ -231,7 +233,7 @@
 /* add extra margin for unmaximized windows
    on Win XP Luna themes to look consistent */
 @media not (-moz-windows-classic) {
-  @media (-moz-platform: windows-xp) {
+  @media (-moz-platform: windows-winxp) {
     :root[tabsintitlebar]:not([sizemode="maximized"]) .titlebar-buttonbox-container {
       margin-top: 4px;
     }