diff --git a/mozilla/browser/base/content/customizeToolbar.css b/mozilla/browser/base/content/customizeToolbar.css
new file mode 100644
index 00000000000..58325f6f314
--- /dev/null
+++ b/mozilla/browser/base/content/customizeToolbar.css
@@ -0,0 +1,28 @@
+/*  
+  The contents of this file are subject to the Netscape Public
+  License Version 1.1 (the "License"); you may not use this file
+  except in compliance with the License. You may obtain a copy of
+  the License at http://www.mozilla.org/NPL/
+  
+  Software distributed under the License is distributed on an "AS
+  IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  implied. See the License for the specific language governing
+  rights and limitations under the License.
+  
+  The Original Code is Mozilla Communicator client code, released
+  March 31, 1998.
+  
+  The Initial Developer of the Original Code is David Hyatt. 
+  Portions created by David Hyatt are
+  Copyright (C) 2002 David Hyatt. All
+  Rights Reserved.
+  
+  Contributor(s): 
+    David Hyatt (hyatt@apple.com)
+
+*/
+
+.paletteRow {
+  padding-top: 8px;
+  padding-bottom: 8px;
+}
diff --git a/mozilla/browser/base/content/customizeToolbar.js b/mozilla/browser/base/content/customizeToolbar.js
index 366083784b3..8e0a1edcb25 100644
--- a/mozilla/browser/base/content/customizeToolbar.js
+++ b/mozilla/browser/base/content/customizeToolbar.js
@@ -26,6 +26,62 @@ function buildDialog()
 {
   var toolbar = window.opener.document.getElementById("nav-bar");
   var cloneToolbarBox = document.getElementById("cloned-bar-container");
+
+  var paletteBox = document.getElementById("palette-box");
+
   var newToolbar = toolbar.cloneNode(true);
   cloneToolbarBox.appendChild(newToolbar);
+
+  // Now build up a palette of items.
+  var currentRow = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+                                            "hbox");
+  currentRow.setAttribute("class", "paletteRow");
+
+  var rowSlot = 0;
+  var rowMax = 4;
+
+  var node = toolbar.palette.firstChild;
+  while (node) {
+    var paletteItem = node.cloneNode(true);
+    if (rowSlot == rowMax) {
+      // Append the old row.
+      paletteBox.appendChild(currentRow);
+
+      // Make a new row.
+      currentRow = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+                                            "hbox");
+      currentRow.setAttribute("class", "paletteRow");
+      rowSlot = 0;
+    } 
+
+    rowSlot++;
+    // Create an enclosure for the item.
+    var enclosure = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+                                            "toolbarpaletteitem");
+    enclosure.setAttribute("align", "center");
+    enclosure.setAttribute("pack", "center");
+    enclosure.setAttribute("flex", "1");
+    enclosure.setAttribute("width", "0");
+    enclosure.setAttribute("minheight", "0");
+    enclosure.setAttribute("minwidth", "0");
+    
+    enclosure.appendChild(paletteItem);
+    currentRow.appendChild(enclosure);
+
+    node = node.nextSibling;
+  }
+
+  if (currentRow) { 
+    // Remaining flex
+    var remainingFlex = rowMax - rowSlot;
+    if (remainingFlex > 0) {
+      var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
+                                            "spacer");
+      spring.setAttribute("flex", remainingFlex);
+      currentRow.appendChild(spring);
+    }
+
+    paletteBox.appendChild(currentRow);
+  }
+
 }
diff --git a/mozilla/browser/base/content/customizeToolbar.xul b/mozilla/browser/base/content/customizeToolbar.xul
index f7eef5390dc..8cdc75d9718 100644
--- a/mozilla/browser/base/content/customizeToolbar.xul
+++ b/mozilla/browser/base/content/customizeToolbar.xul
@@ -25,9 +25,9 @@
 -->
 
 <!DOCTYPE dialog [
-  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
   %brandDTD;
-  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
+<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd" >
 %browserDTD;
 <!ENTITY % globalRegionDTD SYSTEM "chrome://global-region/locale/region.dtd">
 %globalRegionDTD;
@@ -36,6 +36,7 @@
 ]>
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://browser/content/customizeToolbar.css" type="text/css"?>
 
 <dialog id="main-window" onload="buildDialog()"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@@ -44,4 +45,29 @@
   
 <toolbox style="margin:5px;" id="cloned-bar-container"/>
 
+<separator class="groove"/>
+
+<description>
+Drag your favorite item into the toolbar above:
+</description>
+
+<vbox style="overflow:auto; margin:0px 15px 10px 15px" flex="1" id="palette-box"/>
+
+<separator class="groove"/>
+
+<box align="center">
+<label value="Show:"/>
+<menulist>
+  <menupopup>
+     <menuitem label="Icons and Text"/>
+     <menuitem label="Icons"/>
+     <menuitem label="Text"/>
+  </menupopup>
+</menulist>
+<checkbox label="Use Small Icons"/>
+<button label="Restore Default Set"/>
+</box>
+
+<separator class="groove"/>
+
 </dialog>
diff --git a/mozilla/browser/base/jar.mn b/mozilla/browser/base/jar.mn
index bb34d64889f..f6eccc9d247 100644
--- a/mozilla/browser/base/jar.mn
+++ b/mozilla/browser/base/jar.mn
@@ -8,6 +8,7 @@ browser.jar:
         content/browser/utilityOverlay.js            (content/utilityOverlay.js)
         content/browser/customizeToolbar.xul         (content/customizeToolbar.xul)
         content/browser/customizeToolbar.js          (content/customizeToolbar.js)
+        content/browser/customizeToolbar.css         (content/customizeToolbar.css)
 
 classic.jar:
         skin/classic/browser/browser.css             (skin/browser.css)