diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 0ec5e29e2451..9200ed5003d2 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -211,8 +211,8 @@ function Startup()
   gBrowser = document.getElementById("content");
   gURLBar = document.getElementById("urlbar");
   
-  var toolbar = document.getElementById("nav-bar");
-  toolbar.toolbarChanged = BrowserToolbarChanged;
+  var toolbox = document.getElementById("navigator-toolbox");
+  toolbox.customizeDone = BrowserToolboxCustomizeDone;
 
   SetPageProxyState("invalid", null);
 
@@ -301,7 +301,8 @@ function Startup()
       uriToLoad = window.arguments[0];
     
     if (uriToLoad && uriToLoad != "about:blank") {
-      gURLBar.value = uriToLoad;
+      if (gURLBar)
+        gURLBar.value = uriToLoad;
       if ("arguments" in window && window.arguments.length >= 3) {
         loadURI(uriToLoad, window.arguments[2]);
       } else {
@@ -348,11 +349,14 @@ function Startup()
 
   // Focus the content area unless we're loading a blank page
   var elt;
-  if (uriToLoad == "about:blank" && !toolbar.hidden && window.locationbar.visible)
+  if (uriToLoad == "about:blank" && !toolbar.hidden &&
+      gURLBar && !gURLBar.parentNode.parentNode.collapsed)
+  {
     elt = gURLBar;
-  else
+  } else {
     elt = _content;
-
+  }
+  
   setTimeout(delayedStartup, 0, elt);
 }
 
@@ -379,13 +383,7 @@ function delayedStartup(aElt)
                               .getService(Components.interfaces.nsIPrefService);
   pref = prefService.getBranch(null);
 
-  // set home button tooltip text
-  var homeButton = document.getElementById("home-button");
-  if (homeButton) {
-    var homePage = getHomePage();
-    if (homePage)
-      homeButton.setAttribute("tooltiptext", homePage);
-  }
+  updateHomeTooltip();
 }
 
 function WindowFocusTimerCallback(element)
