--- a/toolkit/themes/shared/non-mac.jar.inc.mn
+++ b/toolkit/themes/shared/non-mac.jar.inc.mn
@@ -77,17 +77,16 @@
   skin/classic/global/icons/tabprompts-bgtexture.png       (../../windows/global/icons/tabprompts-bgtexture.png)
   skin/classic/global/icons/Warning.png                    (../../windows/global/icons/Warning.png)
   skin/classic/global/icons/warning-large.png              (../../windows/global/icons/warning-large.png)
   skin/classic/global/icons/warning-16.png                 (../../windows/global/icons/warning-16.png)
   skin/classic/global/icons/warning-64.png                 (../../windows/global/icons/warning-64.png)
   skin/classic/global/icons/windowControls.png             (../../windows/global/icons/windowControls.png)
   skin/classic/global/radio/radio-check.gif                (../../windows/global/radio/radio-check.gif)
   skin/classic/global/radio/radio-check-dis.gif            (../../windows/global/radio/radio-check-dis.gif)
-  skin/classic/global/scrollbar/slider.gif                 (../../windows/global/scrollbar/slider.gif)
   skin/classic/global/splitter/grip-bottom.gif             (../../windows/global/splitter/grip-bottom.gif)
   skin/classic/global/splitter/grip-top.gif                (../../windows/global/splitter/grip-top.gif)
   skin/classic/global/splitter/grip-left.gif               (../../windows/global/splitter/grip-left.gif)
   skin/classic/global/splitter/grip-right.gif              (../../windows/global/splitter/grip-right.gif)
   skin/classic/global/toolbar/chevron.gif                  (../../windows/global/toolbar/chevron.gif)
   skin/classic/global/toolbar/chevron-inverted.png         (../../windows/global/toolbar/chevron-inverted.png)
   skin/classic/global/tree/columnpicker.gif                (../../windows/global/tree/columnpicker.gif)
   skin/classic/global/tree/sort-asc.png                    (../../windows/global/tree/sort-asc.png)

deleted file mode 100644
index 355fcb27cc039a1f0ab25413ae9c27d06f3d7ac0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

--- a/toolkit/themes/windows/global/xulscrollbars.css
+++ b/toolkit/themes/windows/global/xulscrollbars.css
@@ -10,46 +10,32 @@
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 
 /* ::::: scrollbar ::::: */
 
 scrollbar {
   -moz-appearance: scrollbar-horizontal;
   -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
   cursor: default;
-  background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
 }
 
 @media all and (-moz-overlay-scrollbars) {
   scrollbar[root="true"] {
     position: relative;
     z-index: 2147483647; /* largest positive value of a signed 32-bit integer */
   }
 
   scrollbar:not([active="true"]),
   scrollbar[disabled="true"] {
     visibility: hidden;
   }
 }
 
-scrollbar[orient="vertical"] 
-{
-   -moz-appearance: scrollbar-vertical;
-}
-
-/* ::::: borders for thumb and buttons ::::: */
-
-thumb,
-scrollbarbutton {
-  border: 2px solid;
-  -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-  -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
-  background-color: -moz-Dialog;
+scrollbar[orient="vertical"] {
+  -moz-appearance: scrollbar-vertical;
 }
 
 /* ::::: slider - a thumb is inside  ::::: */
 slider {
   -moz-appearance: scrollbartrack-horizontal;
 }
 
 slider[orient="vertical"] {
@@ -66,170 +52,42 @@ thumb {
 thumb[orient="horizontal"] {
   -moz-appearance: scrollbarthumb-horizontal;
   min-width: 8px;
 }
 
 /* ::::: scrollbar button ::::: */
 
 scrollbarbutton {
-  background: -moz-Dialog no-repeat 50% 50%;
   min-width: 16px;
   min-height: 16px;
 }
 
-scrollbarbutton:hover:active, scrollbarbutton[active="true"] {
-  -moz-border-top-colors: ThreeDShadow -moz-Dialog;
-  -moz-border-right-colors: ThreeDShadow -moz-Dialog;
-  -moz-border-bottom-colors: ThreeDShadow -moz-Dialog;
-  -moz-border-left-colors: ThreeDShadow -moz-Dialog;
-  background-position: 60% 60%;
-}
-
 /* ::::: square at the corner of two scrollbars ::::: */
 
 scrollcorner { 
   /* XXX -moz-appearance: scrollcorner; */
   -moz-binding: url(chrome://global/content/bindings/scrollbar.xml#scrollbar-base);
   width: 16px;
   cursor: default;
   background-color: -moz-Dialog;
 }
 
 /* ..... increment .... */
 
 scrollbarbutton[type="increment"] {
   -moz-appearance: scrollbarbutton-right;
-  background-image: url("chrome://global/skin/arrow/arrow-rit.gif")
-}
-
-scrollbarbutton[type="increment"][disabled="true"] {
-  background-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif")
 }
 
 scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
   -moz-appearance: scrollbarbutton-down;
-  background-image: url("chrome://global/skin/arrow/arrow-dn.gif")
-}
-
-scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] {
-  background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif")
 }
 
 /* ..... decrement .... */
 
 scrollbarbutton[type="decrement"] {
   -moz-appearance: scrollbarbutton-left;
-   background-image: url("chrome://global/skin/arrow/arrow-lft.gif")
-}
-
-scrollbarbutton[type="decrement"][disabled="true"] {
-   background-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif")
 }
 
 scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
   -moz-appearance: scrollbarbutton-up;
-   background-image: url("chrome://global/skin/arrow/arrow-up.gif")
-}
-
-scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] {
-   background-image: url("chrome://global/skin/arrow/arrow-up-dis.gif")
 }
 
