put the home button on the main toolbar.

browser/base/resources/content/browser.xul

@@ -762,6 +762,13 @@ Contributor(s): ______________________________________. -->
                        label="&stopButton.label;"
                        oncommand="BrowserStop();" observes="canStop"  
                        tooltiptext="&stopButton.tooltip;"/>
+        <toolbarbutton id="home-button" class="toolbarbutton-1"
+                       label="&homeButton.label;" persist="hidden"
+                       ondraggesture="nsDragAndDrop.startDrag(event, homeButtonObserver);"
+                       ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver);"
+                       ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver);"
+                       ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
+                       oncommand="BrowserHome();"/>
       </hbox>
       <toolbarseparator/>
       <toolbarbutton id="print-button" class="toolbarbutton-1"
@@ -838,16 +845,6 @@ Contributor(s): ______________________________________. -->
              grippytooltiptext="&personalToolbar.tooltip;"
              tbalign="stretch">
 
-      <toolbarbutton id="home-button" class="bookmark-item"
-                     label="&homeButton.label;" persist="hidden"
-                     ondraggesture="nsDragAndDrop.startDrag(event, homeButtonObserver);"
-                     ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver);"
-                     ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver);"
-                     ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
-                     oncommand="BrowserHome(); event.preventBubble();"/>
-  
-      <toolbarseparator id="home-bm-separator" persist="hidden"/>
- 
       <!-- Personal toolbar items -->
       <hbox id="innermostBox" flex="1" style="min-width: 1px;" context="bmContext" 
            datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch"

browser/base/resources/jar.mn

@@ -22,6 +22,9 @@ browser.jar:
 classic.jar:
         skin/classic/browser/browser.css             (skin/browser.css)
         skin/classic/browser/contents.rdf            (skin/contents.rdf)
+        skin/classic/browser/home.gif                (skin/home.gif)
+        skin/classic/browser/home-active.gif         (skin/home-active.gif)
+        skin/classic/browser/home-hover.gif          (skin/home-hover.gif)
 en-US.jar:
         locale/en-US/browser/contents.rdf            (locale/contents.rdf)
         locale/en-US/browser/viewSource.dtd          (locale/viewSource.dtd)

browser/base/resources/skin/browser.css

@@ -308,15 +308,15 @@
 /* ::::: personal toolbar ::::: */
 
 #home-button {
-  list-style-image: url("chrome://communicator/skin/bookmarks/home.gif");
+  list-style-image: url("chrome://browser/skin/home.gif");
 }
   
 #home-button:hover {
-  list-style-image: url("chrome://communicator/skin/bookmarks/home-hover.gif");
+  list-style-image: url("chrome://browser/skin/home-hover.gif");
 }
   
 #home-button:hover:active {
-  list-style-image: url("chrome://communicator/skin/bookmarks/home-active.gif");
+  list-style-image: url("chrome://browser/skin/home-active.gif");
 }
 
 #security-button {