@@ -536,7 +534,7 @@ function addBookmarkAs(aBrowser)
 
 function openLocation()
 {
-  if (gURLBar && !document.getElementById("nav-bar").hidden) {
+  if (gURLBar && !gURLBar.parentNode.parentNode.collapsed) {
     gURLBar.focus();
     gURLBar.select();
   }
@@ -549,7 +547,8 @@ function BrowserOpenTab()
 {
   if (!gInPrintPreviewMode) {
     gBrowser.selectedTab = gBrowser.addTab('about:blank');
-    setTimeout("gURLBar.focus();", 0); 
+    if (gURLBar)
+      setTimeout("gURLBar.focus();", 0); 
   }
 }
 
@@ -1117,7 +1116,7 @@ function handleURLBarCommand(aTriggeringEvent)
 
 function UpdatePageProxyState()
 {
-  if (gURLBar.value != gLastValidURLStr)
+  if (gURLBar && gURLBar.value != gLastValidURLStr)
     SetPageProxyState("invalid", null);
 }
 
@@ -1125,6 +1124,7 @@ function SetPageProxyState(aState, aURI)
 {
   if (!gURLBar)
     return;
+
   if (!gProxyButton)
     gProxyButton = document.getElementById("page-proxy-button");
   if (!gProxyFavIcon)
@@ -1157,8 +1157,6 @@ function SetPageProxyState(aState, aURI)
 
 function PageProxyDragGesture(aEvent)
 {
-  if (!gURLBar)
-    return false;
   if (gProxyButton.getAttribute("pageproxystate") == "valid") {
     nsDragAndDrop.startDrag(aEvent, proxyIconDNDObserver);
     return true;
@@ -2535,24 +2533,6 @@ function openAboutDialog()
   window.openDialog("chrome://browser/content/aboutDialog.xul", "About", "modal,centerscreen,chrome,resizable=no");
 }
 
-function BrowserToolbarChanged()
-{
-  gURLBar = document.getElementById("urlbar");
-  gProxyButton = document.getElementById("page-proxy-button");
-  gProxyFavIcon = document.getElementById("page-proxy-favicon");
-  gProxyDeck = document.getElementById("page-proxy-deck");
-  var homeButton = document.getElementById("home-button");
-  if (homeButton) {
-    var homePage = getHomePage();
-    homeButton.setAttribute("tooltiptext", homePage);
-  }
-  window.XULBrowserWindow.init();
-
-  var url = getWebNavigation().currentURI.spec;
-  gURLBar.value = url;
-  SetPageProxyState("valid", null); // XXX Build a URI and pass it in here.
-}
-
 function BrowserCustomizeToolbar()
 {
   // Disable tlhe menubar and toolbar context menu items
@@ -2564,18 +2544,39 @@ function BrowserCustomizeToolbar()
   cmd.setAttribute("disabled", "true");
   
   window.openDialog("chrome://global/content/customizeToolbar.xul", "CustomizeToolbar",
-                    "chrome,all,dependent", gBrowser);
+                    "chrome,all,dependent", document.getElementById("navigator-toolbox"));
 }
 
-function onToolbarCustomizeComplete()
+function BrowserToolboxCustomizeDone(aToolboxChanged)
 {
+  // Update global UI elements that may have been added or removed
+  if (aToolboxChanged) {
+    gURLBar = document.getElementById("urlbar");
+    gProxyButton = document.getElementById("page-proxy-button");
+    gProxyFavIcon = document.getElementById("page-proxy-favicon");
+    gProxyDeck = document.getElementById("page-proxy-deck");
+    updateHomeTooltip();
+    window.XULBrowserWindow.init();
+  }
+
+  // Update the urlbar
+  var url = getWebNavigation().currentURI.spec;
+  if (gURLBar) {
+    gURLBar.value = url;
+    var uri = Components.classes["@mozilla.org/network/standard-url;1"]
+                        .createInstance(Components.interfaces.nsIURI);
+    uri.spec = url;
+    SetPageProxyState("valid", uri);
+  }
+
+  // Re-enable parts of the UI we disabled during the dialog
   var menubar = document.getElementById("main-menubar");
   for (var i = 0; i < menubar.childNodes.length; ++i)
     menubar.childNodes[i].setAttribute("disabled", false);
-
   var cmd = document.getElementById("cmd_CustomizeToolbars");
   cmd.removeAttribute("disabled");
 
+  // XXX Shouldn't have to do this, but I do
   window.focus();
 }
 
@@ -3210,3 +3211,12 @@ function goPreferences(containerID, paneURL, itemID)
                features, paneURL, containerID, itemID);
   }
 }
+
+function updateHomeTooltip()
+{
+  var homeButton = document.getElementById("home-button");
+  if (homeButton) {
+    var homePage = getHomePage();
+    homeButton.setAttribute("tooltiptext", homePage);
+  }
+}
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b05cd0d21f95..785446ac65f4 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -773,7 +773,7 @@ Contributor(s):
                       oncommand="BrowserPrint();"
                       tooltiptext="&printButton.tooltip;"/>
 
-      <toolbaritem id="throbber-box" align="center" pack="center" title="&throbberItem.title;">
+      <toolbaritem id="throbber-box" align="center" pack="center">
         <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')"
                 tooltiptext="&throbber.tooltip;"/>
       </toolbaritem>
