--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -11,22 +11,16 @@
   @media not all and (-moz-windows-classic) {
     #main-window[sizemode="normal"] > #tab-view-deck > #browser-panel > #navigator-toolbox > #toolbar-menubar {
       margin-top: 1px;
     }
   }
 }
 
 @media (-moz-windows-default-theme) {
-  .sidebar-header,
-  #sidebar-header {
-    -moz-appearance: none;
-    border-bottom: none;
-  }
-
   .menu-accel,
   .menu-iconic-accel {
     color: graytext;
   }
 }
 
 @media (-moz-windows-compositor) {
   #main-window {

--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -891,18 +891,19 @@ treechildren.searchbar-treebody::-moz-tr
 #editBMPanel_folderTree {
   min-width: 27em;
 }
 
 /* ::::: content area ::::: */
 
 %include ../shared/sidebar.inc.css
 
-#sidebar {
-  background-color: Window;
+#sidebar-box {
+  background-color: -moz-Field;
+  color: -moz-FieldText;
 }
 
 #sidebar-header {
   border-bottom: 1px solid ThreeDLightShadow;
 }
 
 .sidebar-splitter {
   border-color: ThreeDLightShadow;

--- a/browser/themes/windows/places/places.css
+++ b/browser/themes/windows/places/places.css
@@ -1,18 +1,31 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* Sidebars */
+
+:root {
+  background-color: transparent;
+}
+
+#sidebar-search-container {
+  padding: 4px;
+}
+
 .sidebar-placesTree {
   -moz-appearance: none;
   border: 0;
   margin: 0;
-  border-top: 1px solid ThreeDShadow;
+}
+
+.sidebar-placesTreechildren::-moz-tree-cell,
+.sidebar-placesTreechildren::-moz-tree-twisty {
+  padding: 0 4px;
 }
 
 .sidebar-placesTreechildren::-moz-tree-cell(leaf) ,
 .sidebar-placesTreechildren::-moz-tree-image(leaf) {
   cursor: pointer;
 }
 
 .sidebar-placesTreechildren::-moz-tree-cell-text(leaf, hover) {

--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -130,22 +130,17 @@ statusbarpanel:not(.statusbar-resizerpan
 .statusbarpanel-menu-iconic {
   padding: 0 1px;
 }
 
 /* XXXBlake yeah, shoot me -- these don't belong here.  I'll move them later. */
 
 sidebarheader {
   min-height: 25px;
-  background-color: -moz-Dialog;
-  color: -moz-dialogText;
   text-shadow: none;
-  -moz-appearance: toolbox;
-  border-bottom: 1px solid ThreeDShadow;
-  border-top: 1px solid ThreeDHighlight;
 }
 
 sidebarheader > label {
   padding-inline-start: 4px;
 }
 
 .toolbar-focustarget {
   -moz-user-focus: ignore !important;