diff --git a/browser/base/content/customizeToolbar.css b/browser/base/content/customizeToolbar.css
index 54aed88d4da..e69de29bb2d 100644
--- a/browser/base/content/customizeToolbar.css
+++ b/browser/base/content/customizeToolbar.css
@@ -1,50 +0,0 @@
-/*  
-  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)
-    Blake Ross (blaker@netscape.com)
-
-*/
-
-#cloned-bar-container {
-  margin: 5px;
-}
-
-#palette-box {
-  overflow:auto; 
-  margin:0px 15px 10px 15px;
-}
-
-#cloneToolbar > toolbarpaletteitem {
-  border-left: 2px solid transparent;
-}
-
-#cloneToolbar > toolbarpaletteitem[dragactive] {
-  border-left: 2px solid black;
-}
-
-#palette-box > hbox > toolbarpaletteitem {
-  padding-top: 8px;
-  padding-bottom: 8px;
-}
-
-#palette-box > hbox {
-  min-height: 8em;
-}
diff --git a/browser/base/content/customizeToolbar.js b/browser/base/content/customizeToolbar.js
index 2631dbb7002..e69de29bb2d 100644
--- a/browser/base/content/customizeToolbar.js
+++ b/browser/base/content/customizeToolbar.js
@@ -1,569 +0,0 @@
-/* 
-  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)
-    Blake Ross (blaker@netscape.com)
-
-*/
-
-var gToolbarChanged = false;
-var gCurrentDragOverItem = null;
-var gDraggingFromPalette = false;
-
-function addItemToToolbar(newItem, newToolbar)
-{
-  var enclosure = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                       "toolbarpaletteitem");
-  if (newItem.getAttribute("flex"))
-    enclosure.setAttribute("flex", newItem.getAttribute("flex"));
-
-  // Set a draggesture handler to allow drag-rearrange within the clone toolbar.
-  enclosure.setAttribute("ondraggesture", "gDraggingFromPalette = false; nsDragAndDrop.startDrag(event, dragObserver)");
-  enclosure.appendChild(newItem);
-  cleanUpItemForAdding(newItem);
-  
-  newToolbar.appendChild(enclosure);
-}
-
-function buildDialog()
-{
-  var toolbar = window.opener.document.getElementById("nav-bar");
-
-  var useSmallIcons = document.getElementById("smallicons");
-  var iconSize = toolbar.getAttribute("iconsize");
-  useSmallIcons.checked = (iconSize == "small");
-
-  var modeList = document.getElementById("modelist");
-  var modeValue = toolbar.getAttribute("mode");
-  if (!modeValue)
-    modeValue = "full";
-  modeList.value = modeValue;
-  if (modeValue == "text") {
-    useSmallIcons.disabled = true;
-    useSmallIcons.checked = false;
-  }
-  
-  var cloneToolbarBox = document.getElementById("cloned-bar-container");
-  var paletteBox = document.getElementById("palette-box");
-  var currentSet = toolbar.getAttribute("currentset");
-  if (!currentSet)
-    currentSet = toolbar.getAttribute("defaultset");
-  currentSet = currentSet.split(",");
-
-  // Create a new toolbar that will model the one the user is trying to customize.
-  // We won't just cloneNode() because we want to wrap each element on the toolbar in a
-  // <toolbarpaletteitem/>, to prevent them from getting events (so they aren't styled on
-  // hover, etc.) and to allow us to style them in the new nsITheme world.
-  var newToolbar = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                            "toolbar");
-  newToolbar.id = "cloneToolbar";
-  
-  if (useSmallIcons.checked)
-    newToolbar.setAttribute("iconsize", "small");
-  newToolbar.setAttribute("mode", modeValue);
-
-  // Walk through and manually clone the children of the to-be-customized toolbar.
-  // Make sure all buttons look enabled (and that textboxes are disabled).
-  var toolbarItem = toolbar.firstChild;
-  while (toolbarItem) {
-    var newItem = toolbarItem.cloneNode(true);
-    addItemToToolbar(newItem, newToolbar);
-    toolbarItem = toolbarItem.nextSibling;
-  }
-
-  cloneToolbarBox.appendChild(newToolbar);
-  
-  // Now build up a palette of items.
-  buildPalette(paletteBox, toolbar, currentSet);
-
-  // Set a min height on the new toolbar so it doesn't shrink if all the buttons are removed.
-  newToolbar.setAttribute("minheight", newToolbar.boxObject.height);
-}
-
-function createEnclosure(paletteItem, currentRow)
-{
-  // Create an enclosure for the item.
-  var enclosure = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                       "toolbarpaletteitem");
-  enclosure.setAttribute("flex", "1");
-  if (paletteItem.localName != "toolbarseparator")
-    enclosure.setAttribute("align", "center");
-  
-  enclosure.setAttribute("pack", "center");
-  enclosure.setAttribute("width", "0");
-  enclosure.setAttribute("minheight", "0");
-  enclosure.setAttribute("minwidth", "0");
-
-  enclosure.setAttribute("ondraggesture", "gDraggingFromPalette = true; nsDragAndDrop.startDrag(event, dragObserver)");
-
-  enclosure.appendChild(paletteItem);
-  currentRow.appendChild(enclosure);
-}
-
-function buildPalette(paletteBox, toolbar, currentSet)
-{
-  var currentRow = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                            "hbox");
-  currentRow.setAttribute("class", "paletteRow");
-
-  var rowSlot = 1;
-  var rowMax = 4;
-
-  // Add the toolbar separator first.
-  var node = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                      "toolbarseparator");
-  node.setAttribute("id", "separator");
-
-  createEnclosure(node, currentRow);
-
-  node = toolbar.palette.firstChild;
-  var isOnToolbar = false;
-  while (node) {
-    for (var i = 0; i < currentSet.length; ++i) {
-      if (currentSet[i] == node.id) {
-        isOnToolbar = true;
-        break;
-      }
-    }
-    if (isOnToolbar) {
-      node = node.nextSibling;
-      isOnToolbar = false;
-      continue;
-    }
-    var paletteItem = node.cloneNode(true);
-    cleanUpItemForAdding(paletteItem);
-
-    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++;
-    createEnclosure(paletteItem, currentRow);
-    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);
-  }
-}
-
-var dragObserver = {
-  onDragStart: function (aEvent, aXferData, aDragAction) {
-    aXferData.data = new TransferDataSet();
-    var data = new TransferData();
-    data.addDataForFlavour("text/toolbaritem-id", aEvent.target.firstChild.id);
-    aXferData.data.push(data);
-  }
-}
-
-var toolbarDNDObserver = {
-  onDragOver: function (aEvent, aFlavour, aDragSession)
-  {
-    if (gCurrentDragOverItem)
-      gCurrentDragOverItem.removeAttribute("dragactive");
-
-    var dropTargetWidth = aEvent.target.boxObject.width;
-    var dropTargetX = aEvent.target.boxObject.x;
-
-    if (aEvent.clientX > (dropTargetX + (dropTargetWidth / 2)))
-      gCurrentDragOverItem = aEvent.target.nextSibling;
-    else
-      gCurrentDragOverItem = aEvent.target;
-
-    gCurrentDragOverItem.setAttribute("dragactive", "true");
-    aDragSession.canDrop = true;
-  },
-  onDrop: function (aEvent, aXferData, aDragSession)
-  {
-    var newButtonId = aXferData.data;
-    if (gCurrentDragOverItem.firstChild.id == newButtonId)
-      return;
-    var toolbar = document.getElementById("cloneToolbar");
-    var item = null;
-    if (gDraggingFromPalette) {
-      var palette = document.getElementById("palette-box");
-      var paletteItems = palette.getElementsByTagName("toolbarpaletteitem");
-      var paletteItem;
-      for (var i = 0; i < paletteItems.length; ++i) {
-        paletteItem = paletteItems[i];
-        if (paletteItem.firstChild.id == newButtonId) {
-          item = paletteItem;
-          break;
-        }
-      }
-
-    }
-    else {
-      // If drag-rearranging within the toolbar, we want to move it to
-      // the new location, so remove it here and we'll add it in the correct spot further down.
-      var toolbarItem = toolbar.firstChild;
-      while (toolbarItem) {
-        if (toolbarItem.firstChild.id == newButtonId) {
-          item = toolbarItem;
-          break;
-        }
-        toolbarItem = toolbarItem.nextSibling;
-      }
-    }
-       
-    if (!item)
-      return;
-
-    // If we're a separator and dragging from the palette, do a clone so that the
-    // separator always stays in the palette.
-    var isSeparator = false;
-    if (gDraggingFromPalette && item.firstChild.localName == "toolbarseparator") {
-      item = item.cloneNode(true);
-      isSeparator = true;
-    }
-
-    // We have to remove the funky flex and width attributes that were set on
-    // the item to space it properly in the palette.
-    item.removeAttribute("flex");
-    item.removeAttribute("width");
-    item.removeAttribute("minwidth");
-    item.removeAttribute("minheight");
-    item.removeAttribute("align");
-    item.removeAttribute("pack");
-    
-    // Set whatever flex the item in our enclosure has on the enclosure,
-    // so that we flex properly.
-    if (item.firstChild.getAttribute("flex"))
-      item.setAttribute("flex", item.firstChild.getAttribute("flex"));
-    item.setAttribute("ondraggesture", "gDraggingFromPalette = false; nsDragAndDrop.startDrag(event, dragObserver);");
- 
-    var currentRow;
-    if (gDraggingFromPalette && !isSeparator)
-      currentRow = item.parentNode;
-
-    if (gCurrentDragOverItem.id == "cloneToolbar")
-      toolbar.appendChild(item);
-    else
-      toolbar.insertBefore(item, gCurrentDragOverItem);
-    gCurrentDragOverItem.removeAttribute("dragactive");
-    gCurrentDragOverItem = null;
-
-    gToolbarChanged = true;
-
-    while (currentRow) {
-      // Pull the first child of the next row up
-      // into this row.
-      var nextRow = currentRow.nextSibling;
-      
-      if (!nextRow) {
-        var last = currentRow.lastChild;
-        var first = currentRow.firstChild;
-        if (first == last) {
-          // Kill the row.
-          currentRow.parentNode.removeChild(currentRow);
-          return;
-        }
-
-        if (last.localName == "spacer") {
-          var flex = last.getAttribute("flex");
-          flex++;
-          last.setAttribute("flex", flex);
-          // Reflow doesn't happen for some reason.  Trigger it with a hide/show. ICK! -dwh
-          last.hidden = true;
-          last.hidden = false;
-          return;
-        }
-        else {
-          // Make a spacer and give it a flex of 1.
-          var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                            "spacer");
-          spring.setAttribute("flex", "1");
-          currentRow.appendChild(spring);
-        }
-        return;
-      }
-      
-      currentRow.appendChild(nextRow.firstChild);
-      currentRow = currentRow.nextSibling;
-    }
-  },
-  _flavourSet: null,
-  getSupportedFlavours: function ()
-  {
-    if (!this._flavourSet) {
-      this._flavourSet = new FlavourSet();
-      this._flavourSet.appendFlavour("text/toolbaritem-id");
-    }
-    return this._flavourSet;
-  }
-}
-
-var paletteDNDObserver = {
-  onDragOver: function(aEvent, aFlavour, aDragSession)
-  {
-    aDragSession.canDrop = !gDraggingFromPalette && aEvent.target.localName != "hbox";
-  },
-  onDrop: function(aEvent, aXferData, aDragSession)
-  {
-    var itemID = aXferData.data;
-    
-    var item = null;
-    var palette = document.getElementById("palette-box");
-    var toolbar = document.getElementById("cloneToolbar");
-    var toolbarItem = toolbar.firstChild;
-    while (toolbarItem) {
-      if (toolbarItem.firstChild.id == itemID) {
-        item = toolbarItem;
-        break;
-      }
-      toolbarItem = toolbarItem.nextSibling;
-    }
-    if (!item) {
-      return;
-    }
-
-    gToolbarChanged = true;
-
-    if (itemID == "separator") {
-      item.parentNode.removeChild(item);
-      return;
-    }
-
-    // We're going back in the palette now, so we have to readd the flex
-    // and width which we removed when moving the item to the toolbar.
-    // (These attributes help space the items properly in the palette.)
-    item.setAttribute("flex", "1");
-    item.setAttribute("width", "0");
-    item.setAttribute("align", "center");
-    item.setAttribute("pack", "center");
-    item.setAttribute("flex", "1");
-    item.setAttribute("width", "0");
-    item.setAttribute("minheight", "0");
-    item.setAttribute("minwidth", "0");
-    item.setAttribute("ondraggesture", "gDraggingFromPalette = true; nsDragAndDrop.startDrag(event, dragObserver)");
- 
-    // Now insertBefore |item| in the right place.
-    var target = aEvent.target;
-
-    if (target == palette) {
-      target = palette.lastChild.lastChild;
-      if (target.localName != "spacer") {
-        // Create a new row, insert, create the spring and bail.
-        // Now build up a palette of items.
-        var newRow = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                                  "hbox");
-        newRow.setAttribute("class", "paletteRow");
-        newRow.appendChild(item);
-        var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                            "spacer");
-        spring.setAttribute("flex", "3");
-        newRow.appendChild(spring);
-        palette.appendChild(newRow);
-        return;
-      }
-    }
-
-    target.parentNode.insertBefore(item, target);
-    
-    // Now walk all of the parent rows and take the last child of the row and shove it down to the next
-    // row.  If we hit the spring as the last child, then reduce its flex by 1.
-    var currentRow = target.parentNode;
-    var nextRow = currentRow.nextSibling;
-    while (currentRow) {
-      var last = currentRow.lastChild;
-      if (last.localName == "spacer") {
-        var flex = last.getAttribute("flex");
-        if (flex > 1) {
-          flex--;
-          last.setAttribute("flex", flex);
-        }
-        else
-          currentRow.removeChild(last);
-         
-        break;
-      }
-     
-      if (nextRow) {
-        nextRow.insertBefore(currentRow.lastChild, nextRow.firstChild);
-      }
-      else {
-        // Create a new row. Add the item and a spring and break.
-        var newRow = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                                  "hbox");
-        newRow.setAttribute("class", "paletteRow");
-        newRow.appendChild(currentRow.lastChild);
-        var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul",
-                                            "spacer");
-        spring.setAttribute("flex", "3");
-        newRow.appendChild(spring);
-        palette.appendChild(newRow);
-        break;
-      }
-
-      currentRow = nextRow;
-      nextRow = currentRow.nextSibling;
-    }
-  },
-  _flavourSet: null,
-  getSupportedFlavours: function ()
-  {
-    if (!this._flavourSet) {
-      this._flavourSet = new FlavourSet();
-      this._flavourSet.appendFlavour("text/toolbaritem-id");
-    }
-    return this._flavourSet;
-  }
-}
-
-// Make sure all buttons look enabled (and that textboxes are disabled).
-// Hey, you try to come up with a better name.
-function cleanUpItemForAdding(aPaletteItem)
-{
-  aPaletteItem.removeAttribute("observes");
-  aPaletteItem.removeAttribute("disabled");
-  aPaletteItem.removeAttribute("type");
-  
-  if (aPaletteItem.localName == "toolbaritem" && 
-      aPaletteItem.firstChild) {
-    aPaletteItem.firstChild.removeAttribute("observes");
-    if (aPaletteItem.firstChild.localName == "textbox")
-      aPaletteItem.firstChild.setAttribute("disabled", "true");
-    else {
-      // So the throbber doesn't throb in the dialog,
-      // cute as that may be...
-      aPaletteItem.firstChild.removeAttribute("busy");
-    }
-  }
-}
-
-// Save the changes to the toolbar and update all windows
-function updateToolbar()
-{
-  if (!gToolbarChanged)
-    return;
-
-  var toolbar = document.getElementById("cloneToolbar");
-  var node = toolbar.firstChild;
-  
-  var newSet = "";
-  while (node) {
-    newSet += node.firstChild.id;
-    node = node.nextSibling;
-    if (node)
-      newSet += ",";
-  }
-
-  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");
-
-  var mode = toolbar.getAttribute("mode");
-  newToolbar.setAttribute("mode", mode);
-
-  window.opener.document.persist("nav-bar", "currentset");
-  window.opener.document.persist("nav-bar", "iconsize");
-  window.opener.document.persist("nav-bar", "mode");
-
-  newToolbar.rebuild();
-}
-
-// Revert back to the default set.
-function resetToDefault()
-{
-  var toolbar = window.opener.document.getElementById("nav-bar");
-  var toolbarPalette = toolbar.palette;
-  var defaultSet = toolbar.getAttribute("defaultset");
-  var cloneToolbar = document.getElementById("cloneToolbar");
-  while (cloneToolbar.firstChild)
-    cloneToolbar.removeChild(cloneToolbar.firstChild);
-  var items = defaultSet.split(",");
-  for (var i = 0; i < items.length; i++) {
-    var item = items[i];
-    if (!item) continue;
-
-    // Attempt to locate the item within the palette's list of children.
-    var paletteItem = toolbarPalette.firstChild;
-    while (paletteItem) {
-      var paletteID = paletteItem.getAttribute("id");
-      if (paletteID == item) {
-        var newItem = paletteItem.cloneNode(true);
-        newItem.hidden = true;
-        addItemToToolbar(newItem, cloneToolbar);
-        newItem.hidden = false;
-        break;
-      }
-        
-      paletteItem = paletteItem.nextSibling;
-    }
-  }
-
-  // Now rebuild the palette
-  var paletteBox = document.getElementById("palette-box");
-  while (paletteBox.firstChild)
-    paletteBox.removeChild(paletteBox.firstChild);
-  buildPalette(paletteBox, toolbar, items);
-
-  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;
-}
-
-function updateToolbarMode(modeValue)
-{
-  var toolbar = document.getElementById("cloneToolbar");
-  toolbar.setAttribute("mode", modeValue);
-  toolbar.removeAttribute("minheight");
-  gToolbarChanged = true;
-  
-  var iconSizeCheckbox = document.getElementById("smallicons");
-  if (modeValue == "text") {
-    iconSizeCheckbox.disabled = true;
-    iconSizeCheckbox.checked = false;
-    updateIconSize(false);
-  }
-  else {
-    iconSizeCheckbox.disabled = false;
-  }
-}
\ No newline at end of file