diff --git a/browser/components/places/content/places.xul b/browser/components/places/content/places.xul
index 95a77e4ce7fa..b764c256410a 100755
--- a/browser/components/places/content/places.xul
+++ b/browser/components/places/content/places.xul
@@ -47,7 +47,12 @@
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://browser/locale/places/places.dtd">
+<!DOCTYPE window [
+<!ENTITY % placesDTD SYSTEM "chrome://browser/locale/places/places.dtd">
+%placesDTD;
+<!ENTITY % editMenuOverlayDTD SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
+%editMenuOverlayDTD;
+]>
 
 <window id="places"
         title="&places.title;" 
@@ -271,6 +276,26 @@
 #endif
       <menu id="helpMenu"/>
     </menubar>
+
+    <toolbar id="mainToolbar" class="chromeclass-toolbar">
+      <toolbarbutton id="newbookmark" command="placesCmd_new:bookmark"/>
+      <toolbarbutton id="newfolder" command="placesCmd_new:folder"/>
+      <toolbarbutton id="newseparator" command="placesCmd_new:separator"/>
+      <toolbarseparator/>
+      <!-- Not yet implemented 
+      <toolbarbutton id="moveBookmark" label="&command.moveBookmarkShort.label;"
+                     accesskey="&command.moveBookmark.accesskey;"
+                     command="cmd_bm_movebookmark"/>
+      <toolbarseparator/>
+      -->
+      <toolbarbutton id="properties" command="placesCmd_show:info"/>
+      <toolbarbutton id="rename" command="placesCmd_rename"/>
+      <toolbarbutton id="delete"
+                     command="cmd_delete"
+                     label="&deleteCmd.label;"
+                     accesskey="&deleteCmd.accesskey;" />
+    </toolbar>
+
     <toolbar class="chromeclass-toolbar">
       <textbox id="searchFilter" style="width: 23em;" timeout="500"
                oncommand="PlacesSearchBox.search(this.value);" 
@@ -286,8 +311,6 @@
           </menupopup>
         </button>
       </textbox>
-      <toolbarbutton id="toolbarNewFolder" command="placesCmd_new:folder" accesskey="&cmd.new_folder.accesskey;"/>
-      <toolbarbutton id="toolbarDelete" command="placesCmd_edit:delete"/>
       <spacer flex="1"/>
       <toolbarbutton id="toolbarGroupOff" type="radio" group="grouping" 
                      observes="placesBC_grouping:off"/>
@@ -400,4 +423,3 @@
     <statusbarpanel id="status" flex="1"/>
   </statusbar>
 </window>
-
diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn
index 62b9f841e527..62d723014769 100644
--- a/browser/themes/pinstripe/browser/jar.mn
+++ b/browser/themes/pinstripe/browser/jar.mn
@@ -50,6 +50,7 @@ classic.jar:
   skin/classic/browser/places/livemarkFolder.png            (places/livemarkFolder.png)
   skin/classic/browser/places/livemarkFolderHover.png       (places/livemarkFolderHover.png)
   skin/classic/browser/places/bookmarkProperties.css        (places/bookmarkProperties.css)
+  skin/classic/browser/places/organizer-toolbar.png         (bookmarks/Bookmarks-toolbar.png)
 #else
   skin/classic/browser/bookmarks/addBookmark.css            (bookmarks/addBookmark.css)
   skin/classic/browser/bookmarks/bookmarksProperties.css    (bookmarks/bookmarksProperties.css)
diff --git a/browser/themes/pinstripe/browser/places/places.css b/browser/themes/pinstripe/browser/places/places.css
index a9fc84ec505a..a827c55f04fe 100755
--- a/browser/themes/pinstripe/browser/places/places.css
+++ b/browser/themes/pinstripe/browser/places/places.css
@@ -250,3 +250,110 @@ treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
 .no-margin-button {
   min-width:0em;
 }