-/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */
-/* ::::::::::::::::::::: MEDIA PRINT :::::::::::::::::::::: */
-/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */
-@media print {
-  /* ::::: scrollbar ::::: */
-
-  html|div scrollbar {
-    -moz-appearance: scrollbar-horizontal;
-    -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
-    cursor: default;
-    background: url("chrome://global/skin/scrollbar/slider.gif") scrollbar;
-  }
-
-  html|div scrollbar[orient="vertical"] 
-  {
-     -moz-appearance: scrollbar-vertical;
-  }
-
-  /* ::::: borders for thumb and buttons ::::: */
-
-  html|div thumb,
-  html|div scrollbarbutton {
-    border: 2px solid;
-    -moz-border-top-colors: ThreeDLightShadow ThreeDHighlight;
-    -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-    -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-    -moz-border-left-colors: ThreeDLightShadow ThreeDHighlight;
-    background-color: -moz-Dialog;
-  }
-
-  /* ::::: thumb (horizontal) ::::: */
-
-  html|div thumb {
-    -moz-appearance: scrollbarthumb-vertical;
-    min-height: 8px;
-  }
-
-  html|div thumb[orient="horizontal"] {
-    -moz-appearance: scrollbarthumb-horizontal;
-    min-width: 8px;
-  }
-
-  /* ::::: scrollbar button ::::: */
-
-  html|div scrollbarbutton {
-    background: -moz-Dialog no-repeat 50% 50%;
-    min-width: 16px;
-    min-height: 16px;
-  }
-
-  html|div scrollbarbutton:hover:active, html|div scrollbarbutton[active="true"] {
-    -moz-border-top-colors: ThreeDShadow -moz-Dialog;
-    -moz-border-right-colors: ThreeDShadow -moz-Dialog;
-    -moz-border-bottom-colors: ThreeDShadow -moz-Dialog;
-    -moz-border-left-colors: ThreeDShadow -moz-Dialog;
-    background-position: 60% 60%;
-  }
-
-  /* ..... increment .... */
-
-  html|div scrollbarbutton[type="increment"] {
-    -moz-appearance: scrollbarbutton-right;
-    background-image: url("chrome://global/skin/arrow/arrow-rit.gif")
-  }
-
-  html|div scrollbarbutton[type="increment"][disabled="true"] {
-    background-image: url("chrome://global/skin/arrow/arrow-rit-dis.gif")
-  }
-
-  html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
-    -moz-appearance: scrollbarbutton-down;
-    background-image: url("chrome://global/skin/arrow/arrow-dn.gif")
-  }
-
-  html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"][disabled="true"] {
-    background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif")
-  }
-
-  /* ..... decrement .... */
-
-  html|div scrollbarbutton[type="decrement"] {
-    -moz-appearance: scrollbarbutton-left;
-     background-image: url("chrome://global/skin/arrow/arrow-lft.gif")
-  }
-
-  html|div scrollbarbutton[type="decrement"][disabled="true"] {
-     background-image: url("chrome://global/skin/arrow/arrow-lft-dis.gif")
-  }
-
-  html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
-    -moz-appearance: scrollbarbutton-up;
-     background-image: url("chrome://global/skin/arrow/arrow-up.gif")
-  }
-
-  html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"] {
-     background-image: url("chrome://global/skin/arrow/arrow-up-dis.gif")
-  }
-
-}