diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index fdfa84f8c5f..338b642c3b1 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -12,11 +12,6 @@ menuitem.spell-suggestion {
   font-weight:bold;
 }
 
-#noPreviewAvailable {
-  background-color: white !important;
-  font-size: 12px !important;
-}
-
 #sidebar-box toolbarbutton.tabs-closebutton {
   -moz-user-focus: normal;
 }
diff --git a/browser/base/content/monitor.png b/browser/base/content/monitor.png
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index f356ed6b486..61880861781 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -23,7 +23,6 @@ browser.jar:
 *       content/browser/EULA.xul                      (content/EULA.xul)
 *       content/browser/metaData.js                   (content/metaData.js)
 *       content/browser/metaData.xul                  (content/metaData.xul)
-        content/browser/monitor.png                   (content/monitor.png)
 *       content/browser/openLocation.js               (content/openLocation.js)
 *       content/browser/openLocation.xul              (content/openLocation.xul)
 *       content/browser/pageInfo.js                   (content/pageInfo.js)
diff --git a/browser/components/shell/content/setDesktopBackground.xul b/browser/components/shell/content/setDesktopBackground.xul
index 99df1b6572c..8e4d3df6303 100644
--- a/browser/components/shell/content/setDesktopBackground.xul
+++ b/browser/components/shell/content/setDesktopBackground.xul
@@ -39,7 +39,7 @@
 # ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
-<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
 
 <!DOCTYPE dialog SYSTEM "chrome://browser/locale/setDesktopBackground.dtd">
 
@@ -96,10 +96,8 @@
         <vbox id="monitor" align="center" pack="center"
               style="width: 153px !important; height: 114px !important; overflow: hidden;"
               left="13" top="18"/>
-        
-        <!-- XXXben - this needs to be skinable - on MacOSX we want to draw a
-             bucket, not a monitor -->
-        <image src="chrome://browser/content/monitor.png"/>
+
+        <image id="monitorImage"/>
       </stack>
     </groupbox>
     
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index 9c3ab535bfb..d127f4c82a5 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -34,6 +34,8 @@ classic.jar:
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
+  skin/classic/browser/setDesktopBackground.css
+  skin/classic/browser/monitor.png
 #ifdef MOZ_PLACES
   skin/classic/browser/places/places.css                    (places/places.css)
   skin/classic/browser/places/defaultFavicon.png            (places/defaultFavicon.png)
diff --git a/browser/themes/pinstripe/browser/monitor.png b/browser/themes/pinstripe/browser/monitor.png
new file mode 100755
index 00000000000..dd5c53eefb6
Binary files /dev/null and b/browser/themes/pinstripe/browser/monitor.png differ
diff --git a/browser/themes/pinstripe/browser/setDesktopBackground.css b/browser/themes/pinstripe/browser/setDesktopBackground.css
new file mode 100644
index 00000000000..ad2b3cec53f
--- /dev/null
+++ b/browser/themes/pinstripe/browser/setDesktopBackground.css
@@ -0,0 +1,5 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#monitorImage {
+  list-style-image: url("chrome://browser/skin/monitor.png");
+}
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index dd056ee2202..06843677b76 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -43,6 +43,8 @@ classic.jar:
         skin/classic/browser/Search-provider-bkgnd.png
         skin/classic/browser/Search-provider-mid-top.png
         skin/classic/browser/Search-provider-mid-bottom.png
+        skin/classic/browser/setDesktopBackground.css
+        skin/classic/browser/monitor.png
         skin/classic/browser/feeds/feedIcon.png                 (feeds/feedIcon.png)
         skin/classic/browser/feeds/feedIcon16.png               (feeds/feedIcon16.png)
         skin/classic/browser/feeds/subscribe.css                (feeds/subscribe.css)
diff --git a/browser/themes/winstripe/browser/monitor.png b/browser/themes/winstripe/browser/monitor.png
new file mode 100755
index 00000000000..dd5c53eefb6
Binary files /dev/null and b/browser/themes/winstripe/browser/monitor.png differ
diff --git a/browser/themes/winstripe/browser/setDesktopBackground.css b/browser/themes/winstripe/browser/setDesktopBackground.css
new file mode 100644
index 00000000000..ee435dbf2fd
--- /dev/null
+++ b/browser/themes/winstripe/browser/setDesktopBackground.css
@@ -0,0 +1,10 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#monitorImage {
+  list-style-image: url("chrome://browser/skin/monitor.png");
+}
+
+#noPreviewAvailable {
+  background-color: white !important;
+  font-size: 12px !important;
+}