+
+/**
+ * mainToolbar
+ * style rules are (mostly) copied over from bookmarkManager.css.
+ */
+#mainToolbar toolbarbutton {
+  list-style-image: url("chrome://browser/skin/places/organizer-toolbar.png");
+  -moz-box-orient: vertical;
+}
+
+/* new bookmark */
+#newbookmark {
+  -moz-image-region: rect(0px, 168px, 24px, 144px);
+}
+#newbookmark:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 168px, 48px, 144px);
+}
+#newbookmark[disabled="true"] {
+  -moz-image-region: rect(48px, 168px, 72px, 144px);
+}
+#newbookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 168px, 96px, 144px);
+}
+
+/* new folder */
+#newfolder {
+  -moz-image-region: rect(0px, 24px, 24px, 0px);
+}
+#newfolder:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 24px, 48px, 0px);
+}
+#newfolder[disabled="true"] {
+  -moz-image-region: rect(48px, 24px, 72px, 0px);
+}
+#newfolder:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 24px, 96px, 0px);
+}
+
+/* new separator */
+#newseparator {
+  -moz-image-region: rect(0px, 48px, 24px, 24px);
+}
+#newseparator:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 48px, 48px, 24px);
+}
+#newseparator[disabled="true"] {
+  -moz-image-region: rect(48px, 48px, 72px, 24px);
+}
+#newseparator:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 48px, 96px, 24px);
+}
+
+/* moveBookmark */
+#moveBookmark {
+  -moz-image-region: rect(0px, 72px, 24px, 48px);
+}
+#moveBookmark:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 72px, 48px, 48px);
+}
+#moveBookmark[disabled="true"] {
+  -moz-image-region: rect(48px, 72px, 72px, 48px);
+}
+#moveBookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 72px, 96px, 48px);
+}
+
+/* properties */
+#properties {
+  -moz-image-region: rect(0px, 96px, 24px, 72px);
+}
+#properties:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 96px, 48px, 72px);
+}
+#properties[disabled="true"] {
+  -moz-image-region: rect(48px, 96px, 72px, 72px);
+}
+#properties:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 96px, 96px, 72px);
+}
+
+/* rename */
+#rename {
+  -moz-image-region: rect(0px, 120px, 24px, 96px);
+}
+#rename:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 120px, 48px, 96px);
+}
+#rename[disabled="true"] {
+  -moz-image-region: rect(48px, 120px, 72px, 96px);
+}
+#rename:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 120px, 96px, 96px);
+}
+
+/* delete */
+#delete {
+  -moz-image-region: rect(0px, 144px, 24px, 120px);
+}
+#delete:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px, 144px, 48px, 120px);
+}
+#delete[disabled="true"] {
+  -moz-image-region: rect(48px, 144px, 72px, 120px);
+}
+#delete:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(72px, 144px, 96px, 120px);
+}
diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn
index 15e306bbef22..b198c18ed398 100644
--- a/browser/themes/winstripe/browser/jar.mn
+++ b/browser/themes/winstripe/browser/jar.mn
@@ -57,6 +57,7 @@ classic.jar:
         skin/classic/browser/places/toolbarDropMarker.png       (places/toolbarDropMarker.png)
         skin/classic/browser/places/folderDragOver.png          (places/folderDragOver.png)
         skin/classic/browser/places/bookmarkProperties.css      (places/bookmarkProperties.css)
+        skin/classic/browser/places/organizer-toolbar.png       (bookmarks/Bookmarks-toolbar.png)
 #else
         skin/classic/browser/Bookmarks-folder.png
         skin/classic/browser/bookmarks/addBookmark.css          (bookmarks/addBookmark.css)
diff --git a/browser/themes/winstripe/browser/places/places.css b/browser/themes/winstripe/browser/places/places.css
index b5cd383e8471..04339f850125 100755
--- a/browser/themes/winstripe/browser/places/places.css
+++ b/browser/themes/winstripe/browser/places/places.css
@@ -273,3 +273,115 @@ treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
   -moz-border-top-colors: ThreeDShadow ThreeDHighlight;
 }
 
+/**
+ * mainToolbar
+ * style rules are (mostly) copied over from bookmarkManager.css.
+ */
+#mainToolbar toolbarbutton {
+  list-style-image: url("chrome://browser/skin/places/organizer-toolbar.png");
+  -moz-box-orient: vertical;
+  min-width: 57px;
+  padding: 5px;
+}
+
+#mainToolbar toolbarbutton > .toolbarbutton-icon {
+  -moz-margin-end: 0px;
+}
+
+/* new bookmark */
+#newbookmark {
+  -moz-image-region: rect(0px 24px 24px 0px);
+}
+#newbookmark:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 24px 48px 0px);
+}
+#newbookmark[disabled="true"] {
+  -moz-image-region: rect(72px 24px 96px 0px);
+}
+#newbookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 24px 72px 0px);
+}
+
+/* new folder */
+#newfolder {
+  -moz-image-region: rect(0px 48px 24px 24px);
+}
+#newfolder:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 48px 48px 24px);
+}
+#newfolder[disabled="true"] {
+   -moz-image-region: rect(72px 48px 96px 24px);
+}
+#newfolder:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 48px 72px 24px);
+}
+
+/* new separator */
+#newseparator {
+  -moz-image-region: rect(0px 72px 24px 48px);
+}
+#newseparator:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 72px 48px 48px);
+}
+#newseparator[disabled="true"] {
+  -moz-image-region: rect(72px 72px 96px 48px);
+}
+#newseparator:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 72px 72px 48px);
+}
+
+/* move bookmark */
+#moveBookmark {
+  -moz-image-region: rect(0px 96px 24px 72px);
+}
+#moveBookmark:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 96px 48px 72px);
+}
+#moveBookmark[disabled="true"] {
+  -moz-image-region: rect(72px 96px 96px 72px);
+}
+#moveBookmark:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 96px 72px 72px);
+}
+
+/* properties */
+#properties {
+  -moz-image-region: rect(0px 120px 24px 96px);
+}
+#properties:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 120px 48px 96px);
+}
+#properties[disabled="true"] {
+  -moz-image-region: rect(72px 120px 96px 96px);
+}
+#properties:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 120px 72px 96px);
+}
+
+/* rename */
+#rename {
+  -moz-image-region: rect(0px 144px 24px 120px);
+}
+#rename:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 144px 48px 120px);
+}
+#rename[disabled="true"] {
+  -moz-image-region: rect(72px 144px 96px 120px);
+}
+#rename:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 144px 72px 120px);
+}
+
+/* delete */
+#delete {
+  -moz-image-region: rect(0px 168px 24px 144px);
+}
+#delete:not([disabled="true"]):hover {
+  -moz-image-region: rect(24px 168px 48px 144px);
+}
+#delete[disabled="true"] {
+  -moz-image-region: rect(72px 168px 96px 144px);
+}
+#delete:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(48px 168px 72px 144px);
+}