Index: browser/base/content/browser.js
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/browser.js,v
retrieving revision 1.776
diff -u -p -8 -r1.776 browser.js
--- browser/base/content/browser.js     29 Mar 2007 00:07:42 -0000      1.776
+++ browser/base/content/browser.js     16 Apr 2007 16:03:06 -0000
@@ -1031,16 +1031,18 @@ function delayedStartup()
   window.addEventListener("keypress", ctrlNumberTabSelection, false);
 
   if (gMustLoadSidebar) {
     var sidebar = document.getElementById("sidebar");
     var sidebarBox = document.getElementById("sidebar-box");
     sidebar.setAttribute("src", sidebarBox.getAttribute("src"));
   }
 
+  UpdateUrlbarSearchSplitterState();
+
   // add bookmark options to context menu for tabs
   addBookmarkMenuitems();
 
 #ifndef MOZ_PLACES_BOOKMARKS
   initServices();
   initBMService();
   // now load bookmarks
   BMSVC.readBookmarks();
@@ -2396,16 +2398,34 @@ function canonizeUrl(aTriggeringEvent, a
   }
 
   gURLBar.value = getShortcutOrURI(url, aPostDataRef);
 
   // Also update this so the browser display keeps the new value (bug 310651)
   gBrowser.userTypedValue = gURLBar.value;
 }
 
+function UpdateUrlbarSearchSplitterState()
+{
+  var splitter = document.getElementById("urlbar-search-splitter");
+  if (!splitter) {
+    splitter = document.createElement("splitter");
+    splitter.id = "urlbar-search-splitter";
+  }
+
+  var urlbar = document.getElementById("urlbar-container");
+  var searchbar = document.getElementById("search-container");
+  if (urlbar.nextSibling == searchbar)
+    urlbar.parentNode.insertBefore(splitter, searchbar);
+  else if (searchbar.nextSibling == urlbar)
+    urlbar.parentNode.insertBefore(splitter, urlbar);
+  else if (splitter.parentNode)
+    splitter.parentNode.removeChild(splitter);
+}
+
 function UpdatePageProxyState()
 {
   if (gURLBar && gURLBar.value != gLastValidURLStr)
     SetPageProxyState("invalid");
 }
 
 function SetPageProxyState(aState)
 {
@@ -3328,16 +3348,19 @@ function BrowserCustomizeToolbar()
     menubar.childNodes[i].setAttribute("disabled", true);
 
   var cmd = document.getElementById("cmd_CustomizeToolbars");
   cmd.setAttribute("disabled", "true");
 
 #ifdef TOOLBAR_CUSTOMIZATION_SHEET
   document.getElementById("customizeToolbarSheetBox").hidden = false;
 
+  var splitter = document.getElementById("urlbar-search-splitter");
+  splitter.parentNode.removeChild(splitter);
+
   /**
    * XXXmano hack: when a new tab is added while the sheet is visible,
    * the new tabpanel is overlaying the sheet. We workaround this issue by
    * hiding and reopening the sheet when a new tab is added.
    */
   function TabOpenSheetHandler(aEvent) {
     getBrowser().removeEventListener("TabOpen", TabOpenSheetHandler, false);
 
@@ -3369,16 +3392,18 @@ function BrowserToolboxCustomizeDone(aTo
       gURLBar.clickSelectsAll = gClickSelectsAll;
     gProxyButton = document.getElementById("page-proxy-button");
     gProxyFavIcon = document.getElementById("page-proxy-favicon");
     gProxyDeck = document.getElementById("page-proxy-deck");
     gHomeButton.updateTooltip();
     window.XULBrowserWindow.init();
   }
 
+  UpdateUrlbarSearchSplitterState();
+
   // Update the urlbar
   var url = getWebNavigation().currentURI.spec;
   if (gURLBar) {
     gURLBar.value = url == "about:blank" ? "" : url;
     SetPageProxyState("valid");
     XULBrowserWindow.asyncUpdateUI();    
   }
 
Index: browser/base/content/browser.xul
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/browser.xul,v
retrieving revision 1.340
diff -u -p -8 -r1.340 browser.xul
--- browser/base/content/browser.xul    1 Apr 2007 19:04:28 -0000       1.340
+++ browser/base/content/browser.xul    16 Apr 2007 16:03:06 -0000
@@ -302,17 +302,17 @@
                            ondragexit="nsDragAndDrop.dragExit(event, goButtonObserver);"
                            tooltiptext="&goEndCap.tooltip;"/>
           </stack>
         </hbox>
       </toolbaritem>
 
       <toolbaritem id="search-container" title="&searchItem.title;" 
                    align="center" class="chromeclass-toolbar-additional"
-                   flex="100">
+                   flex="100" persist="width">
         <searchbar id="searchbar" flex="1" chromedir="&locale.dir;"/>
       </toolbaritem>
 
       <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
                      label="&printButton.label;" command="cmd_print"
                      tooltiptext="&printButton.tooltip;"/>
 
       <toolbaritem id="throbber-box" title="&throbberItem.title;" align="center" pack="center">