diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 80dbe313f23..988fc532110 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -272,7 +272,7 @@
 #ifdef MOZ_PLACES
       <toolbarbutton id="bookmarksBarShowPlaces"
                      oncommand="PlacesBrowserShim.showHistory()"/>
-      <toolbaritem flex="1" id="bookmarksBarContainer">
+      <toolbaritem flex="1" id="bookmarksBarContainer" title="&bookmarksItem.title;">
          <hbox id="bookmarksBarContent" flex="1" context="placesContext"/>
       </toolbaritem>
       <toolbarbutton id="places-bookmark" 
@@ -342,11 +342,11 @@
                        label="&downloads.label;"
                        tooltiptext="&downloads.tooltip;"/>
 
+#ifndef MOZ_PLACES
         <toolbarbutton id="history-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        observes="viewHistorySidebar"
                        tooltiptext="&historyButton.tooltip;"/>
 
-#ifndef MOZ_PLACES
         <toolbarbutton id="bookmarks-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                        observes="viewBookmarksSidebar"
                        tooltiptext="&bookmarksButton.tooltip;"
diff --git a/mozilla/browser/components/places/content/toolbar.xml b/mozilla/browser/components/places/content/toolbar.xml
index 589352c10a6..dad0ef82d50 100755
--- a/mozilla/browser/components/places/content/toolbar.xml
+++ b/mozilla/browser/components/places/content/toolbar.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0"?>
 
+<!DOCTYPE bindings [
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+%browserDTD;
+]>
+
 <bindings id="placesToolbarBindings"
           xmlns="http://www.mozilla.org/xbl"
           xmlns:xbl="http://www.mozilla.org/xbl"
@@ -17,7 +22,9 @@
           <xul:hbox class="toolbar-drop-indicator"/>
         </xul:hbox>
         <xul:hbox flex="1">
-          <children/>
+          <xul:hbox class="bookmarks-toolbar-items places-toolbar-items" flex="1">
+            <children/>
+          </xul:hbox>
           <xul:hbox mousethrough="always"
                     flex="1"
                     pack="end">
@@ -32,6 +39,9 @@
 							 />
             </xul:toolbarbutton>
           </xul:hbox>
+          <xul:toolbarbutton class="bookmark-item bookmarks-toolbar-customize"
+                             mousethrough="never"
+                             label="&bookmarksToolbarItem.label;"/>
         </xul:hbox>
       </xul:vbox>
     </content>
@@ -70,8 +80,8 @@
         ]]></body>
       </method>
 
-      <field name="_dropIndicatorBar">document.getAnonymousNodes(this)[0].firstChild</field>
-      <field name="_chevron">document.getAnonymousNodes(this)[0].childNodes[1].firstChild.firstChild</field>
+      <field name="_dropIndicatorBar">document.getAnonymousElementByAttribute(this, "class", "toolbar-drop-indicator-bar")</field>
+      <field name="_chevron">document.getAnonymousElementByAttribute(this, "class", "chevron")</field>
       
       <field name="_selection">null</field>
       
diff --git a/mozilla/browser/themes/pinstripe/browser/browser.css b/mozilla/browser/themes/pinstripe/browser/browser.css
index baf52a1ad7a..9185d82dc07 100755
--- a/mozilla/browser/themes/pinstripe/browser/browser.css
+++ b/mozilla/browser/themes/pinstripe/browser/browser.css
@@ -195,6 +195,10 @@ toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-items {
   visibility: hidden;
 }
 
+toolbarpaletteitem[place="toolbar"] .places-toolbar-items {
+  display: none;
+}
+
 /* ::::: bookmark menus ::::: */
 
 .bookmark-item > .menu-iconic-left > .menu-iconic-icon {
diff --git a/mozilla/browser/themes/winstripe/browser/browser.css b/mozilla/browser/themes/winstripe/browser/browser.css
index eb6e9a1df59..80b0d69f693 100644
--- a/mozilla/browser/themes/winstripe/browser/browser.css
+++ b/mozilla/browser/themes/winstripe/browser/browser.css
@@ -127,6 +127,10 @@ toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-items {
   visibility: hidden;
 }
 
+toolbarpaletteitem[place="toolbar"] .places-toolbar-items {
+  display: none;
+}
+
 /* ::::: bookmark menus ::::: */
 
 menu.bookmark-item,