--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -46,20 +46,16 @@
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 
 #ifdef MOZ_PLACES
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
 #endif
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
-#ifdef MOZ_PLACES_BOOKMARKS
-<?xml-stylesheet href="chrome://browser/skin/places/browser-places.css" type="text/css"?>
-#endif
-
 <?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 #ifdef MOZ_PLACES
 <?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>
 #endif
 

--- a/browser/themes/pinstripe/browser/browser.css
+++ b/browser/themes/pinstripe/browser/browser.css
@@ -153,45 +153,77 @@ toolbarbutton.bookmark-item .toolbarbutt
 
 /* Prevent [mode="icons"] from hiding the label */
 .bookmark-item > .toolbarbutton-text {
   display: -moz-box !important;
   height: 16px !important;
   padding-top: 1px;
 }
 
-/* Image locations for these toolbar icons are overridden in places/browser-places.css in Places-enabled builds.
-   Those styles can be merged into these once the pre-Places bookmark system is no longer needed. */
+%ifndef MOZ_PLACES_BOOKMARKS
 .bookmark-item > .toolbarbutton-menu-dropmarker {
-list-style-image: url("chrome://browser/skin/bookmarks/folderarrow.png");
-height: 16px !important;
-padding: 5px 5px 4px 3px;
+  list-style-image: url("chrome://browser/skin/bookmarks/folderarrow.png");
+  height: 16px !important;
+  padding: 5px 5px 4px 3px;
 }
 
 .bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker  {
-list-style-image: url("chrome://browser/skin/bookmarks/folderarrow-hover.png");
+  list-style-image: url("chrome://browser/skin/bookmarks/folderarrow-hover.png");
 }
 
 .bookmark-item[livemark] > .toolbarbutton-menu-dropmarker {
-list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder.png");
-padding: 4px 4px 3px 2px;
+  list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder.png");
+  padding: 4px 4px 3px 2px;
 }
 
 .bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker {
-list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder-hover.png");
+  list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder-hover.png");
 }
 
 .bookmark-item[livemark] {
   list-style-image: url("chrome://browser/skin/page-livemarks.png");
 }
 
 .bookmark-item[livemark] .menuitem-iconic {
-list-style-image: url("chrome://browser/skin/bookmarks/livemark-item.png");
+  list-style-image: url("chrome://browser/skin/bookmarks/livemark-item.png");
+}
+%else
+.bookmark-item > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://browser/skin/places/folderDropArrow.png");
+  height: 16px !important;
+  padding: 5px 5px 4px 3px;
+}
+
+.bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker  {
+  list-style-image: url("chrome://browser/skin/places/folderDropHoverArrow.png");
+}
+
+.bookmark-item[livemark] > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://browser/skin/places/livemarkFolder.png");
+  padding: 4px 4px 3px 2px;
 }
 
+.bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://browser/skin/places/livemarkFolderHover.png");
+}
+
+.bookmark-item[livemark] {
+  list-style-image: url("chrome://browser/skin/page-livemarks.png");
+}
+
+.bookmark-item[livemark] .menuitem-iconic {
+  list-style-image: url("chrome://browser/skin/places/livemarkItem.png");
+}
+
+.bookmark-item menuitem[openInTabs],
+.bookmark-item menuitem[siteURI] {
+  list-style-image: none;
+}
+%endif
+
 .toolbarpaletteitem-box[type="bookmarks-toolbar"][place="palette"] {
   background: url("chrome://browser/skin/bookmarks/Toolbar-bookmarks.png") no-repeat;
 }
 
 .bookmarks-toolbar-customize {
   display: none;
   max-width: 15em !important;
 }

--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -34,17 +34,16 @@ classic.jar:
   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)
   skin/classic/browser/places/query.png                     (places/query.png)
   skin/classic/browser/places/livemarkItem.png              (places/livemarkItem.png)
 #endif
 #ifdef MOZ_PLACES_BOOKMARKS
-  skin/classic/browser/places/browser-places.css            (places/browser-places.css)
   skin/classic/browser/places/bookmarksMenu.png             (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png          (places/bookmarksToolbar.png)
   skin/classic/browser/places/toolbarDropMarker.png         (places/toolbarDropMarker.png)
   skin/classic/browser/places/folderDragOver.png            (places/folderDragOver.png)
   skin/classic/browser/places/folderDropArrow.png           (places/folderDropArrow.png)
   skin/classic/browser/places/folderDropHoverArrow.png      (places/folderDropHoverArrow.png)
   skin/classic/browser/places/livemarkFolder.png            (places/livemarkFolder.png)
   skin/classic/browser/places/livemarkFolderHover.png       (places/livemarkFolderHover.png)

deleted file mode 100644
--- a/browser/themes/pinstripe/browser/places/browser-places.css
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Tell the bookmarks toolbar where to find the new icons.
-   
-   These settings complement and override settings in browser.css.
-   They should be merged into chrome://browser/skin/browser.css
-   when the pre-Places bookmark system is no longer needed. */
-
-.bookmark-item > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://browser/skin/places/folderDropArrow.png") !important;
-}
-
-.bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker  {
-  list-style-image: url("chrome://browser/skin/places/folderDropHoverArrow.png") !important;
-}
-
-.bookmark-item[livemark] > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://browser/skin/places/livemarkFolder.png") !important;
-}
-
-.bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker {
-  list-style-image: url("chrome://browser/skin/places/livemarkFolderHover.png") !important;
-}
-
-.bookmark-item[livemark] .menuitem-iconic {
-  list-style-image: url("chrome://browser/skin/places/livemarkItem.png") !important;
-}
-
-#page-proxy-button {
-  list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png") !important;
-}
-
-.bookmark-item[container] {
-  list-style-image: url("chrome://global/skin/tree/folder.png") !important;
-}
-
-.bookmark-item {
-  list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png") !important;
-}
-
-.bookmark-item menuitem[openInTabs],
-.bookmark-item menuitem[siteURI] {
-  list-style-image: none;
-}