diff --git a/src/chrome/browser/browser.css b/src/chrome/browser/browser.css
index b6ef192..2ee710e 100644
--- a/src/chrome/browser/browser.css
+++ b/src/chrome/browser/browser.css
@@ -5,12 +5,18 @@
 #main-window[sizemode="normal"] #browser-panel
 {
  background-color: black;
- border: 1px solid;
- border-top-color: #808080;
- border-bottom-color: #A0A0A0;
- border-left-color: #808080;
- border-right-color: #A0A0A0;
 }
+@media (-moz-os-version: windows-vista),          
+       (-moz-os-version: windows-win7),          
+       (-moz-os-version: windows-win8) {
+  #main-window[sizemode="normal"] #browser-panel {
+	border: 1px solid;
+    border-top-color: #808080;
+    border-bottom-color: #A0A0A0;
+    border-left-color: #808080;
+    border-right-color: #A0A0A0;
+  }
+}  
 #menubar-items
 {
  -moz-box-orient: vertical;
@@ -3598,15 +3604,39 @@ chatbox
   width: 107px;
   height: 22px;
  }
- #main-window
- {
-  -moz-appearance: -moz-win-borderless-glass;
-  background: transparent;
- }
- #appcontent
- {
-  -moz-appearance: -moz-win-exclude-glass;
- }
+  /* Fix borders because of Vista/7 versus 8/10+ */
+  #main-window {
+    -moz-appearance: -moz-win-glass;
+    background: transparent;
+  }
+  
+  /* On win 10, if we don't set this on the entire browser container, including
+  * the sidebar, then the accent color bleeds through in the titlebar
+  * if the sidebar is open. */
+  #browser {
+    -moz-appearance: -moz-win-exclude-glass;
+  }
+  
+  @media (-moz-os-version: windows-vista),
+  (-moz-os-version: windows-win7) {
+  /* Make sure the native margins are correct on Win Vista/7.
+  * We can't use -moz-win-glass there because the border sizing would
+  * not be correct. */
+    #main-window {
+      -moz-appearance: -moz-win-borderless-glass;
+    }
+  
+  /* The borders on the glass frame are ours, and inside #browser, and on
+  * vista and win7 we want to make sure they are "glassy", so we can't use
+  * #browser as the exclude-glass container. We use #appcontent instead. */
+    #browser {
+      -moz-appearance: none;
+    }
+  
+    #appcontent {
+      -moz-appearance: -moz-win-exclude-glass;
+    }
+}
  #main-window[chromemargin^="0,"][sizemode=normal] #navigator-toolbox
  {
   margin-top: 0px;
@@ -3638,21 +3668,25 @@ chatbox
   -moz-appearance: none;
   background-color: #000000;
  }
- #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme
- {
-  border-color: transparent !important;
- }
- #main-window[sizemode=normal] #browser-border-start, #main-window[sizemode=normal] #browser-border-end
- {
-  display: -moz-box;
-  background-color: #000000;
-  width: 1px;
- }
- #main-window[sizemode=normal] #browser-bottombox
- {
-  border: 1px solid #606060;
-  border-top-style: none;
-  background-clip: padding-box;
+ @media (-moz-os-version: windows-vista),          
+       (-moz-os-version: windows-win7),          
+       (-moz-os-version: windows-win8) {
+  #main-window[sizemode=normal] #navigator-toolbox > toolbar:-moz-lwtheme
+  {
+   border-color: transparent !important;
+  }
+  #main-window[sizemode=normal] #browser-border-start, #main-window[sizemode=normal] #browser-border-end
+  {
+   display: -moz-box;
+   background-color: #000000;
+   width: 1px;
+  }
+  #main-window[sizemode=normal] #browser-bottombox
+  {
+   border: 1px solid #606060;
+   border-top-style: none;
+   background-clip: padding-box;
+  }
  }
  #main-window[sizemode=normal][tabsontop=false] #PersonalToolbar:not(:-moz-lwtheme)
  {