diff --git a/browser/themes/windows/browser-aero.css b/browser/themes/windows/browser-aero.css
index b33951220572..0adbe0f36101 100644
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -52,37 +52,19 @@
     -moz-margin-start: 0;
     -moz-margin-end: -3px;
   }
-}
-
-@media (-moz-windows-default-theme) and (-moz-os-version: windows-vista),
-       (-moz-windows-default-theme) and (-moz-os-version: windows-win7) {
-  #navigator-toolbox > toolbar:not(:-moz-lwtheme),
-  #browser-bottombox:not(:-moz-lwtheme),
-  .browserContainer > findbar {
-    background-color: @customToolbarColor@;
-  }
-
-  .tab-background-middle[selected=true]:not(:-moz-lwtheme) {
-    background-color: @customToolbarColor@;
-  }
-
-  #navigator-toolbox:not(:-moz-lwtheme)::after {
-    background-color: #aabccf;
-  }
 
   #urlbar:not(:-moz-lwtheme),
   .searchbar-textbox:not(:-moz-lwtheme) {
     border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
-  }
-
-  #urlbar:not(:-moz-lwtheme):not([focused]):hover,
-  .searchbar-textbox:not(:-moz-lwtheme):not([focused]):hover {
-    border-color: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4);
+    box-shadow: 0 1px 0 hsla(0,0%,0%,.01) inset,
+                0 1px 0 hsla(0,0%,100%,.1);
+    transition-property: border-color;
+    transition-duration: 200ms;
   }
 
   #urlbar:not(:-moz-lwtheme)[focused],
   .searchbar-textbox:not(:-moz-lwtheme)[focused] {
-    border-color: hsla(206,100%,60%,.65) hsla(206,100%,55%,.65) hsla(206,100%,50%,.65);
+    border-color: Highlight;
   }
 
   .menu-accel,
@@ -94,7 +76,33 @@
   chatbar > chatbox {
     border-color: #A9B7C9;
   }
-  
+
+  @media (-moz-os-version: windows-vista),
+         (-moz-os-version: windows-win7) {
+    #navigator-toolbox > toolbar:not(:-moz-lwtheme),
+    #browser-bottombox:not(:-moz-lwtheme),
+    .browserContainer > findbar {
+      background-color: @customToolbarColor@;
+    }
+
+    .tab-background-middle[selected=true]:not(:-moz-lwtheme) {
+      background-color: @customToolbarColor@;
+    }
+
+    #navigator-toolbox:not(:-moz-lwtheme)::after {
+      background-color: #aabccf;
+    }
+
+    #urlbar:not(:-moz-lwtheme):not([focused]):hover,
+    .searchbar-textbox:not(:-moz-lwtheme):not([focused]):hover {
+      border-color: hsla(210,54%,20%,.35) hsla(210,54%,20%,.37) hsla(210,54%,20%,.4);
+    }
+
+    #urlbar:not(:-moz-lwtheme)[focused],
+    .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+      border-color: hsla(206,100%,60%,.65) hsla(206,100%,55%,.65) hsla(206,100%,50%,.65);
+    }
+  }
 }
 
 @media (-moz-windows-compositor) {
@@ -355,23 +363,6 @@
 /* Win8 and beyond. */
 @media not all and (-moz-os-version: windows-vista) {
   @media not all and (-moz-os-version: windows-win7) {
-    #urlbar:not(:-moz-lwtheme),
-    .searchbar-textbox:not(:-moz-lwtheme) {
-      background-color: hsla(0,0%,100%,.9);
-      border: 1px solid transparent;
-      border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
-      box-shadow: 0 1px 0 hsla(0,0%,0%,.01) inset,
-                  0 1px 0 hsla(0,0%,100%,.1);
-      transition-property: border-color, background-color;
-      transition-duration: 200ms;
-    }
-
-    #urlbar:not(:-moz-lwtheme)[focused],
-    .searchbar-textbox:not(:-moz-lwtheme)[focused] {
-      background-color: hsla(0,0%,100%,1);
-      border-color: #4595e5;
-    }
-
     /* Introducing an additional hover state for the Bookmark button */
     #nav-bar .toolbarbutton-1[buttonover] > .toolbarbutton-menubutton-button:hover > .toolbarbutton-icon {
       background-color: hsla(210,4%,10%,.08);