diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 2b87dd1de5a..a35d3cdd271 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -734,7 +734,7 @@ Contributor(s):
                          tooltiptext="&stopButton.tooltip;"/>
 
           <toolbarbutton id="home-button" class="toolbarbutton-1"
-                         label="&homeButton.label;" persist="hidden"
+                         label="&homeButton.label;"
                          ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver);"
                          ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver);"
                          ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
@@ -778,7 +778,7 @@ Contributor(s):
 
         <toolbaritem id="go-container" align="center" class="chromeclass-location">
           <button id="go-button" class="button-toolbar"
-                  label="&goButton.label;" persist="hidden"
+                  label="&goButton.label;"
                   oncommand="addToUrlbarHistory(); BrowserLoadURL();"
                   ondragover="nsDragAndDrop.dragOver(event, goButtonObserver);"
                   ondragdrop="nsDragAndDrop.drop(event, goButtonObserver);"
@@ -787,7 +787,7 @@ Contributor(s):
         </toolbaritem>
 
         <toolbarbutton id="print-button" class="toolbarbutton-1"
-                       label="&printButton.label;" persist="hidden"
+                       label="&printButton.label;"
                        oncommand="BrowserPrint();"
                        tooltiptext="&printButton.tooltip;"/>
 
diff --git a/browser/base/content/customizeToolbar.js b/browser/base/content/customizeToolbar.js
index b1156296254..b9b298e7685 100644
--- a/browser/base/content/customizeToolbar.js
+++ b/browser/base/content/customizeToolbar.js
@@ -431,11 +431,19 @@ function updateToolbar()
       newSet += ",";
   }
 
-  var toolbar = window.opener.document.getElementById("nav-bar");
-  toolbar.setAttribute("currentset", newSet);
-  window.opener.document.persist("nav-bar", "currentset");
+  var newToolbar = window.opener.document.getElementById("nav-bar");
+  newToolbar.setAttribute("currentset", newSet);
+  
+  var icons = toolbar.getAttribute("iconsize");
+  if (icons)
+    newToolbar.setAttribute("iconsize", icons);
+  else
+    newToolbar.removeAttribute("iconsize");
 
-  toolbar.rebuild();
+  window.opener.document.persist("nav-bar", "currentset");
+  window.opener.document.persist("nav-bar", "iconsize");
+
+  newToolbar.rebuild();
 }
 
 // Revert back to the default set.
@@ -476,3 +484,14 @@ function resetToDefault()
 
   gToolbarChanged = true;
 }
+
+function updateIconSize(useSmallIcons)
+{
+  var toolbar = document.getElementById("cloneToolbar");
+  if (useSmallIcons)
+    toolbar.setAttribute("iconsize", "small");
+  else
+    toolbar.removeAttribute("iconsize");
+  toolbar.removeAttribute("minheight");
+  gToolbarChanged = true;
+}
diff --git a/browser/base/content/customizeToolbar.xul b/browser/base/content/customizeToolbar.xul
index 7f666e31f81..96a74e84051 100644
--- a/browser/base/content/customizeToolbar.xul
+++ b/browser/base/content/customizeToolbar.xul
@@ -74,7 +74,7 @@
        <menuitem label="&text.label;"/>
     </menupopup>
   </menulist>
-  <checkbox label="&useSmallIcons.label;"/>
+  <checkbox oncommand="updateIconSize(this.checked);" label="&useSmallIcons.label;"/>
   <button label="&restoreDefaultSet.label;" oncommand="resetToDefault()"/>
 </box>