diff --git a/toolkit/content/customizeToolbar.js b/toolkit/content/customizeToolbar.js
index e604f055e8a0..7a1495a86d9f 100644
--- a/toolkit/content/customizeToolbar.js
+++ b/toolkit/content/customizeToolbar.js
@@ -35,8 +35,8 @@ var gToolboxChanged = false;
 
 function onLoad()
 {
-  gToolboxDocument = window.opener.document;
-  gToolbox = gToolboxDocument.getElementsByTagName("toolbox")[0];
+  gToolbox = window.arguments[0];
+  gToolboxDocument = gToolbox.ownerDocument;
   
   gToolbox.addEventListener("draggesture", onToolbarDragGesture, false);
   gToolbox.addEventListener("dragover", onToolbarDragOver, false);
@@ -63,7 +63,6 @@ function initDialog()
   
   var mode = gToolbox.getAttribute("mode");
   document.getElementById("modelist").value = mode;
-
   var iconSize = gToolbox.getAttribute("iconsize");
   document.getElementById("smallicons").checked = iconSize == "small";
 
@@ -88,7 +87,7 @@ function slideOpen()
 {
   if (window.outerHeight <= kWindowHeight) {
     window.outerHeight += kAnimateIncrement;
-    setTimeout(slideOpen, 10);
+    setTimeout(slideOpen, 20);
   } else {
     initDialog();
   }
@@ -120,13 +119,13 @@ function removeToolboxListeners()
 }
 
 /**
- * Invoke a callback on our parent window to notify it that
- * the dialog is done and going away.
+ * Invoke a callback on the toolbox to notify it that the dialog is done
+ * and going away.
  */
 function notifyParentComplete()
 {
-  if ("onToolbarCustomizeComplete" in window.opener.top)
-    window.opener.top.onToolbarCustomizeComplete();
+  if ("customizeDone" in gToolbox)
+    gToolbox.customizeDone(gToolboxChanged);
 }
 
 /**
@@ -700,9 +699,12 @@ var toolbarDNDObserver =
   onDragOver: function (aEvent, aFlavour, aDragSession)
   {
     var toolbar = aEvent.target;
-    while (toolbar && toolbar.localName != "toolbar")
+    var dropTarget = aEvent.target;
+    while (toolbar && toolbar.localName != "toolbar") {
+      dropTarget = toolbar;
       toolbar = toolbar.parentNode;
-
+    }
+    
     var previousDragItem = gCurrentDragOverItem;
 
     // Make sure we are dragging over a customizable toolbar.
@@ -711,19 +713,19 @@ var toolbarDNDObserver =
       return;
     }
     
-    if (aEvent.target.localName == "toolbar") {
-      gCurrentDragOverItem = aEvent.target;
+    if (dropTarget.localName == "toolbar") {
+      gCurrentDragOverItem = dropTarget;
     } else {
-      var dropTargetWidth = aEvent.target.boxObject.width;
-      var dropTargetX = aEvent.target.boxObject.x;
+      var dropTargetWidth = dropTarget.boxObject.width;
+      var dropTargetX = dropTarget.boxObject.x;
 
       gCurrentDragOverItem = null;
       if (aEvent.clientX > (dropTargetX + (dropTargetWidth / 2))) {
-        gCurrentDragOverItem = aEvent.target.nextSibling;
+        gCurrentDragOverItem = dropTarget.nextSibling;
         if (!gCurrentDragOverItem)
           gCurrentDragOverItem = toolbar;
       } else
-        gCurrentDragOverItem = aEvent.target;
+        gCurrentDragOverItem = dropTarget;
     }    
 
     if (previousDragItem && gCurrentDragOverItem != previousDragItem) {
diff --git a/toolkit/content/customizeToolbar.xul b/toolkit/content/customizeToolbar.xul
index f5def6250fe6..eb1bc6c3c44a 100644
--- a/toolkit/content/customizeToolbar.xul
+++ b/toolkit/content/customizeToolbar.xul
@@ -73,7 +73,7 @@
   <separator class="groove"/>
 
   <hbox align="center" pack="end">
-    <button label="&saveChanges.label;" oncommand="onAccept();"/>
+    <button label="&saveChanges.label;" oncommand="onAccept();" default="true"/>
   </hbox>
 </vbox>