From f8f3e80dd61fc40b713a4616a0a79b5fa25d57f4 Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com" <jaggernaut%netscape.com>
Date: Tue, 18 Sep 2001 21:47:32 +0000
Subject: [PATCH] Bug 99876: [XUL Syntax] <spring/> --> <spacer/>, r=alecf,
 sr=hyatt.

---
 content/xbl/builtin/mac/buttons.css           |   4 +-
 .../builtin/mac/platformButtonBindings.xml    |  16 +-
 content/xul/content/src/nsXULElement.cpp      |   2 +-
 .../composer/content/TextEditorAppShell.xul   |   6 +-
 editor/ui/composer/content/editor.xul         |   6 +-
 editor/ui/composer/content/pref-composer.xul  |   2 +-
 editor/ui/composer/content/pref-editing.xul   |  48 ++---
 editor/ui/composer/content/sidebar-editor.xul |   2 +-
 editor/ui/dialogs/content/EdAdvancedEdit.xul  |   8 +-
 editor/ui/dialogs/content/EdColorPicker.xul   |  18 +-
 editor/ui/dialogs/content/EdColorProps.xul    |  52 +++---
 .../ui/dialogs/content/EdConvertToTable.xul   |   4 +-
 editor/ui/dialogs/content/EdDialogOverlay.xul |   2 +-
 .../ui/dialogs/content/EdDialogTemplate.xul   |   2 +-
 editor/ui/dialogs/content/EdDictionary.xul    |  12 +-
 editor/ui/dialogs/content/EdHLineProps.xul    |   8 +-
 editor/ui/dialogs/content/EdImageMap.xul      |   6 +-
 .../ui/dialogs/content/EdImageMapHotSpot.xul  |   2 +-
 editor/ui/dialogs/content/EdImageProps.xul    |  42 ++---
 editor/ui/dialogs/content/EdInsSrc.xul        |   6 +-
 editor/ui/dialogs/content/EdInsertChars.xul   |   4 +-
 editor/ui/dialogs/content/EdInsertTable.xul   |  10 +-
 editor/ui/dialogs/content/EdLinkProps.xul     |  12 +-
 editor/ui/dialogs/content/EdListProps.xul     |   8 +-
 .../ui/dialogs/content/EdNamedAnchorProps.xul |   4 +-
 editor/ui/dialogs/content/EdPageProps.xul     |   6 +-
 editor/ui/dialogs/content/EdSpellCheck.xul    |   8 +-
 editor/ui/dialogs/content/EdTableProps.xul    |  40 ++--
 editor/ui/dialogs/content/EditConflict.xul    |  14 +-
 .../dialogs/content/EditorSaveAsCharset.xul   |   2 +-
 .../ui/helperAppDlg/nsHelperAppDlg.xul        |   2 +-
 .../resources/content/pref-contentpacks.xul   |   2 +-
 extensions/help/resources/content/help.xul    |   2 +-
 .../content/extensions/titledSplitter.xml     |   4 +-
 .../resources/content/utilWindow.xul          |   8 +-
 .../content/viewers/boxModel/boxModel.xul     |   2 +-
 .../content/viewers/boxModel/colorPicker.xul  |   2 +-
 extensions/irc/xul/content/chatzilla.xul      |   8 +-
 extensions/irc/xul/content/pref-irc.xul       |   2 +-
 .../resources/content/P3PBadPrivacyInfo.xul   |   4 +-
 .../resources/content/P3PInProgressInfo.xul   |   6 +-
 .../resources/content/P3PNoPrivacyInfo.xul    |   6 +-
 .../content/P3PPartialPrivacyInfo.xul         |   4 +-
 .../resources/content/P3PPrivacyMetInfo.xul   |   4 +-
 .../content/P3PPrivacyNotMetInfo.xul          |   4 +-
 extensions/p3p/resources/content/pref-P3P.xul | 172 +++++++++---------
 .../transformiix/resources/buster/buster.xul  |   4 +-
 .../content/history/historyTreeBindings.xml   |  16 +-
 .../content/vfd/editBindingsTest.xul          |   8 +-
 .../vixen/resources/content/vfdCommands.xul   |   4 +-
 .../vixen/resources/content/vfdScratch.xul    |   2 +-
 extensions/wallet/editor/WalletEditor.xul     |  24 +--
 extensions/wallet/editor/WalletMisc.xul       |   2 +-
 .../wallet/editor/WalletUrlspecific.xul       |   1 -
 extensions/wallet/editor/privacy.xul          |   6 +-
 .../editor/resources/content/WalletMisc.xul   |   2 +-
 .../resources/content/WalletUrlspecific.xul   |   1 -
 .../wallet/walletpreview/WalletPreview.xul    |  10 +-
 extensions/xml-rpc/test/xml-rpc.xul           |   8 +-
 intl/strres/tests/strres-test.xul             |  12 +-
 layout/html/tests/table/bugs/bug12012.xul     |   8 +-
 layout/xul/base/src/nsBoxFrame.cpp            |  40 ++--
 layout/xul/base/src/nsBoxToBlockAdaptor.cpp   |   2 +-
 layout/xul/base/src/nsSplitterFrame.cpp       |  83 +--------
 layout/xul/base/src/nsSplitterFrame.h         |  26 +--
 layout/xul/base/src/nsSprocketLayout.cpp      |  20 +-
 layout/xul/base/src/outliner/outliner.xul     |   2 +-
 .../content/abAddressBookNameDialog.xul       |   4 +-
 .../resources/content/abCardOverlay.xul       |  56 +++---
 .../resources/content/abCardViewOverlay.xul   |   2 +-
 .../resources/content/abEditListDialog.xul    |   2 +-
 .../resources/content/abListOverlay.xul       |  10 +-
 .../resources/content/abMailListDialog.xul    |   4 +-
 .../resources/content/abNewCardDialog.xul     |   2 +-
 .../content/abSelectAddressesDialog.xul       |  18 +-
 .../resources/content/addressbook.xul         |   6 +-
 .../resources/content/am-imap-advanced.xul    |   4 +-
 .../base/prefs/resources/content/am-main.xul  |   4 +-
 .../prefs/resources/content/am-server.xul     |   8 +-
 .../content/am-serverwithnoidentities.xul     |   2 +-
 .../base/prefs/resources/content/am-smtp.xul  |   2 +-
 .../prefs/resources/content/custreceipt.xul   |   8 +-
 .../prefs/resources/content/pref-mailnews.xul |   2 +-
 .../resources/content/mailWindowOverlay.xul   |   4 +-
 .../resources/content/msgHdrViewOverlay.xul   |   6 +-
 .../resources/content/newFolderDialog.xul     |   8 +-
 .../resources/content/renameFolderDialog.xul  |   4 +-
 mailnews/base/resources/content/subscribe.xul |   6 +-
 .../search/resources/content/FilterEditor.xul |   4 +-
 .../resources/content/FilterListDialog.xul    |   4 +-
 .../search/resources/content/SearchDialog.xul |  10 +-
 .../resources/content/MsgAttachPage.xul       |  10 +-
 .../resources/content/askSendFormat.xul       |  14 +-
 .../resources/content/messengercompose.xul    |   4 +-
 .../resources/content/fieldMapExport.xul      |  24 +--
 .../resources/content/fieldMapImport.xul      |  14 +-
 .../import/resources/content/importDialog.xul |   4 +-
 .../mime/emitters/src/nsMimeXULEmitter.cpp    |   8 +-
 netwerk/protocol/res/src/Makefile.in          |   1 -
 .../resources/content/no_space.xul            |   6 +-
 .../resources/content/confirmMigration.xul    |   2 +-
 profile/resources/content/newProfile1_1.xul   |   2 +-
 profile/resources/content/newProfile1_2.xul   |   4 +-
 .../resources/content/profileSelection.xul    |   4 +-
 .../sidebar/sidebarSplitterBindings.xml       |   8 +-
 .../sidebar/win/sidebarBindings.xml           |   2 +-
 .../communicator/xpinstall/xpinstall.css      |  12 +-
 themes/classic/editor/mac/EditModeTabs.css    |   2 +-
 themes/classic/editor/win/EditModeTabs.css    |   2 +-
 themes/classic/global/mac/button.css          |   8 +-
 themes/classic/global/mac/buttonBindings.xml  |  26 +--
 themes/classic/global/mac/classicBindings.xml |  26 +--
 .../classic/global/mac/menulistBindings.xml   |  16 +-
 themes/classic/global/win/classicBindings.xml |  14 +-
 .../classic/global/win/menulistBindings.xml   |   2 +-
 themes/classic/global/win/scrollbars.css      |   2 +-
 themes/classic/global/win/tabBindings.xml     |   2 +-
 themes/classic/global/win/tabbox.css          |  16 +-
 themes/classic/global/win/toolbar.css         |   2 +-
 .../addressbook/mac/selectAddressesDialog.css |   4 +-
 .../addressbook/win/selectAddressesDialog.css |   4 +-
 .../communicator/brand/brandBindings.xml      |   8 +-
 .../communicator/dialog/dialogBindings.xml    |   8 +-
 .../communicator/sidebar/sidebarBindings.xml  |  18 +-
 .../communicator/toolbar/toolbarBindings.xml  |  10 +-
 themes/modern/global/globalBindings.xml       |  92 +++++-----
 themes/modern/global/scrollbars-mini.css      |  16 +-
 themes/modern/global/scrollbars.css           |  16 +-
 .../addressbook/selectAddressesDialog.css     |   4 +-
 themes/modern/messenger/messenger.css         |   2 +-
 .../messengercompose/messengercompose.css     |   2 +-
 themes/modern/navigator/navigatorBindings.xml |  28 +--
 .../tests/viewer/samples/scrollbarTest1.xul   |   6 +-
 .../tests/viewer/samples/scrollbarTest2.xul   |   2 +-
 .../tests/viewer/samples/toolbarTest1.xul     |   6 +-
 xpfe/browser/resources/content/metadata.xul   |  12 +-
 .../resources/content/openLocation.xul        |   4 +-
 .../browser/resources/content/turboDialog.xul |   8 +-
 xpfe/browser/samples/dexopenchrome.xul        |  30 +--
 xpfe/browser/samples/hidetoolicon.xul         |   2 +-
 xpfe/browser/samples/tab.xul                  |  30 +--
 xpfe/browser/samples/widgets.xul              |  10 +-
 xpfe/browser/samples/xpmenu.xul               |  14 +-
 xpfe/browser/src/navigator-test1.xul          |  16 +-
 .../resources/content/dialogBindings.xml      |   6 +-
 .../resources/content/taskbarOverlay.xul      |   8 +-
 .../resources/content/tasksOverlay.xul        |   4 +-
 .../resources/content/utilityOverlay.xul      |  16 +-
 .../bookmarks/resources/addBookmark.xul       |   6 +-
 .../bookmarks/resources/bm-panel.xul          |   2 +-
 .../bookmarks/resources/bm-props.xul          |   8 +-
 .../resources/content/consoleBindings.xml     |   4 +-
 xpfe/components/find/resources/finddialog.xul |   2 +-
 .../resources/content/fontScalingOverlay.xul  |   2 +-
 .../content/pref-applications-new.xul         |   4 +-
 .../resources/content/pref-charset.xul        |   4 +-
 .../resources/content/pref-colors.xul         |   8 +-
 .../resources/content/pref-download.xul       |   2 +-
 .../resources/content/pref-fonts.xul          |   8 +-
 .../resources/content/pref-history.xul        |   4 +-
 .../resources/content/pref-languages.xul      |   2 +-
 .../resources/content/pref-policies.xul       |   2 +-
 .../resources/content/pref-proxy-manual.xul   |  10 +-
 .../resources/content/pref-smart_browsing.xul |   4 +-
 .../resources/content/pref-smartupdate.xul    |   6 +-
 .../resources/content/pref-winhooks.xul       |   2 +-
 .../search/resources/findresults.xul          |   2 +-
 xpfe/components/search/resources/internet.xul |  12 +-
 .../search/resources/search-editor.xul        |   4 +-
 .../search/resources/search-panel.xul         |   4 +-
 .../sidebar/resources/customize.xul           |   6 +-
 .../sidebar/resources/sidebarBindings.xml     |   6 +-
 .../sidebar/resources/sidebarOverlay.xul      |   6 +-
 .../ucth/resources/helperAppDldProgress.xul   |   2 +-
 .../ucth/resources/helperAppLauncher.xul      |   2 +-
 .../ucth/resources/unknownContent.xul         |   2 +-
 .../xfer/resources/downloadProgress.xul       |   6 +-
 xpfe/global/resources/content/about.xul       |   2 +-
 .../content/bindings/colorpicker.xml          | 140 +++++++-------
 .../content/bindings/progressmeter.xml        |   4 +-
 .../resources/content/bindings/scrollbar.xml  |   4 +-
 .../content/bindings/stringbundle.xml         |   2 +-
 .../resources/content/bindings/toolbar.xml    |   2 +-
 .../resources/content/bindings/tree.xml       |   2 +-
 .../resources/content/bindings/wizard.xml     |   8 +-
 .../global/resources/content/commonDialog.xul |   2 +-
 .../resources/content/dialogBindings.xml      |   6 +-
 .../content/mac/platformDialogOverlay.xul     |   8 +-
 .../content/os2/platformDialogOverlay.xul     |  12 +-
 .../content/unix/platformDialogOverlay.xul    |  12 +-
 .../content/win/platformDialogOverlay.xul     |  12 +-
 .../resources/content/wizardOverlay.xul       |   8 +-
 xpinstall/res/content/xpistatus.xul           |  12 +-
 193 files changed, 974 insertions(+), 1066 deletions(-)

diff --git a/content/xbl/builtin/mac/buttons.css b/content/xbl/builtin/mac/buttons.css
index 4238b8a70158..fdf2dfef80a3 100644
--- a/content/xbl/builtin/mac/buttons.css
+++ b/content/xbl/builtin/mac/buttons.css
@@ -42,11 +42,11 @@ input[type="submit"],input[type="reset"] {
   -moz-user-focus   : none;
 }
 
-.button-top-spring {
+.button-top-spacer {
 	height				    : 2px;
 }
 
-.button-bottom-spring {
+.button-bottom-spacer {
 	height				    : 3px;
 }
 
diff --git a/content/xbl/builtin/mac/platformButtonBindings.xml b/content/xbl/builtin/mac/platformButtonBindings.xml
index 6350568cc7ee..617adc9431ed 100644
--- a/content/xbl/builtin/mac/platformButtonBindings.xml
+++ b/content/xbl/builtin/mac/platformButtonBindings.xml
@@ -6,33 +6,33 @@
   
   <binding id="button" extends="xul:button">
     <content>
-      <xul:spring class="button-image-left" inherits="disabled"/>
+      <xul:spacer class="button-image-left" inherits="disabled"/>
       <xul:vbox flex="1" class="button-image-middle" inherits="disabled" align="center">
-        <xul:spring flex="1" class="button-top-spring"/>
+        <xul:spacer flex="1" class="button-top-spacer"/>
         <xul:box flex="1">
           <xul:html class="button-text-box" flex="1">
             <children/>
           </xul:html>
         </xul:box>
-        <xul:spring flex="1" class="button-bottom-spring"/>
+        <xul:spacer flex="1" class="button-bottom-spacer"/>
       </xul:vbox>
-      <xul:spring class="button-image-right" inherits="disabled"/>
+      <xul:spacer class="button-image-right" inherits="disabled"/>
     </content>
   </binding>
   
   <binding id="inputButton" extends="xul:button">
     <content>
-      <xul:spring class="button-image-left" inherits="disabled"/>
+      <xul:spacer class="button-image-left" inherits="disabled"/>
       <xul:vbox flex="1" class="button-image-middle" inherits="disabled" align="center">
-        <xul:spring flex="1" class="button-top-spring"/>
+        <xul:spacer flex="1" class="button-top-spacer"/>
         <xul:box flex="1">
           <xul:box class="button-text-box" flex="1">
             <xul:text inherits="disabled,value,crop,accesskey"/>
           </xul:box>
         </xul:box>
-        <xul:spring flex="1" class="button-bottom-spring"/>
+        <xul:spacer flex="1" class="button-bottom-spacer"/>
       </xul:vbox>
-      <xul:spring class="button-image-right" inherits="disabled"/>
+      <xul:spacer class="button-image-right" inherits="disabled"/>
     </content>
   </binding>
   
diff --git a/content/xul/content/src/nsXULElement.cpp b/content/xul/content/src/nsXULElement.cpp
index 265a43c0046e..97e949f8e27e 100644
--- a/content/xul/content/src/nsXULElement.cpp
+++ b/content/xul/content/src/nsXULElement.cpp
@@ -2061,7 +2061,7 @@ nsXULElement::HandleEvent(nsIDOMEvent *aEvent)
 #if 0
 // XXX move this over to the scriptable helper...
 static PRBool CanHaveBinding(nsIAtom* aTag) {
-  // The layout atoms (the boxes, stacks, and springs) are dodgy here.
+  // The layout atoms (the boxes, stacks, and spacers) are dodgy here.
   // Technically they could have bindings, but this will only apply
   // for display: none elts anyway, so we're getting into a real edge
   // case.
diff --git a/editor/ui/composer/content/TextEditorAppShell.xul b/editor/ui/composer/content/TextEditorAppShell.xul
index 395ab5595b86..fad39e8227bd 100644
--- a/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/editor/ui/composer/content/TextEditorAppShell.xul
@@ -122,7 +122,7 @@ editor.xul has these - do we need them?
       <!-- help menu filled from globalOverlay -->
       <menu accesskey="h" id="menu_Help"/>
 
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </menubar>
 
      <!-- toolbar filled out from editorOverlay -->
@@ -130,10 +130,10 @@ editor.xul has these - do we need them?
       <button id="newButton"/>
       <button id="openButton"/>
       <button id="saveButton"/>
-      <spring class="separator_small"/>
+      <spacer class="separator_small"/>
       <menubutton id="printButton"/>
       <button id="spellingButton"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </toolbar>    
   </toolbox>
 
diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index a1aae6b231ad..81090a74fe42 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -163,7 +163,7 @@
     <!-- help menu filled from globalOverlay -->
     <menu id="menu_Help"/>
 
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </menubar>
 
   <!-- toolbar filled out from editorOverlay -->
@@ -181,7 +181,7 @@
     <button id="tableButton"/>
     <button id="linkButton"/>
     <button id="namedAnchorButton"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <hbox id="throbber-box" autostretch="never">
       <button id="navigator-throbber" oncommand="goClickThrobber('editor.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
         <observes element="Editor:Throbber" attribute="busy"/>
@@ -226,7 +226,7 @@
     </menu -->
 
 
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </toolbar>
 </toolbox>
 
diff --git a/editor/ui/composer/content/pref-composer.xul b/editor/ui/composer/content/pref-composer.xul
index 17669d6bc6d0..824b238ee0f8 100644
--- a/editor/ui/composer/content/pref-composer.xul
+++ b/editor/ui/composer/content/pref-composer.xul
@@ -67,7 +67,7 @@
 <!-- HTML formatting on output -->
   <groupbox orient="vertical">
     <caption label="&savingFiles.title;"/>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
     <radiogroup orient="vertical" autostretch="never"
       id            = "preserveFormatting"
       pref          = "true"
diff --git a/editor/ui/composer/content/pref-editing.xul b/editor/ui/composer/content/pref-editing.xul
index 7441ae65d600..237dd9630fdd 100644
--- a/editor/ui/composer/content/pref-editing.xul
+++ b/editor/ui/composer/content/pref-editing.xul
@@ -51,10 +51,10 @@
       <textbox id="editorAuthor" flex="1"
                  pref="true" preftype="string" prefstring="editor.author"
                  prefattribute="value"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
   </vbox>
-  <spring class="smallspacer"/>
+  <spacer class="smallspacer"/>
   <groupbox orient="vertical" autostretch="never">
     <caption label="&pageColorHeader;"/> 
     <radiogroup id="useCustomColors" orient="vertical" autostretch="never"  
@@ -79,9 +79,9 @@
             <stack>
               <button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="textCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="textCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
             <data id="textData" pref="true" preftype="color" prefstring="editor.text_color" prefattribute="value" wsm_attributes="value"/>
@@ -91,9 +91,9 @@
             <stack>
               <button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="linkCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="linkCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
             <data id="linkData" pref="true" preftype="color" prefstring="editor.link_color" prefattribute="value" wsm_attributes="value"/>
@@ -103,9 +103,9 @@
             <stack>
               <button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="activeCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="activeCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
             <data id="aLinkData" pref="true" preftype="color" prefstring="editor.active_link_color" prefattribute="value" wsm_attributes="value"/>
@@ -115,9 +115,9 @@
             <stack>
               <button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="visitedCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="visitedCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
               <data id="fLinkData" pref="true" preftype="color" prefstring="editor.followed_link_color" prefattribute="value" wsm_attributes="value"/>
             </stack>
@@ -127,9 +127,9 @@
             <stack>
               <button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="backgroundCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="backgroundCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
             <data id="backgroundColorData" pref="true" preftype="color" prefstring="editor.background_color" prefattribute="value" wsm_attributes="value"/>
@@ -137,19 +137,19 @@
         </rows>
       </grid>
       <vbox id="ColorPreview" flex="1">
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="NormalText"      value="&normalText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="LinkText"        value="&linkText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </vbox>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
     <text class="label small-margin" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
     <hbox valign="middle" autostretch="never">
       <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width: 23em" flex="1">
diff --git a/editor/ui/composer/content/sidebar-editor.xul b/editor/ui/composer/content/sidebar-editor.xul
index 1ba0c98cfa4d..6d4895d1e444 100644
--- a/editor/ui/composer/content/sidebar-editor.xul
+++ b/editor/ui/composer/content/sidebar-editor.xul
@@ -38,7 +38,7 @@
 <script src="chrome://communicator/content/sidebar/sidebar.js" />
 <vbox id="sidebox" flex="1">
  <hbox class="sidebartitle">
-  <spring flex="1"/>
+  <spacer flex="1"/>
   <button class="dialog borderless paneltitle" 
         label="&sidebar.reload.label;"
         oncommand="window.location.reload()" />
diff --git a/editor/ui/dialogs/content/EdAdvancedEdit.xul b/editor/ui/dialogs/content/EdAdvancedEdit.xul
index adf277a234fa..b7ec6396f0dd 100644
--- a/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -98,7 +98,7 @@
         </tree>
         <hbox valign="middle" autostretch="never" flex="1">
           <text class="label" value="&editAttribute.label;"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button class="dialog" label="&removeAttribute.label;" oncommand="RemoveHTMLAttribute();"/>
         </hbox>
         <grid>
@@ -148,7 +148,7 @@
         </tree>
         <hbox valign="middle" autostretch="never" flex="1">
           <text class="label" value="&editAttribute.label;"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button class="dialog" label="&removeAttribute.label;" oncommand="RemoveCSSAttribute();"/>
         </hbox>
         <grid>
@@ -193,7 +193,7 @@
         </tree>
         <hbox valign="middle" autostretch="never" flex="1">
           <text class="label" value="&editAttribute.label;"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button class="dialog" label="&removeAttribute.label;" oncommand="RemoveJSEAttribute()"/>
         </hbox>
         <grid>
@@ -217,7 +217,7 @@
       </vbox>
     </tabpanels>
   </tabbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <hbox id="okCancelHelpButtonsRight"/> 
 
 </window>
diff --git a/editor/ui/dialogs/content/EdColorPicker.xul b/editor/ui/dialogs/content/EdColorPicker.xul
index 7716a64d684b..3d159168c059 100644
--- a/editor/ui/dialogs/content/EdColorPicker.xul
+++ b/editor/ui/dialogs/content/EdColorPicker.xul
@@ -41,7 +41,7 @@
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <broadcaster id="args" value=""/>
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <keyset id="dialogKeys"/>
   <hbox id="TableOrCellGroup" valign="middle" autostretch="never" collapsed="true">
@@ -64,7 +64,7 @@
     <radio id="WebPalette" label="&webPalette.label;" oncommand="ChangePalette('web')"/>
   </hbox>
 -->
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <vbox flex="1">
     <stack valign="middle" autostretch="never">
       <button id="LastPickedButton" class="dialog" label="&lastPickedColor.label;" 
@@ -72,13 +72,13 @@
         oncommand="SelectLastPickedColor();"/>
       <hbox style="margin-left: 5px"  mousethrough="always">
         <vbox autostretch="never">
-          <spring flex="1"/>
-          <spring id="LastPickedColor"
+          <spacer flex="1"/>
+          <spacer id="LastPickedColor"
                       LastTextColor="" LastBackgroundColor=""
                       persist="LastTextColor LastBackgroundColor"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </vbox>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </hbox>
     </stack>
     <text class="label" value="&setColor1.label;"/>
@@ -86,9 +86,9 @@
     <text class="label" value="&setColorExample.label;"/>
     <hbox valign="middle" autostretch="never" flex="1=">
       <textbox id="ColorInput" style="width: 8em" oninput="SetColorSwatch()"/>
-      <spring flex="1"/>
-      <spring id="ColorPickerSwatch"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
+      <spacer id="ColorPickerSwatch"/>
+      <spacer flex="1"/>
       <button id="DefaultColorButton" class="dialog" label="&default.label;" 
         style="margin-right:0px;" oncommand="RemoveColor()"/>
     </hbox>
diff --git a/editor/ui/dialogs/content/EdColorProps.xul b/editor/ui/dialogs/content/EdColorProps.xul
index 0ccf04ed82f0..dbb9ae5126a3 100644
--- a/editor/ui/dialogs/content/EdColorProps.xul
+++ b/editor/ui/dialogs/content/EdColorProps.xul
@@ -42,7 +42,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdColorProps.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
@@ -64,9 +64,9 @@
             <stack>
               <button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="textCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="textCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
           </row>
@@ -75,9 +75,9 @@
             <stack>
               <button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="linkCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="linkCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
           </row>
@@ -86,9 +86,9 @@
             <stack>
               <button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="activeCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="activeCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
           </row>
@@ -97,9 +97,9 @@
             <stack>
               <button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="visitedCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="visitedCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
           </row>
@@ -108,30 +108,30 @@
             <stack>
               <button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
               <hbox autostretch="never" valign="middle" mousethrough="always">
-                <spring flex="1"/>
-                <spring id="backgroundCW" class="color-well"/>
-                <spring flex="1"/>
+                <spacer flex="1"/>
+                <spacer id="backgroundCW" class="color-well"/>
+                <spacer flex="1"/>
               </hbox>
             </stack>
           </row>
         </rows>
       </grid>
       <vbox id="ColorPreview" flex="1">
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="NormalText"      value="&normalText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="LinkText"        value="&linkText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="ActiveLinkText"  value="&activeLinkText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label larger" id="VisitedLinkText" value="&visitedLinkText.label;"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </vbox>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
   </groupbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <text class="label" value="&backgroundImage.label;"/>
   <hbox>
     <textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage()"
@@ -142,9 +142,9 @@
   </hbox>
   <!-- from EdDialogOverlay.xul 'for' identifies the textfield to get URL from -->
   <checkbox id="MakeRelativeCheckbox" for="BackgroundImageInput"/>
-  <spring class="smallspacer"/>
+  <spacer class="smallspacer"/>
   <hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <!-- from EdDialogOverlay.xul -->
     <button class="dialog" id="AdvancedEditButton"/>
   </hbox>
diff --git a/editor/ui/dialogs/content/EdConvertToTable.xul b/editor/ui/dialogs/content/EdConvertToTable.xul
index b92b1f34da67..f54a4b1960d9 100644
--- a/editor/ui/dialogs/content/EdConvertToTable.xul
+++ b/editor/ui/dialogs/content/EdConvertToTable.xul
@@ -44,7 +44,7 @@
   <!--- Element-specific methods -->
   <script type="application/x-javascript" src="chrome://editor/content/EdConvertToTable.js"/>
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet"/>
   <html flex="1">&instructions.label;</html>
@@ -61,7 +61,7 @@
       <textbox class="narrow" id="SepCharacterInput" oninput="InputSepCharacter()"/>
     </hbox>
   </radiogroup> 
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <checkbox id="DeleteSepCharacter" label="&deleteCharCheck.label;" checked="true" persist="checked"/>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
diff --git a/editor/ui/dialogs/content/EdDialogOverlay.xul b/editor/ui/dialogs/content/EdDialogOverlay.xul
index b5cea0d7c17b..313929d99e72 100644
--- a/editor/ui/dialogs/content/EdDialogOverlay.xul
+++ b/editor/ui/dialogs/content/EdDialogOverlay.xul
@@ -31,7 +31,7 @@
 <vbox id="AdvancedEdit"  flex="1">
   <hbox flex="1" style="margin-top: 0.2em" autostretch="never">
     <!-- This will right-align the button -->
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="dialog" id="AdvancedEditButton1" oncommand="onAdvancedEdit()" label="&AdvancedEditButton.label;"
             tooltip="aTooltip" tooltiptext="&AdvancedEditButton.tooltip;"/>
   </hbox>
diff --git a/editor/ui/dialogs/content/EdDialogTemplate.xul b/editor/ui/dialogs/content/EdDialogTemplate.xul
index 9d5fbd842439..afb54e6c2ac1 100644
--- a/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -41,7 +41,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/Ed?????.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
 
diff --git a/editor/ui/dialogs/content/EdDictionary.xul b/editor/ui/dialogs/content/EdDictionary.xul
index 76a837002bd3..e0a4de931316 100644
--- a/editor/ui/dialogs/content/EdDictionary.xul
+++ b/editor/ui/dialogs/content/EdDictionary.xul
@@ -35,7 +35,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdDictionary.js"/>
   
   <broadcaster id="args" value=""/>
-  <spring id="location" offsetX="10" offsetY="10" persist="offsetX offsetY"/>
+  <spacer id="location" offsetX="10" offsetY="10" persist="offsetX offsetY"/>
   <keyset id="keys">
     <key keycode="VK_ENTER"  oncommand="Close()"/>
     <key keycode="VK_RETURN" oncommand="Close()"/>
@@ -47,7 +47,7 @@
     <rows>
       <row>
         <text class="label" value="&wordEditField.label;"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <textbox id="WordInput" flex="1"/>
@@ -55,7 +55,7 @@
       </row>
       <row>
         <text class="label" value="&DictionaryList.label;"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <tree rows="8" class="list" id="DictionaryList" flex="1">
@@ -63,10 +63,10 @@
         </tree>
         <vbox flex="1">
           <button class="dialog"  id="ReplaceWord" oncommand="ReplaceWord()" label="&ReplaceButton.label;"/>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
           <button class="dialog"  id="RemoveWord" oncommand="RemoveWord()" label="&RemoveButton.label;"/>
-          <spring class="spacer"/>
-          <spring flex="1"/>
+          <spacer class="spacer"/>
+          <spacer flex="1"/>
           <button class="exit-dialog" id="close" label="&CloseButton.label;" default="true" oncommand="Close();"/>  
         </vbox>
       </row>
diff --git a/editor/ui/dialogs/content/EdHLineProps.xul b/editor/ui/dialogs/content/EdHLineProps.xul
index 273e9d2e6e5c..3b36b3caafb8 100644
--- a/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/editor/ui/dialogs/content/EdHLineProps.xul
@@ -44,7 +44,7 @@
   <!--- Element-specific methods -->
   <script type="application/x-javascript" src="chrome://editor/content/EdHLineProps.js"/>
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
   
@@ -69,18 +69,18 @@
   </groupbox>
   <groupbox><caption align="left" label="&alignmentBox.label;"/>
     <radiogroup id="alignmentGroup" orient="horizontal">
-      <spring class="spacer"/>
+      <spacer class="spacer"/>
       <radio group="alignmentGroup" id="leftAlign" label="&leftRadio.value;" />
       <radio group="alignmentGroup" id="centerAlign" label="&centerRadio.value;" />
       <radio group="alignmentGroup" id="rightAlign" label="&rightRadio.value;" />
     </radiogroup>
   </groupbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <hbox>
     <button class="dialog"  id="SaveDefault" label="&saveSettings.label;" 
          oncommand="onSaveDefault()"
          tooltip="aTooltip" tooltiptext="&saveSettings.tooltip;" />
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="AdvancedEditButton"/>
   </hbox>
   <separator class="groove"/>
diff --git a/editor/ui/dialogs/content/EdImageMap.xul b/editor/ui/dialogs/content/EdImageMap.xul
index 5a43b81b4319..95eb5b8a9413 100644
--- a/editor/ui/dialogs/content/EdImageMap.xul
+++ b/editor/ui/dialogs/content/EdImageMap.xul
@@ -126,7 +126,7 @@
     </menupopup>
   </menu>
 
-  <spring flex="1"/>
+  <spacer flex="1"/>
 </menubar>
 
 
@@ -136,7 +136,7 @@
   <button id="pasteButton" class="button-toolbar-2 top" command="Map:Paste"/>
   <button id="zoomInButton" class="button-toolbar-2 top" command="Map:ZoomIn"/>
   <button id="zoomOutButton" class="button-toolbar-2 top" command="Map:ZoomOut"/>
-  <spring flex="1"/>
+  <spacer flex="1"/>
 </toolbar> 
 </toolbox>
 
@@ -148,7 +148,7 @@
     <button id="rectButton" class="tool" oncommand="changeTool(event, 'rect');"/>
     <button id="cirButton" class="tool" oncommand="changeTool(event, 'cir');"/>
     <button id="polyButton" class="tool" oncommand="changeTool(event, 'poly');"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </vbox>
   </toolbar>
 
diff --git a/editor/ui/dialogs/content/EdImageMapHotSpot.xul b/editor/ui/dialogs/content/EdImageMapHotSpot.xul
index 354492aa6c11..334a27ea2696 100644
--- a/editor/ui/dialogs/content/EdImageMapHotSpot.xul
+++ b/editor/ui/dialogs/content/EdImageMapHotSpot.xul
@@ -42,7 +42,7 @@
 
   <script type="application/x-javascript" src="chrome://editor/content/EdImageMapHotSpot.js"/>
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
 
   <groupbox orient="vertical" flex="1">
diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/editor/ui/dialogs/content/EdImageProps.xul
index db6348edd081..6f20c7d9df20 100644
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -49,7 +49,7 @@
   <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
@@ -71,11 +71,11 @@
       <checkbox 
         id  = "MakeRelativeCheckbox"
         for = "srcInput"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <!-- from EdDialogOverlay.xul -->
       <button id="ChooseFile"/>
     </hbox>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
     <hbox>
       <text class = "label"
         id      = "altTextLabel" 
@@ -88,9 +88,9 @@
         tooltip = "aTooltip" tooltiptext="&altTextEditField.tooltip;"
         flex       = "1"/>
     </hbox>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
   </groupbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <hbox align="center"> 
     <button 
       class   = "dialog" 
@@ -98,32 +98,32 @@
       oncommand = "onMoreFewer()" 
       tooltip = "aTooltip" tooltiptext = "&MoreFewerButton.tooltip;"
       persist = "more"/>
-    <spring class="bigspacer"/>
+    <spacer class="bigspacer"/>
     <groupbox style="padding-left: 8px; padding-right: 8px">
       <caption label="&previewBox.label;"/>
       <hbox id="preview-image-box" align="center">
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <html id="preview-image-holder"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </hbox>
       <vbox id="PreviewSize" collapsed="true">
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="label" value="&actualSize.label;"/>
         <hbox>
           <text class="label" value="&widthEditField.label;"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <text id="PreviewWidth" class="label"/>
         </hbox>
         <hbox>
           <text class="label" value="&heightEditField.label;"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <text id="PreviewHeight" class="label"/>
         </hbox>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </vbox>
     </groupbox>
   </hbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <!-- Area that shows and hides via MoreFewerButton --> 
   <vbox id="MoreSection" flex="1">
     <hbox>
@@ -146,17 +146,17 @@
                 tooltip = "aTooltip" tooltiptext="&customSizeRadio.tooltip;"
                 oncommand = "doDimensionEnabling();" />
             </radiogroup>
-            <spring flex="1"/>
+            <spacer flex="1"/>
             <vbox>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <!--////// CONSTRAIN DIMENSIONS //////-->
               <checkbox id="constrainCheckbox" label="&constrainCheckbox.label;"
                    oncommand="ToggleConstrain()"
                    tooltip="aTooltip" tooltiptext="&constrainCheckbox.tooltip;"/>
             </vbox>
-            <spring flex="1"/>
+            <spacer flex="1"/>
           </hbox>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
           <grid class="big-left-margin">
             <columns><column/><column/><column flex="1"/></columns>
             <rows>
@@ -190,7 +190,7 @@
               </row>
             </rows>          
           </grid>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </groupbox>
         <!--////// IMAGE MAP BUTTONS //////-->
         <groupbox orient="vertical" flex="1">
@@ -212,9 +212,9 @@
               oncommand = "removeImageMap()"
               label   = "&removeImageMapButton.label;"
               flex    = "1"/>
-            <spring flex="1"/><!-- remove when we restore Image Map Editor -->
+            <spacer flex="1"/><!-- remove when we restore Image Map Editor -->
             </hbox>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
         </groupbox>
       </vbox> <!-- vert. box on bottom left side -->
 
@@ -223,7 +223,7 @@
         <!--//////// Alignment ////////-->
         <groupbox flex="1" orient="vertical">
           <caption id="alignLabel" label="&alignment.label;"/>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
           <menulist id="alignTypeSelect" class="align-menu">
             <menupopup>
               <menuitem class="align-menu" value="top" label="&topPopup.value;"/>
diff --git a/editor/ui/dialogs/content/EdInsSrc.xul b/editor/ui/dialogs/content/EdInsSrc.xul
index d486643196b8..8d69a77e8c93 100644
--- a/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/editor/ui/dialogs/content/EdInsSrc.xul
@@ -41,7 +41,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdInsSrc.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
 
@@ -51,13 +51,13 @@
   </vbox>
   <!-- Will this accept the embedded HTML tags? -->
   <hbox>
-    <spring class="bigspacer"/>
+    <spacer class="bigspacer"/>
     <text value="&example.label;"/>
     <text class="bold" value="&exampleOpenTag.label;"/>
     <text class="bold italic" value="&exampleText.label;"/>
     <text class="bold" value="&exampleCloseTag.label;"/>
   </hbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <separator class="groove"/>
   <!-- from global dialogOverlay -->
 	<hbox id="okCancelButtons"/> 
diff --git a/editor/ui/dialogs/content/EdInsertChars.xul b/editor/ui/dialogs/content/EdInsertChars.xul
index 08a1f9955b8a..fe0621f1ba43 100644
--- a/editor/ui/dialogs/content/EdInsertChars.xul
+++ b/editor/ui/dialogs/content/EdInsertChars.xul
@@ -41,7 +41,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdInsertChars.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <broadcaster id="args" value=""/>
 
@@ -53,7 +53,7 @@
       <radio group="CatGrp" id="Lower"       label="&otherLower.label;"    oncommand="ChangeCategory(this.id)"/>
       <radio group="CatGrp" id="Symbol"      label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
     </radiogroup> 
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
   </groupbox>
   <hbox>
     <vbox flex="1">
diff --git a/editor/ui/dialogs/content/EdInsertTable.xul b/editor/ui/dialogs/content/EdInsertTable.xul
index 28377957099a..bb424bebeaf9 100644
--- a/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/editor/ui/dialogs/content/EdInsertTable.xul
@@ -44,7 +44,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdInsertTable.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
@@ -55,12 +55,12 @@
         <row valign="middle" text-align="right" autostretch="never">
           <text class="label align-right" text-align="right" value="&numRowsEditField.label;" />
           <textbox class="narrow" id="rowsInput" oninput="ChangeRowOrColumn(this.id)" />
-          <spring/>
+          <spacer/>
         </row>
         <row valign="middle" text-align="right" autostretch="never">
           <text class="label align-right" value="&numColumnsEditField.label;" />
           <textbox class="narrow" id="columnsInput" oninput="ChangeRowOrColumn(this.id)" />
-          <spring/>
+          <spacer/>
         </row>
         <row valign="middle" text-align="right" autostretch="never">
           <text class="label align-right" value="&widthEditField.label;" />
@@ -70,9 +70,9 @@
         </row>
       </rows>
     </grid>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
   </groupbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <hbox valign="middle" autostretch="never">
     <text class="label align-right" text-align="right" value="&borderEditField.label;"
         tooltip="aTooltip" tooltiptext="&borderEditField.tooltip;" />
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/editor/ui/dialogs/content/EdLinkProps.xul
index 2973cf01ca31..a080249729fb 100644
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -44,7 +44,7 @@
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
   <broadcaster id="args" value=""/>
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
@@ -62,22 +62,22 @@
       <hbox autostretch="never" valign="middle">
         <!-- from EdDialogOverlay.xul 'for' identifies the textfield to get URL from -->
         <checkbox id="MakeRelativeCheckbox" for="hrefInput"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <button class="dialog" id="ChooseFile"/>
       </hbox>
       <html class="wrap" flex="1" id="RemoveLinkMsg" style="margin-bottom: 7px">&RemoveLinkMsg.label;</html>
-      <spring class="smallspacer"/>
+      <spacer class="smallspacer"/>
       <hbox autostretch="never">
         <button class="dialog" id="MoreFewerButton" oncommand="onMoreFewer()" persist="more"/>
       </hbox>
-      <spring class="spacer"/>
+      <spacer class="spacer"/>
       <vbox id="MoreSection">
-        <spring class="spacer"/>
+        <spacer class="spacer"/>
         <text class="label" value="&NamedAnchorMsg.label;"/>
         <tree rows="4" class="list" id="NamedAnchorList" onselect="SelectNamedAnchor()">
           <treecolgroup><treecol flex="1"/></treecolgroup>
         </tree>
-        <spring class="spacer"/>
+        <spacer class="spacer"/>
         <text class="label" value="&HeadingMsg.label;"/>
         <tree rows="4" class="list" id="HeadingsList" onselect="SelectHeading()">
           <treecolgroup><treecol flex="1"/></treecolgroup>
diff --git a/editor/ui/dialogs/content/EdListProps.xul b/editor/ui/dialogs/content/EdListProps.xul
index 6cc1fba94ecd..6423e154280b 100644
--- a/editor/ui/dialogs/content/EdListProps.xul
+++ b/editor/ui/dialogs/content/EdListProps.xul
@@ -41,7 +41,7 @@
 
   <keyset id="dialogKeys"/>
   <broadcaster id="args" value=""/>
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
 
   <groupbox orient="vertical" flex="1"><caption label="&ListType.label;"/>
     <menulist id="ListType" oncommand="SelectListType()">
@@ -57,18 +57,18 @@
       <radio group="RadioGroup" id="ChangeSelected" label="&changeSelectedRadio.label;"/>
     </radiogroup>
   </groupbox>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
 
   <!-- message text and list items are set in JS 
        text value should be identical to string with id=BulletStyle in editor.properties 
   -->
   <groupbox orient="vertical" flex="1"><caption id="BulletStyleLabel" label="&bulletStyle.label;"/>
     <menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()"/>
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
     <hbox>
       <text class="label" id="StartingNumberLabel" value="&startingNumber.label;"/>
       <textbox class="narrow" id="StartingNumber" oninput="forceInteger(this.id)"/>
-      <spring/>
+      <spacer/>
     </hbox>
     <html id="StartExample" class="wrap" flex="1" style="width: 1em">&startingHelp.label;</html>
   </groupbox>
diff --git a/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 9dc811102a76..e21505ecf8b8 100644
--- a/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -43,14 +43,14 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdNamedAnchorProps.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
 
   <text class="label" align="left" for="nameInput" value="&anchorNameEditField.label;"/>
   <textbox class="MinWidth20em" id="nameInput" oninput="ChangeName()" 
              tooltip="aTooltip" tooltiptext="&nameInput.tooltip;"/>
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
   <!-- from EdDialogOverlay -->
   <vbox id="AdvancedEdit"/>
   <!-- from global dialogOverlay -->
diff --git a/editor/ui/dialogs/content/EdPageProps.xul b/editor/ui/dialogs/content/EdPageProps.xul
index 3aa407c7155f..2ca722e86cf1 100644
--- a/editor/ui/dialogs/content/EdPageProps.xul
+++ b/editor/ui/dialogs/content/EdPageProps.xul
@@ -41,7 +41,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdPageProps.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
   <grid>
@@ -55,7 +55,7 @@
         <text class="label" value="&lastModified.label;" align="left"/>
         <text class="label" id="PageModDate" align="left"/>
       </row>
-      <spring class="spacer"/>
+      <spacer class="spacer"/>
       <row valign="middle">
         <text class="label" value="&titleInput.label;"/>
         <textbox class="MinWidth20em" id="TitleInput" oninput="TextboxChanged(this.id)"/>
@@ -70,7 +70,7 @@
       </row>
     </rows>
   </grid>
-  <spring class="bigspacer"/>
+  <spacer class="bigspacer"/>
   <html class="wrap" flex="1">&EditHEADSource.label;</html>
   <separator class="groove"/>
   <hbox id="okCancelButtons"/> 
diff --git a/editor/ui/dialogs/content/EdSpellCheck.xul b/editor/ui/dialogs/content/EdSpellCheck.xul
index 72e746070424..af6569dca161 100644
--- a/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -38,7 +38,7 @@
   <script type="application/x-javascript" src="chrome://editor/content/EdSpellCheck.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="keys">
     <key keycode="VK_ENTER"  oncommand="doDefault()"/>
     <key keycode="VK_RETURN" oncommand="doDefault()"/>
@@ -55,7 +55,7 @@
       <row valign="middle" autostretch="never">
         <text class="label" id="MisspelledWordLabel" value="&misspelledWord.label;"/>
         <text class="label bold" id="MisspelledWord" crop="right"/>
-        <spring/>
+        <spacer/>
       </row>
       <row valign="middle" autostretch="never">
         <text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
@@ -91,7 +91,7 @@
               </row>
             </rows> 
           </grid>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <text class="label" value="&userDictionary.label;"/>
           <hbox flex="1" autostretch="never">
             <button class="dialog spell-check" id="AddToDictionary" oncommand="AddToDictionary()" label="&addToUserDictionaryButton.label;" />
@@ -101,7 +101,7 @@
       </row>
       <row>
         <text class="label" value ="&languagePopup.label;"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <menulist id="LanguageMenulist" oncommand="SelectLanguage()"/>
diff --git a/editor/ui/dialogs/content/EdTableProps.xul b/editor/ui/dialogs/content/EdTableProps.xul
index 2430a03b72c6..4d6828ead788 100644
--- a/editor/ui/dialogs/content/EdTableProps.xul
+++ b/editor/ui/dialogs/content/EdTableProps.xul
@@ -43,7 +43,7 @@
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
   <script type="application/x-javascript" src="chrome://help/content/help.js"/>
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <broadcaster id="args" value=""/>
   <keyset id="dialogKeys"/>
 
@@ -70,7 +70,7 @@
               </row>
             </rows>
           </grid>
-          <spring class="bigspacer"/>
+          <spacer class="bigspacer"/>
           <grid>
             <columns><column/><column/><column flex="1"/></columns>
             <rows>
@@ -114,7 +114,7 @@
               <menuitem label="&AlignRight.label;"  value="right"/>
             </menupopup>
           </menulist>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
           <text class="label" value="&tableCaption.label;"/>
           <menulist id="TableCaptionList">
             <menupopup>
@@ -130,21 +130,21 @@
           <stack>
             <button class="dialog color-button" oncommand="GetColorAndUpdate('tableBackgroundCW');"/>
             <hbox autostretch="never" valign="middle" mousethrough="always">
-              <spring flex="1"/>
-              <spring id="tableBackgroundCW" class="color-well"/>
-              <spring flex="1"/>
+              <spacer flex="1"/>
+              <spacer id="tableBackgroundCW" class="color-well"/>
+              <spacer flex="1"/>
             </hbox>
           </stack>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
           <text class="label" id="TableInheritColor" value="&tableInheritColor.label;" collapsed="true"/>
         </hbox>
         <separator class="groove"/>
         <hbox flex="1" autostretch="never">
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <!-- From EdDialogOvlerlay.xul -->
           <button class="dialog" id="AdvancedEditButton"/>
         </hbox>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </vbox><!-- Table Panel -->
 
       <!-- CELL PANEL -->
@@ -165,7 +165,7 @@
               <button id="NextButton"     class="dialog align-right" label="&cellSelectNext.label;"     oncommand="MoveSelection(1)" flex="1"/>
             </hbox>
           </vbox>
-          <spring class="bigspacer"/>
+          <spacer class="bigspacer"/>
           <vbox flex="1">
             <text class="label" value="&applyBeforeChange1.label;"/>
             <text class="label" value="&applyBeforeChange2.label;"/>
@@ -191,7 +191,7 @@
                 </row>
               </rows>
             </grid>
-            <spring class="bigspacer"/>
+            <spacer class="bigspacer"/>
           </groupbox>
           <!-- Alignment -->
           <groupbox><caption label="&cellContentAlignment.label;"/>
@@ -223,7 +223,7 @@
             </grid>
           </groupbox>
         </hbox>
-        <spring class="spacer"/>
+        <spacer class="spacer"/>
         <hbox valign="middle" autostretch="never">
           <checkbox id="CellStyleCheckbox" label="&cellStyle.label;"/>
           <menulist id="CellStyleList" oncommand="SetCheckbox('CellStyleCheckbox');">
@@ -232,7 +232,7 @@
               <menuitem label="&cellHeader.label;" value="th"/>
             </menupopup>
           </menulist>
-          <spring class="bigspacer"/>
+          <spacer class="bigspacer"/>
           <checkbox id="TextWrapCheckbox" label="&cellTextWrap.label;"/>
           <menulist id="TextWrapList" oncommand="SetCheckbox('TextWrapCheckbox');">
             <menupopup>
@@ -247,12 +247,12 @@
           <stack>
             <button class="dialog color-button" oncommand="GetColorAndUpdate('cellBackgroundCW');" flex="1"/>
             <hbox autostretch="never" valign="middle" mousethrough="always">
-              <spring flex="1"/>
-              <spring id="cellBackgroundCW" class="color-well"/>
-              <spring flex="1"/>
+              <spacer flex="1"/>
+              <spacer id="cellBackgroundCW" class="color-well"/>
+              <spacer flex="1"/>
             </hbox>
           </stack>
-          <spring class="spacer"/>
+          <spacer class="spacer"/>
           <text class="label" id="CellInheritColor" value="&cellInheritColor.label;" collapsed="true"/>
         </hbox>
         <separator class="groove"/>
@@ -261,14 +261,14 @@
           <!-- From EdDialogOvlerlay.xul -->
           <button class="dialog" id="AdvancedEditButton2"/>
         </hbox>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </vbox><!-- Cell Panel -->
 
     </tabpanels> 
-    <spring class="spacer"/>
+    <spacer class="spacer"/>
     <!-- from EdDialogOverlay -->
     <hbox>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <hbox id="okCancelHelpButtonsRight"/> 
     </hbox>
   </tabbox>
diff --git a/editor/ui/dialogs/content/EditConflict.xul b/editor/ui/dialogs/content/EditConflict.xul
index b3b3fc26e31a..be44f6deaaa0 100644
--- a/editor/ui/dialogs/content/EditConflict.xul
+++ b/editor/ui/dialogs/content/EditConflict.xul
@@ -41,25 +41,25 @@
   <script type="application/x-javascript" src="chrome://editor/content/EditConflict.js"/>
   <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
 
-  <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+  <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
   <keyset id="dialogKeys"/>
   <popupset id="aTooltipSet" />
   
   <text class="label" value ="&conflictWarning.label;"/>
-  <spring class="bigspacer"/>
+  <spacer class="bigspacer"/>
   <text class="label" value ="&conflictResolve.label;"/>
-  <spring class="bigspacer"/>
+  <spacer class="bigspacer"/>
   <hbox flex="1">
-    <spring class="bigspacer"/>
+    <spacer class="bigspacer"/>
     <button class="dialog" label="&keepCurrentPageButton.label;"
             flex="1" oncommand="KeepCurrentPage()"/>
-    <spring class="bigspacer"/>
+    <spacer class="bigspacer"/>
   </hbox>
   <hbox flex="1">
-    <spring class="bigspacer"/>
+    <spacer class="bigspacer"/>
     <button class="dialog" label="&useOtherPageButton.label;"
             flex="1" oncommand="UseOtherPage()"/>
-    <spring class="bigspacer"/>
+    <spacer class="bigspacer"/>
   </hbox>
 
 </window>
diff --git a/editor/ui/dialogs/content/EditorSaveAsCharset.xul b/editor/ui/dialogs/content/EditorSaveAsCharset.xul
index 41625e21b72a..3ff2bb5b2ab8 100644
--- a/editor/ui/dialogs/content/EditorSaveAsCharset.xul
+++ b/editor/ui/dialogs/content/EditorSaveAsCharset.xul
@@ -44,7 +44,7 @@
     <script type="application/x-javascript" src="chrome://editor/content/EditorSaveAsCharset.js"/>
     <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js" />
     
-    <spring id="location" offsetY="50" persist="offsetX offsetY"/>
+    <spacer id="location" offsetY="50" persist="offsetX offsetY"/>
     <broadcaster id="args" value=""/>
     <keyset id="dialogKeys"/>
 
diff --git a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul
index 73877a5866cc..480b9ce071bf 100644
--- a/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul
+++ b/embedding/components/ui/helperAppDlg/nsHelperAppDlg.xul
@@ -96,7 +96,7 @@
     <hbox>
       <button class="dialog" id="default.set" label="&default.set.label;" accesskey="&default.set.accesskey;"
         oncommand="dialog.setDefault()"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <hbox id="okCancelButtonsRight"/>
     </hbox>
            
diff --git a/extensions/content-packs/resources/content/pref-contentpacks.xul b/extensions/content-packs/resources/content/pref-contentpacks.xul
index bda50ec1f7bd..7101fbf5253e 100644
--- a/extensions/content-packs/resources/content/pref-contentpacks.xul
+++ b/extensions/content-packs/resources/content/pref-contentpacks.xul
@@ -152,7 +152,7 @@
   <separator class="thin"/>
 
   <hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="downloadContentPacks" 
             label="&downloadContentPacks.label;" 
             accesskey="&downloadContentPacks.accesskey;" 
diff --git a/extensions/help/resources/content/help.xul b/extensions/help/resources/content/help.xul
index f3bc4d150823..5bc4bb507a87 100644
--- a/extensions/help/resources/content/help.xul
+++ b/extensions/help/resources/content/help.xul
@@ -108,7 +108,7 @@
                 tooltip="aTooltip"
                 oncommand="goHome();"/>
 
-        <spring flex="1"/>
+        <spacer flex="1"/>
 
         <button id="print" class="button-toolbar-1 top" label="&printButton.label;"
                 tooltip="aTooltip" tooltiptext="&printButton.tooltip;" oncommand="print();"/>
diff --git a/extensions/inspector/resources/content/extensions/titledSplitter.xml b/extensions/inspector/resources/content/extensions/titledSplitter.xml
index 363a4917315b..95b35ef1eeee 100644
--- a/extensions/inspector/resources/content/extensions/titledSplitter.xml
+++ b/extensions/inspector/resources/content/extensions/titledSplitter.xml
@@ -9,12 +9,12 @@
   <binding id="titledSplitter" extends="chrome://global/content/bindings/splitter.xml#splitter">
     <content>
       <xul:box class="titledsplitter-container" orient="vertical" flex="1">
-        <xul:spring class="titledsplitter-dragbar"/>
+        <xul:spacer class="titledsplitter-dragbar"/>
         <xul:box class="titledsplitter-titlebox" flex="1" onmousedown="event.stopPropagation()">
           <xul:box autostretch="never">
             <xul:text class="titledsplitter-text" inherits="value=label"/>
           </xul:box>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:button class="titledsplitter-closebutton" autostretch="never"
                    onclick="this.parentNode.parentNode.parentNode.close();">
             <xul:image class="titledsplitter-closeimage"/>
diff --git a/extensions/inspector/resources/content/utilWindow.xul b/extensions/inspector/resources/content/utilWindow.xul
index d6e87adcb3d7..ba05a1bb488a 100644
--- a/extensions/inspector/resources/content/utilWindow.xul
+++ b/extensions/inspector/resources/content/utilWindow.xul
@@ -7,13 +7,13 @@
         orient="vertical"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <hbox id="bxOuter" flex="1">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <hbox id="bxCenter" autostretch="never"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
 
 </window>
 
diff --git a/extensions/inspector/resources/content/viewers/boxModel/boxModel.xul b/extensions/inspector/resources/content/viewers/boxModel/boxModel.xul
index 85a8aecdeaa7..ee457b71efc5 100644
--- a/extensions/inspector/resources/content/viewers/boxModel/boxModel.xul
+++ b/extensions/inspector/resources/content/viewers/boxModel/boxModel.xul
@@ -77,7 +77,7 @@
         <button label="Capture" command="cmdCapture"/>
         <button label="Pick Color..." command="cmdOpenColorPicker"/>
         <button label="Save As..." command="cmdSaveImage"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         
         <checkbox id="cbxShowOutlines" label="Show Boxes" command="cmdToggleOutlines"/>
         <checkbox id="cbxFillOutlines" label="Fill Boxes" command="cmdToggleFill"/>
diff --git a/extensions/inspector/resources/content/viewers/boxModel/colorPicker.xul b/extensions/inspector/resources/content/viewers/boxModel/colorPicker.xul
index 42880b8733c7..0fc6537f6056 100644
--- a/extensions/inspector/resources/content/viewers/boxModel/colorPicker.xul
+++ b/extensions/inspector/resources/content/viewers/boxModel/colorPicker.xul
@@ -54,7 +54,7 @@
   ]]></script>
         
   <vbox>
-    <spring id="bxColorSwatch" width="50" height="50" style="background-color: #FFFFFF"/>
+    <spacer id="bxColorSwatch" width="50" height="50" style="background-color: #FFFFFF"/>
     <textbox id="txColor" readonly="true"/>
   </vbox>
   <vbox flex="1">
diff --git a/extensions/irc/xul/content/chatzilla.xul b/extensions/irc/xul/content/chatzilla.xul
index 246efa75a688..b873a8bdac87 100644
--- a/extensions/irc/xul/content/chatzilla.xul
+++ b/extensions/irc/xul/content/chatzilla.xul
@@ -405,7 +405,7 @@
          <text id="channel-name" value="(none)" crop="right"/>
          <text id="channel-topicby" value="(nobody)" crop="right"/>
       </vbox>
-      <spring flex="20%"/>
+      <spacer flex="20%"/>
       <vbox class="status-label" crop="right">
          <text value="&server.label;" crop="right"/>
          <text value="&mode.label;" crop="right"/>
@@ -417,7 +417,7 @@
             <text id="server-name" value="(none)" crop="right"/>
             <text id="channel-mode" value="(none)" crop="right"/>
           </vbox>
-          <spring flex="100%"/>
+          <spacer flex="100%"/>
           <vbox class="status-label" crop="right">
             <text value="&nickname.label;" crop="right"/>
             <text value="&users.label;" crop="right"/>
@@ -426,7 +426,7 @@
             <text id="server-nick" value="(unknown)" crop="right"/>
             <text id="channel-users" value="(none)" crop="right"/>
           </vbox>
-          <spring flex="100%"/>
+          <spacer flex="100%"/>
           <vbox class="status-label" crop="right">
             <text value="&lag.label;" crop="right"/>
             <text value="&limit.label;" crop="right"/>
@@ -435,7 +435,7 @@
             <text id="server-lag" value="-1" crop="right"/>
             <text id="channel-limit" value="(none)" crop="right"/>
           </vbox>
-          <spring flex="100%"/>
+          <spacer flex="100%"/>
           <vbox class="status-label" crop="right"
             collapsed="true">
             <text value="&lastPing.label;" crop="right"/>
diff --git a/extensions/irc/xul/content/pref-irc.xul b/extensions/irc/xul/content/pref-irc.xul
index bdf8c0453026..168157f85b54 100644
--- a/extensions/irc/xul/content/pref-irc.xul
+++ b/extensions/irc/xul/content/pref-irc.xul
@@ -31,7 +31,7 @@
 
   <hbox class="header">  
     <button class="left-header-text" label="&lHeader;"/>
-    <spring class="header-spring" flex="1"/>
+    <spacer class="header-spacer" flex="1"/>
     <button class="right-header-text" label="&rHeader;"/>
   </hbox>
 
diff --git a/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul b/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul
index 6c7ecb2bfb74..1ba21d973e68 100644
--- a/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul
+++ b/extensions/p3p/resources/content/P3PBadPrivacyInfo.xul
@@ -119,9 +119,9 @@
 
   <separator/>
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PInProgressInfo.xul b/extensions/p3p/resources/content/P3PInProgressInfo.xul
index 3e2577e87d61..3ad53bb158b1 100644
--- a/extensions/p3p/resources/content/P3PInProgressInfo.xul
+++ b/extensions/p3p/resources/content/P3PInProgressInfo.xul
@@ -49,12 +49,12 @@
   <text id="currentURI" value=""/>
 
   <separator/>
-  <spring flex="1"/>
+  <spacer flex="1"/>
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="refresh" value="&refreshButton.label;" onclick="doRefreshButton()"/>
     <button id="cancel"  value="&cancelButton.label;"  onclick="doCancelButton()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul b/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul
index 60afbc80fd9d..df271567da35 100644
--- a/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul
+++ b/extensions/p3p/resources/content/P3PNoPrivacyInfo.xul
@@ -116,11 +116,11 @@
   </hbox>
 
   <separator/>
-  <spring flex="1"/>
+  <spacer flex="1"/>
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul b/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul
index 92fa7afdceaf..ae32883adc21 100644
--- a/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul
+++ b/extensions/p3p/resources/content/P3PPartialPrivacyInfo.xul
@@ -119,9 +119,9 @@
 
   <separator/>
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul b/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul
index de2fde76e7b6..5d03f5f78236 100644
--- a/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul
+++ b/extensions/p3p/resources/content/P3PPrivacyMetInfo.xul
@@ -119,9 +119,9 @@
 
   <separator/>
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul b/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul
index 6f7c09f61c94..636b9d2b182b 100644
--- a/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul
+++ b/extensions/p3p/resources/content/P3PPrivacyNotMetInfo.xul
@@ -119,9 +119,9 @@
 
   <separator/>
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="ok" value="&okButton.label;" default="true" align="center" onclick="doOKButton()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 </window>
diff --git a/extensions/p3p/resources/content/pref-P3P.xul b/extensions/p3p/resources/content/pref-P3P.xul
index 0540c9b70093..d9587c2ffbd2 100644
--- a/extensions/p3p/resources/content/pref-P3P.xul
+++ b/extensions/p3p/resources/content/pref-P3P.xul
@@ -250,7 +250,7 @@
         <button id="customizebutton" value="&customize.label;"
                 accesskey="&custom.accesskey;"
                 oncommand="doCustomize();"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </hbox>
     </radiogroup>
   </groupbox>
@@ -461,7 +461,7 @@
             <vbox style="width:100px">>
               <text class="header" value="physical"/>
               <html>&physical.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -479,7 +479,7 @@
                         <checkbox id="P3PPhysicalHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -493,7 +493,7 @@
                         <checkbox id="P3PPhysicalIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -512,7 +512,7 @@
                         <checkbox id="P3PPhysicalIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -526,7 +526,7 @@
                         <checkbox id="P3PPhysicalTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.physical.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -553,7 +553,7 @@
             <vbox style="width:100px">
               <text class="header" value="location"/>
               <html>&location.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -571,7 +571,7 @@
                         <checkbox id="P3PLocationHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.location.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -585,7 +585,7 @@
                         <checkbox id="P3PLocationIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.location.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -604,7 +604,7 @@
                         <checkbox id="P3PLocationIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.location.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -618,7 +618,7 @@
                         <checkbox id="P3PLocationTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.location.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -651,7 +651,7 @@
             <vbox style="width:100px">
               <text class="header" value="online"/>
               <html>&online.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -669,7 +669,7 @@
                         <checkbox id="P3POnlineHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.online.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -683,7 +683,7 @@
                         <checkbox id="P3POnlineIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.online.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -702,7 +702,7 @@
                         <checkbox id="P3POnlineIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.online.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -716,7 +716,7 @@
                         <checkbox id="P3POnlineTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.online.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -749,7 +749,7 @@
             <vbox style="width:100px">
               <text class="header" value="computer"/>
               <html>&computer.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -767,7 +767,7 @@
                         <checkbox id="P3PComputerHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -781,7 +781,7 @@
                         <checkbox id="P3PComputerIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -800,7 +800,7 @@
                         <checkbox id="P3PComputerIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -814,7 +814,7 @@
                         <checkbox id="P3PComputerTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.computer.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -841,7 +841,7 @@
             <vbox style="width:100px">
               <text class="header" value="state"/>
               <html>&state.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -859,7 +859,7 @@
                         <checkbox id="P3PStateHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.state.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -873,7 +873,7 @@
                         <checkbox id="P3PStateIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.state.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -892,7 +892,7 @@
                         <checkbox id="P3PStateIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.state.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -906,7 +906,7 @@
                         <checkbox id="P3PStateTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.state.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -933,7 +933,7 @@
             <vbox style="width:100px">
               <text class="header" value="uniqueid"/>
               <html>&uniqueid.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -951,7 +951,7 @@
                         <checkbox id="P3PUniqueIDHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -965,7 +965,7 @@
                         <checkbox id="P3PUniqueIDIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -984,7 +984,7 @@
                         <checkbox id="P3PUniqueIDIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -998,7 +998,7 @@
                         <checkbox id="P3PUniqueIDTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.uniqueid.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1025,7 +1025,7 @@
             <vbox style="width:100px">
               <text class="header" value="government"/>
               <html>&government.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1043,7 +1043,7 @@
                         <checkbox id="P3PGovernmentHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.government.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1057,7 +1057,7 @@
                         <checkbox id="P3PGovernmentIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.government.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1076,7 +1076,7 @@
                         <checkbox id="P3PGovernmentIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.government.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1090,7 +1090,7 @@
                         <checkbox id="P3PGovernmentTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.government.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1123,7 +1123,7 @@
             <vbox style="width:100px">
               <text class="header" value="purchase"/>
               <html>&purchase.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1141,7 +1141,7 @@
                         <checkbox id="P3PPurchaseHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1155,7 +1155,7 @@
                         <checkbox id="P3PPurchaseIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1174,7 +1174,7 @@
                         <checkbox id="P3PPurchaseIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1188,7 +1188,7 @@
                         <checkbox id="P3PPurchaseTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.purchase.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1221,7 +1221,7 @@
             <vbox style="width:100px">
               <text class="header" value="financial"/>
               <html>&financial.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1239,7 +1239,7 @@
                         <checkbox id="P3PFinancialHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1253,7 +1253,7 @@
                         <checkbox id="P3PFinancialIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1272,7 +1272,7 @@
                         <checkbox id="P3PFinancialIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1286,7 +1286,7 @@
                         <checkbox id="P3PFinancialTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.financial.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1313,7 +1313,7 @@
             <vbox style="width:100px">
               <text class="header" value="health"/>
               <html>&health.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1331,7 +1331,7 @@
                         <checkbox id="P3PHealthHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.health.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1345,7 +1345,7 @@
                         <checkbox id="P3PHealthIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.health.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1364,7 +1364,7 @@
                         <checkbox id="P3PHealthIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.health.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1378,7 +1378,7 @@
                         <checkbox id="P3PHealthTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.health.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1405,7 +1405,7 @@
             <vbox style="width:100px">
               <text class="header" value="political"/>
               <html>&political.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1423,7 +1423,7 @@
                         <checkbox id="P3PPoliticalHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.political.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1437,7 +1437,7 @@
                         <checkbox id="P3PPoliticalIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.political.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1456,7 +1456,7 @@
                         <checkbox id="P3PPoliticalIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.political.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1470,7 +1470,7 @@
                         <checkbox id="P3PPoliticalTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.political.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1503,7 +1503,7 @@
             <vbox style="width:100px">
               <text class="header" value="navigation"/>
               <html>&navigation.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1521,7 +1521,7 @@
                         <checkbox id="P3PNavigationHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1535,7 +1535,7 @@
                         <checkbox id="P3PNavigationIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1554,7 +1554,7 @@
                         <checkbox id="P3PNavigationIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1568,7 +1568,7 @@
                         <checkbox id="P3PNavigationTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.navigation.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1595,7 +1595,7 @@
             <vbox style="width:100px">
               <text class="header" value="interactive"/>
               <html>&interactive.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1613,7 +1613,7 @@
                         <checkbox id="P3PInteractiveHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1627,7 +1627,7 @@
                         <checkbox id="P3PInteractiveIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1646,7 +1646,7 @@
                         <checkbox id="P3PInteractiveIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1660,7 +1660,7 @@
                         <checkbox id="P3PInteractiveTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.interactive.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1693,7 +1693,7 @@
             <vbox style="width:100px">
               <text class="header" value="demographic"/>
               <html>&demographic.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1711,7 +1711,7 @@
                         <checkbox id="P3PDemographicHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1725,7 +1725,7 @@
                         <checkbox id="P3PDemographicIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1744,7 +1744,7 @@
                         <checkbox id="P3PDemographicIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1758,7 +1758,7 @@
                         <checkbox id="P3PDemographicTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.demographic.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1785,7 +1785,7 @@
             <vbox style="width:100px">
               <text class="header" value="preference"/>
               <html>&preference.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1803,7 +1803,7 @@
                         <checkbox id="P3PPreferenceHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1817,7 +1817,7 @@
                         <checkbox id="P3PPreferenceIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1836,7 +1836,7 @@
                         <checkbox id="P3PPreferenceIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1850,7 +1850,7 @@
                         <checkbox id="P3PPreferenceTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.preference.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1883,7 +1883,7 @@
             <vbox style="width:100px">
               <text class="header" value="content"/>
               <html>&content.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1901,7 +1901,7 @@
                         <checkbox id="P3PContentHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.content.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1915,7 +1915,7 @@
                         <checkbox id="P3PContentIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.content.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1934,7 +1934,7 @@
                         <checkbox id="P3PContentIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.content.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -1948,7 +1948,7 @@
                         <checkbox id="P3PContentTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.content.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -1981,7 +1981,7 @@
             <vbox style="width:100px">
               <text class="header" value="other"/>
               <html>&other.tip;</html>
-              <spring flex="1"/>
+              <spacer flex="1"/>
               <groupbox orient="horizontal">
                 <caption><text value="&purpose.label;" tooltip="purposetip"/></caption>
                 <grid>
@@ -1999,7 +1999,7 @@
                         <checkbox id="P3POtherHistorical" value="historical" tooltip="historicaltip"
                                   pref="true" preftype="bool" prefstring="P3P.other.historical" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -2013,7 +2013,7 @@
                         <checkbox id="P3POtherIndividual-analysis" value="individual-analysis" tooltip="individual-analysistip"
                                   pref="true" preftype="bool" prefstring="P3P.other.individual-analysis" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
@@ -2032,7 +2032,7 @@
                         <checkbox id="P3POtherIndividual-decision" value="individual-decision" tooltip="individual-decisiontip"
                                   pref="true" preftype="bool" prefstring="P3P.other.individual-decision" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
 
                       <groupbox orient="vertical">
@@ -2046,7 +2046,7 @@
                         <checkbox id="P3POtherTelemarketing" value="telemarketing" tooltip="telemarketingtip"
                                   pref="true" preftype="bool" prefstring="P3P.other.telemarketing" prefattribute="checked"
                                   />
-                        <spring flex="1"/>
+                        <spacer flex="1"/>
                       </groupbox>
                     </row>
 
diff --git a/extensions/transformiix/resources/buster/buster.xul b/extensions/transformiix/resources/buster/buster.xul
index 309ee493f68e..0b4f5a8db97b 100644
--- a/extensions/transformiix/resources/buster/buster.xul
+++ b/extensions/transformiix/resources/buster/buster.xul
@@ -58,13 +58,13 @@
     </menupopup>
   </menulist>
 </groupbox>
-<spring flex="1" /></hbox>
+<spacer flex="1" /></hbox>
 <hbox><groupbox orient="horizontal"><caption label="stats" />
   <text value="tests run: "/><text id="tests_run" value="0" />
   <text value="  tests passed: "/><text id="tests_passed" value="0"/>
   <text value="  tests failed: "/><text id="tests_failed" value="0"/>
 </groupbox>  
-<spring flex="1" /></hbox>
+<spacer flex="1" /></hbox>
 
 <outliner id="out" flex="1">
   <outlinercol id="name" label="Name" flex="1"/>
diff --git a/extensions/vixen/resources/content/history/historyTreeBindings.xml b/extensions/vixen/resources/content/history/historyTreeBindings.xml
index b7aa8000c392..564ddcacaffe 100644
--- a/extensions/vixen/resources/content/history/historyTreeBindings.xml
+++ b/extensions/vixen/resources/content/history/historyTreeBindings.xml
@@ -82,10 +82,10 @@
     <content>
       <xul:stack class="grabber-stack" flex="1">
         <xul:box class="grabber-base">
-          <xul:spring class="track-left" flex="1"/>
-          <xul:spring class="track-center"/>
-          <xul:spring class="track-right" flex="1"/>
-          <xul:spring class="grabber-right" inherits="state"/>
+          <xul:spacer class="track-left" flex="1"/>
+          <xul:spacer class="track-center"/>
+          <xul:spacer class="track-right" flex="1"/>
+          <xul:spacer class="grabber-right" inherits="state"/>
         </xul:box>
         <xul:box class="grabber-container">
           <xul:box class="grabber-box-1" flex="1">
@@ -98,10 +98,10 @@
   
   <binding id="grabber-track" extends="xul:box">
     <content>
-      <xul:spring class="track-left" flex="1"/>
-      <xul:spring class="track-center" inherits="state"/>
-      <xul:spring class="track-right" flex="1"/>
-      <xul:spring class="grabber-right" inherits="state"/>
+      <xul:spacer class="track-left" flex="1"/>
+      <xul:spacer class="track-center" inherits="state"/>
+      <xul:spacer class="track-right" flex="1"/>
+      <xul:spacer class="grabber-right" inherits="state"/>
     </content>
   </binding>
   
diff --git a/extensions/vixen/resources/content/vfd/editBindingsTest.xul b/extensions/vixen/resources/content/vfd/editBindingsTest.xul
index 2bcaf203eb2b..ff2e1bb8604c 100644
--- a/extensions/vixen/resources/content/vfd/editBindingsTest.xul
+++ b/extensions/vixen/resources/content/vfd/editBindingsTest.xul
@@ -8,12 +8,12 @@
         orient="vertical">
   
   <vbox moz-vixen="true" flex="1">
-    <hbox><text value="Foopy" style="border: 1px solid green"/><spring flex="1"/></hbox>
-    <hbox><text value="Noopy" style="border: 1px solid green"/><spring flex="1"/></hbox>
+    <hbox><text value="Foopy" style="border: 1px solid green"/><spacer flex="1"/></hbox>
+    <hbox><text value="Noopy" style="border: 1px solid green"/><spacer flex="1"/></hbox>
   </hbox>
   <vbox moz-vixen="true">
-    <hbox><text value="Foopy 2" style="border: 1px solid green"/><spring flex="1"/></hbox>
-    <hbox><text value="Noopy 2" style="border: 1px solid green"/><spring flex="1"/></hbox>
+    <hbox><text value="Foopy 2" style="border: 1px solid green"/><spacer flex="1"/></hbox>
+    <hbox><text value="Noopy 2" style="border: 1px solid green"/><spacer flex="1"/></hbox>
   </hbox>
  
 </window>        
diff --git a/extensions/vixen/resources/content/vfdCommands.xul b/extensions/vixen/resources/content/vfdCommands.xul
index 0d320e5d5805..f1a31226268a 100644
--- a/extensions/vixen/resources/content/vfdCommands.xul
+++ b/extensions/vixen/resources/content/vfdCommands.xul
@@ -82,8 +82,8 @@
              oncommand="nsVFD.insertBoxElement('grid-row');"/>
     <command id="cmd_insert_grid_col"
              oncommand="nsVFD.insertBoxElement('grid-col');"/>
-    <command id="cmd_insert_spring"
-             oncommand="nsVFD.insertBoxElement('spring');"/>
+    <command id="cmd_insert_spacer"
+             oncommand="nsVFD.insertBoxElement('spacer');"/>
     <command id="cmd_insert_splitter"
              oncommand="nsVFD.insertBoxElement('splitter');"/>
 
diff --git a/extensions/vixen/resources/content/vfdScratch.xul b/extensions/vixen/resources/content/vfdScratch.xul
index 5975f278dd2e..197175d454e3 100644
--- a/extensions/vixen/resources/content/vfdScratch.xul
+++ b/extensions/vixen/resources/content/vfdScratch.xul
@@ -66,7 +66,7 @@
           <toolbarseparator/>
           <button class="button-toolbar" label="Add Attribute"/>
           <button class="button-toolbar" label="Remove Attribute"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </hbox>
       </vbox>
     </tabpanels>
diff --git a/extensions/wallet/editor/WalletEditor.xul b/extensions/wallet/editor/WalletEditor.xul
index dfd9c43b8da5..74bc0f1cdc72 100644
--- a/extensions/wallet/editor/WalletEditor.xul
+++ b/extensions/wallet/editor/WalletEditor.xul
@@ -41,12 +41,12 @@
   <keyset id="dialogKeys"/>
            
     <vbox id="system" flex="100%">
-      <spring style="height: 7px;"/>
+      <spacer style="height: 7px;"/>
       <text class="label" value="&div.walletdataonsystem.label;"/>
       <separator orient="horizontal" class="groove"/>
-      <spring style="height: 10px;"/>
+      <spacer style="height: 10px;"/>
       <hbox id="system1" flex="100%">
-        <spring style="width: 7px;"/>
+        <spacer style="width: 7px;"/>
         <vbox>
           <text class="label" value="&treehead.schemaname.label;"/>
           <tree multiple="true" id="schematree" class="inset"
@@ -61,7 +61,7 @@
             <button id="addSchema" class="dialog push" disabled="false" label="&button.addschema.label;" oncommand="AddSchema();"/>
           </hbox>
         </vbox>
-        <spring style="width: 7px;"/>
+        <spacer style="width: 7px;"/>
         <vbox>
           <text class="label" id="entrytext" value2="&treehead.entries.label;" value3="&treehead.entries1.label;"/>
           <tree multiple="true" id="entrytree" class="inset"
@@ -71,7 +71,7 @@
             </treecolgroup>
             <treechildren flex="1" id="entrieslist"/>
           </tree>
-          <spring style="height: 7px;"/>
+          <spacer style="height: 7px;"/>
           <text class="label" id="synonymtext" value2="&treehead.synonyms.label;" value3="&treehead.synonymsoff.label;" value4="&treehead.synonyms1.label;"/>
           <tree multiple="true" id="synonymtree" class="inset"
             style="height: 113px;" orient="vertical" onclick="SynonymSelected();">
@@ -81,26 +81,26 @@
             <treechildren flex="1" id="synonymslist"/>
           </tree>
         </vbox>
-        <spring style="width: 7px;"/>
+        <spacer style="width: 7px;"/>
         <vbox>
-          <spring style="height: 15px;"/>
+          <spacer style="height: 15px;"/>
           <button id="removeEntry" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteEntry();"/>
           <button id="addEntry" class="dialog push" disabled="false" label="&button.addentry.label;" oncommand="AddEntry();"/>
-          <spring style="height: 93px;"/>
+          <spacer style="height: 93px;"/>
           <button id="removeSynonym" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSynonym();"/>
           <button id="addSynonym" class="dialog push" disabled="false" label="&button.addsynonym.label;" oncommand="AddSynonym();"/>
         </vbox>
-        <spring style="width: 7px;"/>
+        <spacer style="width: 7px;"/>
       </hbox>
     </vbox>
     <separator orient="horizontal" class="groove"/>
 
   <!-- from dialogOverlay.xul -->
-  <spring style="height: 5px;"/>
+  <spacer style="height: 5px;"/>
   <hbox>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <hbox id="okCancelButtons"/>
   </hbox>
-  <spring style="height: 5px;"/>
+  <spacer style="height: 5px;"/>
 
 </window>
diff --git a/extensions/wallet/editor/WalletMisc.xul b/extensions/wallet/editor/WalletMisc.xul
index 822dbc5192f6..a6df07ddfa29 100644
--- a/extensions/wallet/editor/WalletMisc.xul
+++ b/extensions/wallet/editor/WalletMisc.xul
@@ -94,7 +94,7 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <spring style="width: 5px;"/>
+            <spacer style="width: 5px;"/>
             <text value="&miscLicenseState.label;" />
             <menulist id="license.state" editable="true" autoSelectMenuitem="false" flex="30" width="0"
                       onchange="Append(this)">
diff --git a/extensions/wallet/editor/WalletUrlspecific.xul b/extensions/wallet/editor/WalletUrlspecific.xul
index 5ba122d72094..ccf35ee81a1d 100644
--- a/extensions/wallet/editor/WalletUrlspecific.xul
+++ b/extensions/wallet/editor/WalletUrlspecific.xul
@@ -49,7 +49,6 @@
         var row = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "row");
         var text1 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox");
         var text2 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox");
-        var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "spring");
         var menuList = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menulist");
         var menuPopup = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menupopup");
         var menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
diff --git a/extensions/wallet/editor/privacy.xul b/extensions/wallet/editor/privacy.xul
index e1ccd3d8f37b..65587ad15db4 100644
--- a/extensions/wallet/editor/privacy.xul
+++ b/extensions/wallet/editor/privacy.xul
@@ -65,11 +65,11 @@
   <iframe id="maintext" class="output-container" type="content" flex="1"/>
 
   <!-- from dialogOverlay.xul -->
-  <spring style="height: 5px;"/>
+  <spacer style="height: 5px;"/>
   <hbox>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
    <button class="right dialog" id="ok" label="&ok;" default="true" oncommand="doOKButton();"/> 
   </hbox>
-  <spring style="height: 5px;"/>
+  <spacer style="height: 5px;"/>
 
 </window>
diff --git a/extensions/wallet/editor/resources/content/WalletMisc.xul b/extensions/wallet/editor/resources/content/WalletMisc.xul
index 822dbc5192f6..a6df07ddfa29 100644
--- a/extensions/wallet/editor/resources/content/WalletMisc.xul
+++ b/extensions/wallet/editor/resources/content/WalletMisc.xul
@@ -94,7 +94,7 @@
                 <menuitem label="" len="0"/>
               </menupopup>
             </menulist>
-            <spring style="width: 5px;"/>
+            <spacer style="width: 5px;"/>
             <text value="&miscLicenseState.label;" />
             <menulist id="license.state" editable="true" autoSelectMenuitem="false" flex="30" width="0"
                       onchange="Append(this)">
diff --git a/extensions/wallet/editor/resources/content/WalletUrlspecific.xul b/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
index 5ba122d72094..ccf35ee81a1d 100644
--- a/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
+++ b/extensions/wallet/editor/resources/content/WalletUrlspecific.xul
@@ -49,7 +49,6 @@
         var row = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "row");
         var text1 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox");
         var text2 = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "textbox");
-        var spring = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "spring");
         var menuList = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menulist");
         var menuPopup = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menupopup");
         var menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
diff --git a/extensions/wallet/walletpreview/WalletPreview.xul b/extensions/wallet/walletpreview/WalletPreview.xul
index 1c8fd6c64570..c966a1851d43 100644
--- a/extensions/wallet/walletpreview/WalletPreview.xul
+++ b/extensions/wallet/walletpreview/WalletPreview.xul
@@ -40,11 +40,11 @@
            
   <hbox>
     <text value="&heading.label;"/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <button label="&viewdata.label;" oncommand="formShow();"/>
   </hbox>
 
-  <spring style="height: 20px;"/>
+  <spacer style="height: 20px;"/>
   <hbox class="tabpanel" autostretch="never" style="overflow: auto; height: 260px;">
     <grid class="indent">
       <columns>
@@ -57,14 +57,14 @@
     </grid>
   </hbox>
 
-  <spring style="height: 20px;"/>
+  <spacer style="height: 20px;"/>
 
   <hbox>
     <checkbox id="checkbox" label="&bypass.label;"/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
   </hbox>
 
-  <spring style="height: 20px;"/>
+  <spacer style="height: 20px;"/>
 
   <hbox id="okCancelButtons"/>
 </window>
diff --git a/extensions/xml-rpc/test/xml-rpc.xul b/extensions/xml-rpc/test/xml-rpc.xul
index 766045a2443d..b317ec32628f 100644
--- a/extensions/xml-rpc/test/xml-rpc.xul
+++ b/extensions/xml-rpc/test/xml-rpc.xul
@@ -58,18 +58,18 @@ var Listener = {
 ]]></script>
 
 <vbox flex="1">
-<spring flex="1"/>
+<spacer flex="1"/>
 <text value="Enter a state code:"/>
 <textbox id="statecode"/>
 <text value="Statename:"/>
 <text id="statename" value=" "/>
-<spring flex="1"/>
+<spacer flex="1"/>
 </vbox>
 
 <vbox>
-<spring flex="1"/>
+<spacer flex="1"/>
 <button label="Call Async." onclick="callAsync()"/>
 <button label="Call Sync." onclick="callSync()"/>
-<spring flex="1"/>
+<spacer flex="1"/>
 </vbox>
 </window>
diff --git a/intl/strres/tests/strres-test.xul b/intl/strres/tests/strres-test.xul
index bda5a44dc672..924fa3f0c19f 100644
--- a/intl/strres/tests/strres-test.xul
+++ b/intl/strres/tests/strres-test.xul
@@ -39,24 +39,24 @@
         	<hbox style="margin-bottom: 1em;">
         		<html:input type="checkbox" id="dialog.newWindow"/>
             	<html:label for="dialog.newWindow">Open in new window</html:label>
-            	<spring flex="100%"/> 
+            	<spacer flex="100%"/> 
         	</hbox>
         	<hbox style="margin-bottom: 1em;">
-				<spring flex="100%"/>
+				<spacer flex="100%"/>
             	<html:label id = "labelPrompt">Strres Test: </html:label>
             	<html:label id = "testLabel">to be set!!</html:label>
                       
- 				<spring flex="100%"/>
+ 				<spacer flex="100%"/>
         	</hbox>
 
-       		<spring flex="100%"/>
+       		<spacer flex="100%"/>
                    
         	<hbox>
-				<spring flex="100%"/>
+				<spacer flex="100%"/>
             	<button id="dialog.ok" label="ok" onclick="open()" align="left"/>
 				<button id="dialog.test" value="test" onclick="strresTest()" align="left"/>
             	<button id="dialog.cancel" label="cancel: ??" onclick="cancel()" align="left"/>
-				<spring flex="100%"/>
+				<spacer flex="100%"/>
         	</hbox>
                      
 		</vbox>
diff --git a/layout/html/tests/table/bugs/bug12012.xul b/layout/html/tests/table/bugs/bug12012.xul
index f505b79daeef..529c2f64f574 100644
--- a/layout/html/tests/table/bugs/bug12012.xul
+++ b/layout/html/tests/table/bugs/bug12012.xul
@@ -263,7 +263,7 @@
 
 	<html:script src="bug12012.js" />
 
-	<spring flex="1"/>
+	<spacer flex="1"/>
 	<vbox> <!-- fill all horizontal space -->
 		<hbox flex="1" id="main"> <!-- fill all vertical space -->
 
@@ -455,7 +455,7 @@
 		</hbox>
 
 		<hbox id="tabs">
-			<spring flex="1"/>
+			<spacer flex="1"/>
 			<html:table>
 				<html:tr id="tabsTR">
 					<html:td class="tab" onclick="if (this.className != 'tab disable') { divActive(0); ResetAddForm() }"> <!-- XXX need to reset due to bug 9136 -->
@@ -472,8 +472,8 @@
 					</html:td>
 				</html:tr>
 			</html:table>
-			<spring flex="1"/>
+			<spacer flex="1"/>
 		</hbox> <!-- id="tabs" -->
 	</vbox>
-	<spring flex="1"/>
+	<spacer flex="1"/>
 </window>
diff --git a/layout/xul/base/src/nsBoxFrame.cpp b/layout/xul/base/src/nsBoxFrame.cpp
index 42746c4feadc..a26d557b1134 100644
--- a/layout/xul/base/src/nsBoxFrame.cpp
+++ b/layout/xul/base/src/nsBoxFrame.cpp
@@ -164,7 +164,7 @@ public:
 
     void GetValue(nsIPresContext* aPresContext, const nsSize& a, const nsSize& b, char* value);
     void GetValue(nsIPresContext* aPresContext, PRInt32 a, PRInt32 b, char* value);
-    void DrawSpring(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord springSize);
+    void DrawSpacer(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord spacerSize);
     void DrawLine(nsIRenderingContext& aRenderingContext,  PRBool aHorizontal, nscoord x1, nscoord y1, nscoord x2, nscoord y2);
     void FillRect(nsIRenderingContext& aRenderingContext,  PRBool aHorizontal, nscoord x, nscoord y, nscoord width, nscoord height);
 
@@ -1693,7 +1693,7 @@ nsBoxFrame::PaintChildren(nsIPresContext*      aPresContext,
         }
         PRBool isHorizontal = IsHorizontal();
 
-        nscoord x, y, borderSize, springSize;
+        nscoord x, y, borderSize, spacerSize;
         
         nsRect cr(0,0,0,0);
         kid->GetBounds(cr);
@@ -1706,12 +1706,12 @@ nsBoxFrame::PaintChildren(nsIPresContext*      aPresContext,
             cr.y = inner.y;
             x = cr.x;
             y = cr.y + onePixel;
-            springSize = debugBorder.top - onePixel*4;
+            spacerSize = debugBorder.top - onePixel*4;
         } else {
             cr.x = inner.x;
             x = cr.y;
             y = cr.x + onePixel;
-            springSize = debugBorder.left - onePixel*4;
+            spacerSize = debugBorder.left - onePixel*4;
         }
 
         nsBoxLayoutState state(aPresContext);
@@ -1730,7 +1730,7 @@ nsBoxFrame::PaintChildren(nsIPresContext*      aPresContext,
           else 
               borderSize = cr.height;
         
-          mInner->DrawSpring(aPresContext, aRenderingContext, isHorizontal, flex, x, y, borderSize, springSize);
+          mInner->DrawSpacer(aPresContext, aRenderingContext, isHorizontal, flex, x, y, borderSize, spacerSize);
         }
 
         kid->GetNextBox(&kid);
@@ -2126,8 +2126,8 @@ nsBoxFrameInner::PaintDebug(nsIBox* aBox,
            aRenderingContext.DrawRect(dirtyr);
         }
 
-        // paint the springs.
-        nscoord x, y, borderSize, springSize;
+        // paint the spacers.
+        nscoord x, y, borderSize, spacerSize;
         
         aRenderingContext.SetColor(NS_RGB(255,255,255));
         
@@ -2136,12 +2136,12 @@ nsBoxFrameInner::PaintDebug(nsIBox* aBox,
             x = inner.x;
             y = inner.y + onePixel;
             x += debugBorder.left;
-            springSize = debugBorder.top - onePixel*4;
+            spacerSize = debugBorder.top - onePixel*4;
         } else {
             x = inner.y;
             y = inner.x + onePixel;
             x += debugBorder.top;
-            springSize = debugBorder.left - onePixel*4;
+            spacerSize = debugBorder.left - onePixel*4;
         }
 
         nsIBox* box = nsnull;
@@ -2165,7 +2165,7 @@ nsBoxFrameInner::PaintDebug(nsIBox* aBox,
                 nscoord flex = 0;
                 box->GetFlex(state, flex);
 
-                DrawSpring(aPresContext, aRenderingContext, isHorizontal, flex, x, y, borderSize, springSize);
+                DrawSpacer(aPresContext, aRenderingContext, isHorizontal, flex, x, y, borderSize, spacerSize);
                 x += borderSize;
             }
             box->GetNextBox(&box);
@@ -2194,7 +2194,7 @@ nsBoxFrameInner::FillRect(nsIRenderingContext& aRenderingContext, PRBool aHorizo
 }
 
 void 
-nsBoxFrameInner::DrawSpring(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord springSize)
+nsBoxFrameInner::DrawSpacer(nsIPresContext* aPresContext, nsIRenderingContext& aRenderingContext, PRBool aHorizontal, PRInt32 flex, nscoord x, nscoord y, nscoord size, nscoord spacerSize)
 {    
         float p2t;
         aPresContext->GetScaledPixelsToTwips(&p2t);
@@ -2205,10 +2205,10 @@ nsBoxFrameInner::DrawSpring(nsIPresContext* aPresContext, nsIRenderingContext& a
         int center = 0;
         int offset = 0;
         int coilSize = COIL_SIZE*onePixel;
-        int halfSpring = springSize/2;
+        int halfSpacer = spacerSize/2;
 
         distance = size;
-        center = y + halfSpring;
+        center = y + halfSpacer;
         offset = x;
 
         int coils = distance/coilSize;
@@ -2216,21 +2216,21 @@ nsBoxFrameInner::DrawSpring(nsIPresContext* aPresContext, nsIRenderingContext& a
         int halfCoilSize = coilSize/2;
 
         if (flex == 0) {
-            DrawLine(aRenderingContext, aHorizontal, x,y + springSize/2, x + size, y + springSize/2);
+            DrawLine(aRenderingContext, aHorizontal, x,y + spacerSize/2, x + size, y + spacerSize/2);
         } else {
             for (int i=0; i < coils; i++)
             {
-                   DrawLine(aRenderingContext, aHorizontal, offset, center+halfSpring, offset+halfCoilSize, center-halfSpring);
-                   DrawLine(aRenderingContext, aHorizontal, offset+halfCoilSize, center-halfSpring, offset+coilSize, center+halfSpring);
+                   DrawLine(aRenderingContext, aHorizontal, offset, center+halfSpacer, offset+halfCoilSize, center-halfSpacer);
+                   DrawLine(aRenderingContext, aHorizontal, offset+halfCoilSize, center-halfSpacer, offset+coilSize, center+halfSpacer);
 
                    offset += coilSize;
             }
         }
 
-        FillRect(aRenderingContext, aHorizontal, x + size - springSize/2, y, springSize/2, springSize);
-        FillRect(aRenderingContext, aHorizontal, x, y, springSize/2, springSize);
+        FillRect(aRenderingContext, aHorizontal, x + size - spacerSize/2, y, spacerSize/2, spacerSize);
+        FillRect(aRenderingContext, aHorizontal, x, y, spacerSize/2, spacerSize);
 
-        //DrawKnob(aPresContext, aRenderingContext, x + size - springSize, y, springSize);
+        //DrawKnob(aPresContext, aRenderingContext, x + size - spacerSize, y, spacerSize);
 }
 
 void
@@ -2356,7 +2356,7 @@ nsBoxFrameInner::DisplayDebugInfoFor(nsIBox* aBox,
                nsIFrame* childFrame = nsnull;
                child->GetFrame(&childFrame);
 
-                // if we are not in the child. But in the spring above the child.
+                // if we are not in the child. But in the spacer above the child.
                 if ((isHorizontal && x >= r.x && x < r.x + r.width) ||
                     (!isHorizontal && y >= r.y && y < r.y + r.height)) {
                     aCursor = NS_STYLE_CURSOR_POINTER;
diff --git a/layout/xul/base/src/nsBoxToBlockAdaptor.cpp b/layout/xul/base/src/nsBoxToBlockAdaptor.cpp
index 71915a60460f..cfcec817105a 100644
--- a/layout/xul/base/src/nsBoxToBlockAdaptor.cpp
+++ b/layout/xul/base/src/nsBoxToBlockAdaptor.cpp
@@ -782,7 +782,7 @@ nsBoxToBlockAdaptor::Reflow(nsBoxLayoutState& aState,
       }
   }
                              
-  // ok now reflow the child into the springs calculated space
+  // ok now reflow the child into the spacers calculated space
   if (needsReflow) {
 
     nsMargin border(0,0,0,0);
diff --git a/layout/xul/base/src/nsSplitterFrame.cpp b/layout/xul/base/src/nsSplitterFrame.cpp
index fd270500210d..0c88a0bd778b 100644
--- a/layout/xul/base/src/nsSplitterFrame.cpp
+++ b/layout/xul/base/src/nsSplitterFrame.cpp
@@ -58,11 +58,9 @@
 #include "nsIServiceManager.h"
 #include "nsHTMLContainerFrame.h"
 #include "nsINodeInfo.h"
-#include "nsIAnonymousContent.h"
 #include "nsGUIEvent.h"
 
 #include "nsContentCID.h"
-static NS_DEFINE_IID(kAnonymousElementCID, NS_ANONYMOUSCONTENT_CID);
 
 const PRInt32 kMaxZ = 0x7fffffff; //XXX: Shouldn't there be a define somewhere for MaxInt for PRInt32
 static NS_DEFINE_IID(kLookAndFeelCID,  NS_LOOKANDFEEL_CID);
@@ -262,88 +260,9 @@ nsSplitterFrame::~nsSplitterFrame()
 // QueryInterface
 //
 NS_INTERFACE_MAP_BEGIN(nsSplitterFrame)
-  NS_INTERFACE_MAP_ENTRY(nsIAnonymousContentCreator)
 NS_INTERFACE_MAP_END_INHERITING(nsBoxFrame)
 
 
-static nsresult CreateAnonymousNode(nsIContent* aParent, nsIAtom* aTag, PRInt32 aNameSpaceId, nsIContent **aNewNode)
-{
-  NS_ENSURE_ARG_POINTER(aParent);
-  NS_ENSURE_ARG_POINTER(aNewNode);
-  *aNewNode = nsnull;
-
-  nsresult rv;
-  nsCOMPtr<nsIContent> content(do_CreateInstance(kAnonymousElementCID,&rv));
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIDocument> doc;
-  rv = aParent->GetDocument(*getter_AddRefs(doc));
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsINodeInfoManager> nodeInfoManager;
-  rv = doc->GetNodeInfoManager(*getter_AddRefs(nodeInfoManager));
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsINodeInfo> nodeInfo;
-  rv = nodeInfoManager->GetNodeInfo(aTag, nsnull, aNameSpaceId,
-                               *getter_AddRefs(nodeInfo));
-  if (NS_FAILED(rv))
-    return rv;
-
-  nsCOMPtr<nsIAnonymousContent> anon(do_QueryInterface(content,&rv));
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = anon->Init(nodeInfo);
-  if (NS_FAILED(rv))
-    return rv;
-
-  *aNewNode = content.get();
-  NS_ADDREF(*aNewNode);
-
-  return NS_OK;
-}
-
-/**
- * Anonymous interface
- */
-NS_IMETHODIMP
-nsSplitterFrame::CreateAnonymousContent(nsIPresContext* aPresContext,
-                                        nsISupportsArray& aAnonymousChildren)
-{
-  // if not content the create some anonymous content
-  PRInt32 count = 0;
-  mContent->ChildCount(count); 
-
-  // create a grippy if we have no children and teh collapse attribute is before or after.
-  if (count == 0) 
-  {
-    nsSplitterFrameInner::CollapseDirection d = mInner->GetCollapseDirection();
-    if (d != nsSplitterFrameInner::None)
-    {
-        // create a spring
-        nsCOMPtr<nsIContent> content;
-        CreateAnonymousNode(mContent, nsXULAtoms::spring, nsXULAtoms::nameSpaceID, getter_AddRefs(content));
-        content->SetAttr(kNameSpaceID_None, nsXULAtoms::flex, NS_ConvertASCIItoUCS2("100%"), PR_FALSE);
-        aAnonymousChildren.AppendElement(content);
-
-        // a grippy
-        CreateAnonymousNode(mContent, nsXULAtoms::grippy, nsXULAtoms::nameSpaceID, getter_AddRefs(content));
-        aAnonymousChildren.AppendElement(content);
-
-        // create a spring
-        CreateAnonymousNode(mContent, nsXULAtoms::spring, nsXULAtoms::nameSpaceID, getter_AddRefs(content));
-        content->SetAttr(kNameSpaceID_None, nsXULAtoms::flex, NS_ConvertASCIItoUCS2("100%"), PR_FALSE);
-        aAnonymousChildren.AppendElement(content);
-     }
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsSplitterFrame::GetCursor(nsIPresContext* aPresContext,
                                      nsPoint&        aPoint,
@@ -1345,7 +1264,7 @@ nsSplitterFrameInner::ResizeChildTo(nsIPresContext* aPresContext,
 void
 nsSplitterFrameInner::MoveSplitterBy(nsIPresContext* aPresContext, nscoord aDiff)
 {
- const nsRect& r = mOuter->mRect;
+  const nsRect& r = mOuter->mRect;
   nsRect vr;
   nsCOMPtr<nsIViewManager> vm;
   nsIView *v;
diff --git a/layout/xul/base/src/nsSplitterFrame.h b/layout/xul/base/src/nsSplitterFrame.h
index 6c6c31bf17ed..179807dcad03 100644
--- a/layout/xul/base/src/nsSplitterFrame.h
+++ b/layout/xul/base/src/nsSplitterFrame.h
@@ -29,14 +29,13 @@
 
 
 #include "nsBoxFrame.h"
-#include "nsIAnonymousContentCreator.h"
 
 class nsISupportsArray;
 class nsSplitterFrameInner;
 
 nsresult NS_NewSplitterFrame(nsIPresShell* aPresShell, nsIFrame** aResult) ;
 
-class nsSplitterFrame : public nsBoxFrame, public nsIAnonymousContentCreator
+class nsSplitterFrame : public nsBoxFrame
 {
 public:
   nsSplitterFrame(nsIPresShell* aPresShell);
@@ -57,30 +56,23 @@ public:
                               PRInt32 aModType, 
                               PRInt32 aHint);
 
-  NS_IMETHOD  Init(nsIPresContext*  aPresContext,
-                                    nsIContent*      aContent,
-                                    nsIFrame*        aParent,
-                                    nsIStyleContext* aContext,
-                                    nsIFrame*        aPrevInFlow);
+  NS_IMETHOD Init(nsIPresContext*  aPresContext,
+                  nsIContent*      aContent,
+                  nsIFrame*        aParent,
+                  nsIStyleContext* aContext,
+                  nsIFrame*        aPrevInFlow);
 
   NS_IMETHOD GetCursor(nsIPresContext* aPresContext,
-                                     nsPoint&        aPoint,
-                                     PRInt32&        aCursor);
+                       nsPoint&        aPoint,
+                       PRInt32&        aCursor);
 
   NS_IMETHOD DoLayout(nsBoxLayoutState& aBoxLayoutState);
 
-  // nsIAnonymousContentCreator
-  NS_IMETHOD  CreateAnonymousContent(nsIPresContext* aPresContext,
-                                     nsISupportsArray& aAnonymousItems);
-  NS_IMETHOD CreateFrameFor(nsIPresContext*   aPresContext,
-                            nsIContent *      aContent,
-                            nsIFrame**        aFrame) { if (aFrame) *aFrame = nsnull; return NS_ERROR_FAILURE; }
-
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr); 
   NS_IMETHOD_(nsrefcnt) AddRef(void) { return NS_OK; }
   NS_IMETHOD_(nsrefcnt) Release(void) { return NS_OK; }
 
-   NS_IMETHOD HandlePress(nsIPresContext* aPresContext,
+  NS_IMETHOD HandlePress(nsIPresContext* aPresContext,
                          nsGUIEvent *    aEvent,
                          nsEventStatus*  aEventStatus);
 
diff --git a/layout/xul/base/src/nsSprocketLayout.cpp b/layout/xul/base/src/nsSprocketLayout.cpp
index 5c18f49d149d..423aef83b873 100644
--- a/layout/xul/base/src/nsSprocketLayout.cpp
+++ b/layout/xul/base/src/nsSprocketLayout.cpp
@@ -1115,9 +1115,9 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
   //nscoord onePixel = NSIntPixelsToTwips(1, p2t);
 
   PRInt32 sizeRemaining            = aGivenSize;
-  PRInt32 springConstantsRemaining = 0;
+  PRInt32 spacerConstantsRemaining = 0;
 
-   // ----- calculate the springs constants and the size remaining -----
+   // ----- calculate the spacers constants and the size remaining -----
 
   if (!aComputedBoxSizes)
       aComputedBoxSizes = new (aState) nsComputedBoxSize();
@@ -1153,7 +1153,7 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
             validCount++;
           }
 
-          springConstantsRemaining += boxSizes->flex;
+          spacerConstantsRemaining += boxSizes->flex;
           sizeRemaining -= boxSizes->pref;
       }
 
@@ -1184,7 +1184,7 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
 
       while (boxSizes) { 
 
-        // ignore collapsed springs
+        // ignore collapsed spacers
 
    //    if (!boxSizes->collapsed) {
       
@@ -1200,19 +1200,19 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
 
           // ----- look at our min and max limits make sure we aren't too small or too big -----
           if (!computedBoxSizes->valid) {
-            PRInt32 newSize = pref + sizeRemaining*flex/springConstantsRemaining; //NSToCoordRound(float((sizeRemaining*flex)/springConstantsRemaining));
+            PRInt32 newSize = pref + sizeRemaining*flex/spacerConstantsRemaining; //NSToCoordRound(float((sizeRemaining*flex)/spacerConstantsRemaining));
 
             if (newSize<=min) {
               computedBoxSizes->size = min;
               computedBoxSizes->valid = PR_TRUE;
-              springConstantsRemaining -= flex;
+              spacerConstantsRemaining -= flex;
               sizeRemaining += pref;
               sizeRemaining -= min;
               limit = PR_TRUE;
             } else if (newSize>=max) {
               computedBoxSizes->size = max;
               computedBoxSizes->valid = PR_TRUE;
-              springConstantsRemaining -= flex;
+              spacerConstantsRemaining -= flex;
               sizeRemaining += pref;
               sizeRemaining -= max;
               limit = PR_TRUE;
@@ -1226,14 +1226,14 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
   }          
 
   // ---- once we have removed and min and max issues just stretch us out in the remaining space
-  // ---- or shrink us. Depends on the size remaining and the spring constants
+  // ---- or shrink us. Depends on the size remaining and the spacer constants
   aGivenSize = 0;
   boxSizes = aBoxSizes;
   computedBoxSizes = aComputedBoxSizes;
 
   while (boxSizes) { 
 
-    // ignore collapsed springs
+    // ignore collapsed spacers
   //  if (!(boxSizes && boxSizes->collapsed)) {
     
       nscoord pref = 0;
@@ -1242,7 +1242,7 @@ nsSprocketLayout::ComputeChildSizes(nsIBox* aBox,
       flex = boxSizes->flex;
 
       if (!computedBoxSizes->valid) {
-        computedBoxSizes->size = pref + flex*sizeRemaining/springConstantsRemaining; //NSToCoordFloor(float((flex*sizeRemaining)/springConstantsRemaining));
+        computedBoxSizes->size = pref + flex*sizeRemaining/spacerConstantsRemaining; //NSToCoordFloor(float((flex*sizeRemaining)/spacerConstantsRemaining));
         computedBoxSizes->valid = PR_TRUE;
       }
 
diff --git a/layout/xul/base/src/outliner/outliner.xul b/layout/xul/base/src/outliner/outliner.xul
index 37529d4db714..7a0796da0c74 100644
--- a/layout/xul/base/src/outliner/outliner.xul
+++ b/layout/xul/base/src/outliner/outliner.xul
@@ -26,7 +26,7 @@
   <html>
     This outliner contains 5,000,000 rows.  Can you believe it?
   </html>
-  <spring style="height: 16px"/>
+  <spacer style="height: 16px"/>
 
   <outliner id="out" flex="1">
     <outlinercol id="Col1" label="Col1" flex="1"/>
diff --git a/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul b/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
index be49356fec6c..cf65f8184445 100644
--- a/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
@@ -39,13 +39,13 @@ Rights Reserved.
 
 	<vbox style="width:36em; min-height:12em">
 		
-		<spring flex="1"/>
+		<spacer flex="1"/>
 
 		<text for="name" style="margin-bottom:.3em" value="&name.label;"/>
 		
 		<textbox tabindex="0" id="name" style="width: 100%"/>
 		
-		<spring flex="1"/>
+		<spacer flex="1"/>
 		
 		<hbox id="okCancelButtons"/>
 		
diff --git a/mailnews/addrbook/resources/content/abCardOverlay.xul b/mailnews/addrbook/resources/content/abCardOverlay.xul
index 680fa56f322f..8d6df5c8f580 100644
--- a/mailnews/addrbook/resources/content/abCardOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardOverlay.xul
@@ -51,28 +51,28 @@ Rights Reserved.
 		
 					<vbox style="width:100%">
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="FirstName" value="&FirstName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="FirstName" flex="1" oninput="top.GenerateDisplayName()"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="LastName" value="&LastName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="LastName" flex="1" oninput="top.GenerateDisplayName()"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="DisplayName" value="&DisplayName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="DisplayName" flex="1" oninput="top.DisplayNameChanged()"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="NickName" value="&NickName.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="NickName" flex="1"/>
@@ -86,14 +86,14 @@ Rights Reserved.
 		
 					<vbox style="width:100%">
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="PrimaryEmail" value="&PrimaryEmail.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="PrimaryEmail" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="SecondEmail" value="&SecondEmail.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="SecondEmail" flex="1"/>
@@ -119,35 +119,35 @@ Rights Reserved.
 		
 					<vbox style="width:100%">
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WorkPhone" value="&WorkPhone.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkPhone" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="HomePhone" value="&HomePhone.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomePhone" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="FaxNumber" value="&FaxNumber.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="FaxNumber" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="PagerNumber" value="&PagerNumber.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="PagerNumber" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="CellularNumber" value="&CellularNumber.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="CellularNumber" flex="1"/>
@@ -166,45 +166,45 @@ Rights Reserved.
 					<vbox style="width:100%">
 		
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="HomeAddress" value="&HomeAddress.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeAddress" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="HomeAddress2" value="&HomeAddress2.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeAddress2" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="HomeCity" value="&HomeCity.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeCity" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="HomeState" value="&HomeState.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeState" flex="1"/>
-								<spring class="stateZipSpacer"/>
+								<spacer class="stateZipSpacer"/>
 								<text for="HomeZipCode" value="&HomeZipCode.label;" class="CardEditLabel"/>
 								<textbox id="HomeZipCode" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="HomeCountry" value="&HomeCountry.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="HomeCountry" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WebPage2" value="&HomeWebPage.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WebPage2" flex="1"/>
@@ -219,66 +219,66 @@ Rights Reserved.
 					<vbox style="width:100%">
 		
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="JobTitle" value="&JobTitle.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="JobTitle" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="Department" value="&Department.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="Department" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="Company" value="&Company.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="Company" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WorkAddress" value="&WorkAddress.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkAddress" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WorkAddress2" value="&WorkAddress2.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkAddress2" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WorkCity" value="&WorkCity.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkCity" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WorkState" value="&WorkState.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkState" flex="1"/>
-								<spring class="stateZipSpacer"/>
+								<spacer class="stateZipSpacer"/>
 								<text for="WorkZipCode" value="&WorkZipCode.label;" class="CardEditLabel"/>
 								<textbox id="WorkZipCode" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WorkCountry" value="&WorkCountry.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WorkCountry" flex="1"/>
 							</hbox>
 						</hbox>
 						<hbox>
-							<spring flex="1"/>
+							<spacer flex="1"/>
 							<text for="WebPage1" value="&WorkWebPage.label;" class="CardEditLabel"/>
 							<hbox class="CardEditWidth">
 								<textbox id="WebPage1" flex="1"/>
diff --git a/mailnews/addrbook/resources/content/abCardViewOverlay.xul b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
index 59883afb8781..2daff33772c1 100644
--- a/mailnews/addrbook/resources/content/abCardViewOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
@@ -65,7 +65,7 @@ Rights Reserved.
 				</vbox>
 			</vbox>
 			
-			<spring style="width:20px"/>
+			<spacer style="width:20px"/>
 
 			<vbox flex="1" style="width:200px">
 				<vbox id="cvbPhone" class="cardViewGroup">
diff --git a/mailnews/addrbook/resources/content/abEditListDialog.xul b/mailnews/addrbook/resources/content/abEditListDialog.xul
index 94d3fa83e552..4ed54fe3c595 100644
--- a/mailnews/addrbook/resources/content/abEditListDialog.xul
+++ b/mailnews/addrbook/resources/content/abEditListDialog.xul
@@ -41,7 +41,7 @@ Rights Reserved.
 
 	<vbox id="editlist"/>
 		
-	<spring style="height:1em"/>
+	<spacer style="height:1em"/>
 		
 	<hbox id="okCancelButtons"/>
 
diff --git a/mailnews/addrbook/resources/content/abListOverlay.xul b/mailnews/addrbook/resources/content/abListOverlay.xul
index e8e347205300..3e9b9eda640f 100644
--- a/mailnews/addrbook/resources/content/abListOverlay.xul
+++ b/mailnews/addrbook/resources/content/abListOverlay.xul
@@ -36,21 +36,21 @@ Rights Reserved.
 
 	<vbox style="width:100%">
 		<hbox>
-			<spring flex="1"/>
+			<spacer flex="1"/>
 			<text for="ListName" value="&ListName.label;" class="CardEditLabel"/>
 			<hbox class="CardEditWidth">
 				<textbox id="ListName" flex="1"/>
 			</hbox>
 		</hbox>
 		<hbox>
-			<spring flex="1"/>
+			<spacer flex="1"/>
 			<text for="ListNickName" value="&ListNickName.label;" class="CardEditLabel"/>
 			<hbox class="CardEditWidth">
 				<textbox id="ListNickName" flex="1"/>
 			</hbox>
 		</hbox>
 		<hbox>
-			<spring flex="1"/>
+			<spacer flex="1"/>
 			<text for="ListDescription" value="&ListDescription.label;" class="CardEditLabel"/>
 			<hbox class="CardEditWidth">
 				<textbox id="ListDescription" flex="1"/>
@@ -58,10 +58,10 @@ Rights Reserved.
 		</hbox>
 	</vbox>
 
-	<spring style="height:1em"/>
+	<spacer style="height:1em"/>
 		
 	<text value="&AddressTitle.label;"/>
-	<spring style="height:0.1em"/>
+	<spacer style="height:0.1em"/>
 	<hbox  flex="100%">
 		<vbox flex="80%">
 			<tree id="addressListTree" class="inset"
diff --git a/mailnews/addrbook/resources/content/abMailListDialog.xul b/mailnews/addrbook/resources/content/abMailListDialog.xul
index 104ecc3046c8..61254b231bea 100644
--- a/mailnews/addrbook/resources/content/abMailListDialog.xul
+++ b/mailnews/addrbook/resources/content/abMailListDialog.xul
@@ -55,11 +55,11 @@ Rights Reserved.
     </menulist>
   </hbox>
 
-  <spring style="height:1em"/>
+  <spacer style="height:1em"/>
 
   <vbox id="editlist"/>
     
-  <spring style="height:1em"/>
+  <spacer style="height:1em"/>
     
   <hbox id="okCancelButtons"/>
 
diff --git a/mailnews/addrbook/resources/content/abNewCardDialog.xul b/mailnews/addrbook/resources/content/abNewCardDialog.xul
index baf53977f692..23e4db4f63f2 100644
--- a/mailnews/addrbook/resources/content/abNewCardDialog.xul
+++ b/mailnews/addrbook/resources/content/abNewCardDialog.xul
@@ -56,7 +56,7 @@ Rights Reserved.
 
   </hbox>
   
-  <spring style="height:1em"/>
+  <spacer style="height:1em"/>
     
   <vbox id="editcard"/>
   
diff --git a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index f49b344522ca..88513312ac9b 100644
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -71,13 +71,13 @@ Rights Reserved.
           
           <!-- Box that holds (to,cc,bcc buttons) -->
           <hbox id="addToBucketButtonBox">
-            <spring flex="50%"/>
+            <spacer flex="50%"/>
             <button id="toButton" label="&toButton.label;" class="dialog" oncommand="SelectAddressToButton()"/> 
-            <spring class="middle-button-spring"/>
+            <spacer class="middle-button-spacer"/>
             <button id="ccButton" label="&ccButton.label;" class="dialog" oncommand="SelectAddressCcButton()"/> 
-            <spring class="middle-button-spring"/>
+            <spacer class="middle-button-spacer"/>
             <button id="bccButton" label="&bccButton.label;" class="dialog" oncommand="SelectAddressBccButton()"/>  
-            <spring flex="50%"/>
+            <spacer flex="50%"/>
           </hbox>
         </vbox>
         
@@ -99,16 +99,16 @@ Rights Reserved.
     <!-- Box with buttons on right edge of window -->
     <vbox id="rightColumnButtonBox">
       <vbox flex="50%">
-        <spring class="third-column-spring"/>
+        <spacer class="third-column-spacer"/>
         <button id="new" label="&newButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerNewButton.tooltip;" oncommand="AbNewCard()"/> 
-        <spring class="third-column-spring"/>
+        <spacer class="third-column-spacer"/>
         <button id="edit" label="&editButton.label;" class="dialog" tooltip="aTooltip" tooltiptext="&addressPickerEditButton.tooltip;" oncommand="AbEditCard()"/> 
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
       </vbox>
       <vbox flex="50%">
-        <spring flex="50%"/>
+        <spacer flex="50%"/>
         <button id="remove" label="&removeButton.label;" class="dialog" oncommand="RemoveSelectedFromBucket()"/>  
-        <spring flex="50%"/>
+        <spacer flex="50%"/>
       </vbox>
     </vbox>
   </hbox>
diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index 40d63ee16d0f..7629794662af 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -213,7 +213,7 @@ Rights Reserved.
 	    
 		<menu id="tasksMenu"/>
 		<menu id="menu_Help"/>
-		<spring flex="100%"/>
+		<spacer flex="100%"/>
 	</menubar>
 	
 	<!-- toolbar -->
@@ -227,10 +227,10 @@ Rights Reserved.
         <button class="button-toolbar-2 top" orient="vertical" id="button-delete" observes="button_delete" label="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" oncommand="goDoCommand('button_delete');"/>
 
         <vbox flex="100%">
-          <spring flex="1"/> 
+          <spacer flex="1"/> 
           <!--html id="searchlabel">&showNames.label;</html>
           <textbox id="searchtext" type="text" align="bottom"/> 
-          <spring flex="1"/--> 
+          <spacer flex="1"/--> 
         </vbox>
 
         <!--button id="button_stop" class="other28" align="top" label="&stopButton.label;" tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" disabled="true" oncommand="AbStop()"/>
diff --git a/mailnews/base/prefs/resources/content/am-imap-advanced.xul b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
index 0716fabf0f98..e30dfcba2631 100644
--- a/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@@ -67,9 +67,9 @@
   </rows>
 </grid>
 
-<spring class="spacer"/>
+<spacer class="spacer"/>
 <separator class="groove"/>
-<spring class="spacer"/>
+<spacer class="spacer"/>
 
 <hbox id="okCancelButtonsRight"/>
 
diff --git a/mailnews/base/prefs/resources/content/am-main.xul b/mailnews/base/prefs/resources/content/am-main.xul
index b05213d34b52..c24080fefc26 100644
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@@ -88,10 +88,10 @@
                   prefstring="mail.identity.%identitykey%.compose_html"/>
       </hbox>
 
-      <spring flex="1"/>
+      <spacer flex="1"/>
 
       <hbox>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <button oncommand="onAdvanced();" label="&advancedButton.label;"
                 wsm_persist="true" id="identity.advancedbutton"
                 pref="true" preftype="bool" prefattribute="disabled"
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index ee66139cb707..eb59848a5be2 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -86,7 +86,7 @@ Contributors:
     </rows>
   </grid>
 
-  <spring class="spacer"/>
+  <spacer class="spacer"/>
 
   <groupbox>
   <caption label="&serverSettings.label;"/>
@@ -146,7 +146,7 @@ Contributors:
         <menuitem value="2" label="&modelDeleteImmediately.label;"/>
       </menupopup>
     </menulist>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
   <separator class="thin"/>
 
@@ -161,7 +161,7 @@ Contributors:
 
   <hbox iscontrolcontainer="true" flex="1">
     <hbox flex="1">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button label="&advancedButton.label;"
               oncommand="openImapAdvanced(event);"
               wsm_persist="true" id="server.advancedbutton" 
@@ -222,7 +222,7 @@ Contributors:
   </vbox>
   </vbox>
   </groupbox>
-  <spring flex="100%"/>
+  <spacer flex="100%"/>
     <vbox>
     <text class="label" value="&localPath.label;" for="server.localPath"/>
     <textbox wsm_persist="true" id="server.localPath"
diff --git a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
index 974b00c99708..39eeabefdcb1 100644
--- a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@@ -31,7 +31,7 @@
       </row>
     </rows>
   </grid>
-  <spring flex="1"/>
+  <spacer flex="1"/>
   <vbox>
     <text value="&localPath.label;"/>
     <textbox wsm_persist="true" size="60" id="server.localPath" datatype="nsIFileSpec"
diff --git a/mailnews/base/prefs/resources/content/am-smtp.xul b/mailnews/base/prefs/resources/content/am-smtp.xul
index 61454789cd45..7e04d307aaee 100644
--- a/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mailnews/base/prefs/resources/content/am-smtp.xul
@@ -29,7 +29,7 @@
   <separator/>
   
   <hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button label="&advanced.label;" oncommand="onAdvanced(event);"
             wsm_persist="true" id="smtp.advancedbutton" 
             pref="true" preftype="bool" prefattribute="disabled" 
diff --git a/mailnews/base/prefs/resources/content/custreceipt.xul b/mailnews/base/prefs/resources/content/custreceipt.xul
index c0bba7727297..b3813634afc6 100644
--- a/mailnews/base/prefs/resources/content/custreceipt.xul
+++ b/mailnews/base/prefs/resources/content/custreceipt.xul
@@ -14,7 +14,7 @@
 
   <vbox style="width:100%">
   <hbox style="width:100%">
-      <spring flex="1"/>
+      <spacer flex="1"/>
      <text class="label" value="&notInToCc.label;" accesskey="&notInToCc.accesskey;" for="NotInToCc"/>
       <menulist id="NotInToCc" pref="true" preftype="int" prefstring="mail.mdn.report.not_in_to_cc"
                 prefattribute="value">
@@ -27,7 +27,7 @@
   </hbox>
 
   <hbox style="width:100%">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <text class="label" value="&outside.label;" accesskey="&outside.accesskey;" for="OutsideDomain"/>
       <menulist id="OutsideDomain" pref="true" preftype="int" prefstring="mail.mdn.report.outside_domain"
                 prefattribute="value">
@@ -40,7 +40,7 @@
   </hbox>
 
   <hbox style="width:100%">
-      <spring flex="1"/>
+      <spacer flex="1"/>
      <text class="label" value="&other.label;" accesskey="&other.accesskey;" for="Other"/>
       <menulist id="Other" pref="true" preftype="int" prefstring="mail.mdn.report.other"
                 prefattribute="value">
@@ -53,7 +53,7 @@
   </hbox>
   </vbox>
 
-  <spring style="height:1em"/>
+  <spacer style="height:1em"/>
     
   <hbox id="okCancelButtons"/>
 
diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 11b304a8cdb8..1db3a45d1bef 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -49,7 +49,7 @@ Contributor(s):
     
     <hbox autostretch="never">
       <text class="label" value="&selectWindowLayout.label;"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <radiogroup id="mailPaneConfig" pref="true" preftype="int" prefstring="mail.pane_config"
                   prefattribute="value">
         <radio group="mailPaneConfig" class="iconic" value="0" id="classic"/>
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index a73781012bc5..1c637d9fa08e 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1218,7 +1218,7 @@ Rights Reserved.
 
 <menu id="tasksMenu"/>
 <menu id="menu_Help"/>
-<spring flex="100%"/>
+<spacer flex="100%"/>
 </menubar>
 
 <toolbox id="mailToolbarToolbox">
@@ -1341,7 +1341,7 @@ Rights Reserved.
           </menupopup>
       </menubutton>
       <button class="button-toolbar-2 top" id="button-stop" label="&stopButton.label;"  tooltip="aTooltip" tooltiptext="&stopButton.tooltip;" oncommand="MsgStop();"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
             <hbox id="throbber-box" autostretch="never">
                 <button id="navigator-throbber" oncommand='goClickThrobber("messenger.throbber.url")' tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
             </hbox>
diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mailnews/base/resources/content/msgHdrViewOverlay.xul
index ecfa521eaccf..9064d05b7526 100644
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@@ -92,7 +92,7 @@ Rights Reserved.
       <hbox class="headerValueBox" align="center">
         <image id="toggleHeaderView" class="expandHeaderViewButton" 
           onclick="ToggleHeaderView();"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <text class="headerdisplayname" value="&subjectField.label;"/>
       </hbox>
         <html id="expandedsubjectValue" class="headerValue subjectvalue" flex="1">*</html>
@@ -173,9 +173,9 @@ Rights Reserved.
    </vbox>
 
    <vbox id="editMessageBox" class="header-part1" collapsed="true">
-    <spring class="buttonSpacer"/> 
+    <spacer class="buttonSpacer"/> 
     <button id="editMessageButton" label="&editMessage.label;" orient="right" onclick="MsgComposeDraftMessage()"/>
-    <spring class="buttonSpacer"/> 
+    <spacer class="buttonSpacer"/> 
    </vbox> 
 
    <hbox id="expandedAttachmentBox" class="header-part1">
diff --git a/mailnews/base/resources/content/newFolderDialog.xul b/mailnews/base/resources/content/newFolderDialog.xul
index cfca34a32ccb..2b1106d60a3f 100644
--- a/mailnews/base/resources/content/newFolderDialog.xul
+++ b/mailnews/base/resources/content/newFolderDialog.xul
@@ -44,7 +44,7 @@
 
   <vbox>
 
-    <spring flex="1"/>
+    <spacer flex="1"/>
 
     <text value="&name.label;" class="label" accesskey="&name.accesskey;" for="name"/>
     <textbox tabindex="0" id="name" oninput="doEnabling();"/>
@@ -55,7 +55,7 @@
 
     <hbox>
       <menu id="msgNewFolderPicker" oncommand="doEnabling();" crop="right" flex="1"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
 
     <vbox hidden="true" id="newFolderTypeBox">
@@ -70,12 +70,12 @@
       <radiogroup id="folderGroup">
         <radio group="folderGroup" oncommand="onFoldersOnly();" label="&foldersOnly.label;"/>
         <radio group="folderGroup" oncommand="onMessagesOnly();" label="&messagesOnly.label;" checked="true"/>
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
       </radiogroup>
 
     </vbox>
 
-    <spring flex="1"/>
+    <spacer flex="1"/>
 
     <separator/>
 
diff --git a/mailnews/base/resources/content/renameFolderDialog.xul b/mailnews/base/resources/content/renameFolderDialog.xul
index b1e018f2a4d9..7ee74fad219a 100644
--- a/mailnews/base/resources/content/renameFolderDialog.xul
+++ b/mailnews/base/resources/content/renameFolderDialog.xul
@@ -44,12 +44,12 @@
 
   <vbox>
 
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
 
     <text value="&rename.label;" class="label" accesskey="&rename.accesskey;" for="name"/>
     <textbox tabindex="0" id="name" oninput="doEnabling();"/>
 
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
 
     <hbox id="okCancelButtons"/>
 
diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index fb05b3a897e6..3b45ca365e43 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -87,11 +87,11 @@ Rights Reserved.
             </row>
           </rows>
         </grid>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <separator class="thin"/>
-        <spring/>
+        <spacer/>
       </row>
       <row flex="1">
       <deck id="subscribedeck" index="0">
@@ -148,7 +148,7 @@ Rights Reserved.
           <button id="unsubscribe" class="dialog" label="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
           <button id="refresh" class="dialog" label="&refreshButton.label;" oncommand="Refresh()"/>
           <button id="stop" class="dialog" label="&stopButton.label;" oncommand="Stop()"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </vbox>
       </row>
       <row>
diff --git a/mailnews/base/search/resources/content/FilterEditor.xul b/mailnews/base/search/resources/content/FilterEditor.xul
index 2853ccfc2533..fc2c8b824345 100644
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@@ -57,7 +57,7 @@ Contributor(s):
   <hbox autostretch="never">
     <text class="label" value="&filterName.label;"/>
     <textbox flex="50%" id="filterName"/>
-    <spring flex="50%"/>
+    <spacer flex="50%"/>
   </hbox>
 
   <separator/>
@@ -96,7 +96,7 @@ Contributor(s):
         </menulist>
         <text id="actionValueNone"/>
       </deck>
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
       <button id="newFolderButton" label="&newFolderButton.label;" 
               oncommand="MsgNewFolder(SearchNewFolderOkCallback);"/>
     </hbox>
diff --git a/mailnews/base/search/resources/content/FilterListDialog.xul b/mailnews/base/search/resources/content/FilterListDialog.xul
index fdb72a97a25b..81bc7675d33c 100644
--- a/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -125,10 +125,10 @@ Contributor(s):  H
           <button id="newButton" label="&newButton.label;" oncommand="onNewFilter();"/>
           <button id="editButton" label="&editButton.label;" oncommand="onEditFilter();"/>
           <button id="deleteButton" label="&deleteButton.label;" oncommand="onDeleteFilter();"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button id="reorderUpButton" label="&reorderUpButton.label;" oncommand="onUp(event);"/>
           <button id="reorderDownButton" label="&reorderDownButton.label;" oncommand="onDown(event);"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </vbox>
       </row>
     </rows>
diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index 4befc0e4b564..3b4b0debdf0e 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -77,7 +77,7 @@ Rights Reserved.
       <hbox autostretch="never">
         <text class="label" value="&searchHeading.label;"/>
         <menulist id="searchableFolders" flex="2"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
           <checkbox id="checkSearchSubFolders" label="&searchSubfolders.label;" checked="true"/>
       </hbox>
       <separator/>
@@ -86,10 +86,10 @@ Rights Reserved.
       <hbox flex="1">
         <vbox id="searchTermListBox" flex="1"/>
         <vbox>
-           <spring flex="1"/>
+           <spacer flex="1"/>
            <button label="&searchButton.label;" id="search-button" oncommand="onSearchButton(event);" default="true"/>
            <button label="&resetButton.label;" oncommand="onReset(event);"/>
-           <spring flex="1"/>
+           <spacer flex="1"/>
          </vbox>
       </hbox>
     </groupbox>
@@ -104,7 +104,7 @@ Rights Reserved.
 
        </vbox>
        <vbox>
-            <spring flex="1" />
+            <spacer flex="1" />
             <button label="&openButton.label;" id="openButton" command="cmd_open" />
             <menubutton id="fileMessageButton" label="&fileButton.label;"
                         observes="file_message_button"
@@ -176,7 +176,7 @@ Rights Reserved.
             </menubutton>
 
             <button label="&deleteButton.label;" id="deleteButton" command="button_delete"/>
-            <spring flex="1" />
+            <spacer flex="1" />
        </vbox>      
     </groupbox>
   </vbox>
diff --git a/mailnews/compose/resources/content/MsgAttachPage.xul b/mailnews/compose/resources/content/MsgAttachPage.xul
index 55dbe961c22f..295514b2d928 100644
--- a/mailnews/compose/resources/content/MsgAttachPage.xul
+++ b/mailnews/compose/resources/content/MsgAttachPage.xul
@@ -16,15 +16,15 @@
 
 	<keyset id="dialogKeys"/>
 
-    <spring style="height:0.5em" />
+    <spacer style="height:0.5em" />
 	<hbox>
-        <spring style="width:10px" />
+        <spacer style="width:10px" />
 		<text value="Web Page (URL):"/>
 		<textbox id="attachurl" align="bottom" style="min-width:200px; padding-bottom:0px" />
-        <spring style="width:10px" />
+        <spacer style="width:10px" />
 	</hbox>
 	
-    <spring style="height:1em"/>
+    <spacer style="height:1em"/>
 	<hbox id="okCancelButtons"/> 
-    <spring style="height:0.5em" />
+    <spacer style="height:0.5em" />
 </window>
diff --git a/mailnews/compose/resources/content/askSendFormat.xul b/mailnews/compose/resources/content/askSendFormat.xul
index f4e0b115db40..24332be75b30 100644
--- a/mailnews/compose/resources/content/askSendFormat.xul
+++ b/mailnews/compose/resources/content/askSendFormat.xul
@@ -20,13 +20,13 @@
 
 <keyset id="dialogKeys"/>
 
-    <spring style="height:0.5em"/>
+    <spacer style="height:0.5em"/>
     <hbox>
-        <spring style="width:10px"/>
+        <spacer style="width:10px"/>
         <vbox id="askImageBox">
             <image id="convertDefault" />
         </vbox>
-        <spring style="width:10px"/>
+        <spacer style="width:10px"/>
         <vbox flex="1">
             <html>&recipient.label;</html>
             <deck id="mailSendFormatExplanation">
@@ -36,7 +36,7 @@
                 <vbox><html>&convertibleNo.label;</html></vbox>
             </deck>
             <html>&question.label;</html>
-            <spring style="height:1em"/>
+            <spacer style="height:1em"/>
 
       <radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never">
          <hbox>
@@ -55,10 +55,10 @@
       </radiogroup>
 
         </vbox>
-        <spring style="width:10px"/>
+        <spacer style="width:10px"/>
     </hbox>
 
-    <spring style="height:1em"/>
+    <spacer style="height:1em"/>
   <hbox id="okCancelButtons"
         button1Label="&send.label;"
         button2Label="&cancel.label;"
@@ -70,6 +70,6 @@
         plainTextOnlyRecommendedLabel="&plainTextOnlyRecommended.label;"
         htmlOnlyRecommendedLabel="&htmlOnlyRecommended.label;"
   />
-    <spring style="height:1em" />
+    <spacer style="height:1em" />
 
 </window>
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 5ad5a3b2024e..d6dcc4eb98eb 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -382,7 +382,7 @@
                id="button-save" label="&saveButton.label;" 
                tooltip="aTooltip" tooltiptext="&saveButton.tooltip;" 
                command="cmd_saveDefault"/>
-       <spring flex="1"/>
+       <spacer flex="1"/>
        <hbox id="throbber-box" autostretch="never">
          <button id="navigator-throbber" 
                oncommand="goClickThrobber('compose.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;">
@@ -450,7 +450,7 @@
       <menubutton id="AlignPopupButton"/>
       <menubutton id="InsertPopupButton"/>
       <menubutton id="smileButtonMenu" padwithspace="true"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </toolbar>
   </toolbox>
 
diff --git a/mailnews/import/resources/content/fieldMapExport.xul b/mailnews/import/resources/content/fieldMapExport.xul
index 95976b522cc7..9fec331840a5 100644
--- a/mailnews/import/resources/content/fieldMapExport.xul
+++ b/mailnews/import/resources/content/fieldMapExport.xul
@@ -43,13 +43,13 @@ Rights Reserved.
 
   <hbox>
   
-    <spring style="width:3em"/>
+    <spacer style="width:3em"/>
     
     <!-- field list -->
     <vbox>
-      <spring style="height:1em"/>
+      <spacer style="height:1em"/>
       <html:div id="fieldLabel">Ye old fields</html:div>
-      <spring style="height:.5em"/>
+      <spacer style="height:.5em"/>
         
       <vbox style="border: 1px inset white">
         <html:div style="width:10em; height:200px" flex="1">
@@ -62,26 +62,26 @@ Rights Reserved.
         </html:div>
       </vbox>
             
-      <spring style="height:1.5em"/>
+      <spacer style="height:1.5em"/>
       
     </vbox>
     
-    <spring style="width: 1em"/>
+    <spacer style="width: 1em"/>
 
     <vbox style="height:270px">
-      <spring flex="50%"/>
+      <spacer flex="50%"/>
       <button class="dialog push" onclick="OnAddExport()" label="&fieldMapExport.add;"/>
       <button class="dialog push" onclick="OnAddAllExport()" label="&fieldMapExport.addAll;"/>
-      <spring flex="50%"/>
+      <spacer flex="50%"/>
     </vbox>
 
-    <spring style="width:1em"/>
+    <spacer style="width:1em"/>
 
     <!-- export list -->
     <vbox>
-      <spring style="height:1em"/>
+      <spacer style="height:1em"/>
       <html:div id="exportLabel">Export fields</html:div>
-      <spring style="height:.5em"/>
+      <spacer style="height:.5em"/>
         
       <vbox style="border: 1px inset white">
         <html:div style="width:10em; height:200px" flex="1">
@@ -97,11 +97,11 @@ Rights Reserved.
         </html:div>
       </vbox>
             
-      <spring style="height:1.5em"/>
+      <spacer style="height:1.5em"/>
       
     </vbox>
   
-    <spring style="width:3em"/>
+    <spacer style="width:3em"/>
 
   </hbox>
 
diff --git a/mailnews/import/resources/content/fieldMapImport.xul b/mailnews/import/resources/content/fieldMapImport.xul
index ed89af6e6992..f97f477d61fd 100644
--- a/mailnews/import/resources/content/fieldMapImport.xul
+++ b/mailnews/import/resources/content/fieldMapImport.xul
@@ -60,21 +60,21 @@ Rights Reserved.
     </tree>
   </vbox>
   
-  <spring style="height: .5em"/>
+  <spacer style="height: .5em"/>
 
   <hbox>
-    <spring flex="50%"/>
+    <spacer flex="50%"/>
     <button class="dialog" id="previous" oncommand="OnPreviousRecord()" label="&fieldMapImport.previous;"/>
-    <spring style="width: 2em"/>
+    <spacer style="width: 2em"/>
     <text value="&fieldMapImport.recordNumber;"/>
-    <spring style="width: 1em"/>
+    <spacer style="width: 1em"/>
     <text id="recordNumber"/>
-    <spring style="width: 2em"/>
+    <spacer style="width: 2em"/>
     <button class="dialog" id="next" oncommand="OnNextRecord()" label="&fieldMapImport.next;"/>
-    <spring flex="50%"/>    
+    <spacer flex="50%"/>    
   </hbox>
 
-  <spring style="height: 2em"/>
+  <spacer style="height: 2em"/>
 
   <!-- OK & Cancel buttons -->
   <hbox id="okCancelButtons"/>
diff --git a/mailnews/import/resources/content/importDialog.xul b/mailnews/import/resources/content/importDialog.xul
index a7053cb54d6d..cb5a08869e4c 100644
--- a/mailnews/import/resources/content/importDialog.xul
+++ b/mailnews/import/resources/content/importDialog.xul
@@ -70,7 +70,7 @@ Rights Reserved.
       <html id="description" class="box-padded" flex="1"/>
     </vbox>
     <vbox class="wizard-box">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <groupbox orient="vertical">
         <caption id="progressTitle" label="&title.label;"/>
         <text class="label indent" id="progressStatus" value="&processing.label;"/>
@@ -106,7 +106,7 @@ Rights Reserved.
   <separator class="groove"/>
   
   <hbox class="box-padded">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="back" label="&back.label;" disabled="true"
             oncommand="back();"/>
     <button id="forward" label="&forward.label;" nextval="&forward.label;" finishedval="&finish.label;" 
diff --git a/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
index b1a335bd44ae..1eaaa91cd0fb 100644
--- a/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
+++ b/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp
@@ -543,25 +543,25 @@ nsMimeXULEmitter::DumpSubjectFromDate()
   UtilityWriteCRLF("<box name=\"header-splitter\" align=\"horizontal\" flex=\"1\" >");
 
       UtilityWriteCRLF("<box name=\"header-part1\" align=\"vertical\" flex=\"1\">");
-      UtilityWriteCRLF("<spring flex=\"2\"/>");
+      UtilityWriteCRLF("<spacer flex=\"2\"/>");
 
           // This is the envelope information
           OutputGenericHeader(HEADER_SUBJECT);
           OutputGenericHeader(HEADER_FROM);
           OutputGenericHeader(HEADER_DATE);
 
-      UtilityWriteCRLF("<spring flex=\"2\"/>");
+      UtilityWriteCRLF("<spacer flex=\"2\"/>");
       UtilityWriteCRLF("</box>");
 
 
       UtilityWriteCRLF("<box name=\"header-attachment\" align=\"horizontal\" flex=\"1\">");
-      UtilityWriteCRLF("<spring flex=\"1\"/>");
+      UtilityWriteCRLF("<spacer flex=\"1\"/>");
 
         // Now the addbook and attachment icons need to be displayed
         DumpAddBookIcon(GetHeaderValue(HEADER_FROM, mHeaderArray));
         DumpAttachmentMenu();
 
-      UtilityWriteCRLF("<spring flex=\"1\"/>");
+      UtilityWriteCRLF("<spacer flex=\"1\"/>");
       UtilityWriteCRLF("</box>");
 
   UtilityWriteCRLF("</box>");
diff --git a/netwerk/protocol/res/src/Makefile.in b/netwerk/protocol/res/src/Makefile.in
index f3e8b7c25d07..01ff46040497 100644
--- a/netwerk/protocol/res/src/Makefile.in
+++ b/netwerk/protocol/res/src/Makefile.in
@@ -30,7 +30,6 @@ MODULE		= necko
 LIBRARY_NAME	= nkres_s
 REQUIRES	= xpcom \
 		  string \
-		  exthandler \
 		  mimetype \
 		  $(NULL)
 
diff --git a/profile/pref-migrator/resources/content/no_space.xul b/profile/pref-migrator/resources/content/no_space.xul
index fbb909ee4f93..d687dcd74885 100644
--- a/profile/pref-migrator/resources/content/no_space.xul
+++ b/profile/pref-migrator/resources/content/no_space.xul
@@ -40,19 +40,19 @@ Contributor(s):
   <hbox flex="1">
     <hbox>
         <text id="outOfSpace" value="&errorText1.label;"/>
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
         <image id="info.icon" class="message-icon"/>
     </hbox>
     <separator orient="vertical" class="thin"/>
   </hbox>
 
-  <spring flex="50%"/>
+  <spacer flex="50%"/>
 
   <hbox id="errorTextBody">
       <text value="&errorText2.label;"/>
   </hbox>
 
-  <spring flex="50%"/>
+  <spacer flex="50%"/>
 
   <separator class="thin"/>
   <hbox class="selection" id="RetryNewCancelButtons">
diff --git a/profile/resources/content/confirmMigration.xul b/profile/resources/content/confirmMigration.xul
index ba0f2428285f..688dafab317a 100644
--- a/profile/resources/content/confirmMigration.xul
+++ b/profile/resources/content/confirmMigration.xul
@@ -28,7 +28,7 @@
   <hbox>
     <vbox>
       <image class="message-icon"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox>
     <separator orient="vertical" class="thin"/>
     <vbox flex="1">
diff --git a/profile/resources/content/newProfile1_1.xul b/profile/resources/content/newProfile1_1.xul
index 55b3f8cd6385..180c9918a25c 100644
--- a/profile/resources/content/newProfile1_1.xul
+++ b/profile/resources/content/newProfile1_1.xul
@@ -41,7 +41,7 @@
     <html>&pnl1.p1.text;</html>
     <html>&pnl1.p2.text;</html>
     <html>&pnl1.p3.text;</html>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <html>&pnl1.p4.text;</html>
 
 </window>
diff --git a/profile/resources/content/newProfile1_2.xul b/profile/resources/content/newProfile1_2.xul
index 543a964f9cbb..c16c66f53266 100644
--- a/profile/resources/content/newProfile1_2.xul
+++ b/profile/resources/content/newProfile1_2.xul
@@ -59,11 +59,11 @@
   <separator/>
 
   <hbox autostretch="never">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button label="&langSelection.label;" oncommand="showLangDialog();"/>
   </hbox>
 
-  <spring flex="1"/>
+  <spacer flex="1"/>
 
   <html id="finishtext">&pnl2.finish.text;</html> 
 
diff --git a/profile/resources/content/profileSelection.xul b/profile/resources/content/profileSelection.xul
index 4ff4478620a1..38d20f404ae5 100644
--- a/profile/resources/content/profileSelection.xul
+++ b/profile/resources/content/profileSelection.xul
@@ -79,7 +79,7 @@
             <button id="renbutton" label="&renameButton.label;" oncommand="RenameProfile();"/>
             <button id="delbutton" label="&deleteButton.label;" oncommand="ConfirmDelete();"/>
           </vbox>
-          <spring flex="2"/>
+          <spacer flex="2"/>
         </hbox>
       </vbox>
     </deck>  
@@ -110,7 +110,7 @@
   <hbox class="selection">
     <separator class="thin" orient="vertical"/>
     <button id="manage" label="&manage.label;" oncommand="SwitchProfileManagerMode();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <hbox id="okCancelButtons"/>
     <separator class="thin" orient="vertical"/>
   </hbox>
diff --git a/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml b/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
index d037884d7a90..666fe1f336a7 100644
--- a/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
+++ b/themes/classic/communicator/sidebar/sidebarSplitterBindings.xml
@@ -7,15 +7,15 @@
   <binding id="sidebar-splitter" extends="xul:splitter">
     <content>
       <xul:vbox class="sidebar-splitter-topright-cap">
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
       </xul:vbox>
-      <xul:spring flex="1"/>
+      <xul:spacer flex="1"/>
       <xul:hbox>
         <children/>
       </xul:hbox>
-      <xul:spring flex="1"/>
+      <xul:spacer flex="1"/>
       <xul:vbox class="sidebar-splitter-bottomright-cap">
-        <xul:spring flex="100%"/>
+        <xul:spacer flex="100%"/>
       </xul:vbox>
     </content>
   </binding>
diff --git a/themes/classic/communicator/sidebar/win/sidebarBindings.xml b/themes/classic/communicator/sidebar/win/sidebarBindings.xml
index 2ea624521050..1118a8d314c5 100644
--- a/themes/classic/communicator/sidebar/win/sidebarBindings.xml
+++ b/themes/classic/communicator/sidebar/win/sidebarBindings.xml
@@ -13,7 +13,7 @@
           <xul:vbox flex="1">
             <xul:text class="panelheader-icon" inherits="value=label" crop="right"/>
           </xul:vbox>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
         </xul:hbox>
         <xul:hbox class="panelheader-texture"/>
       </xul:hbox>
diff --git a/themes/classic/communicator/xpinstall/xpinstall.css b/themes/classic/communicator/xpinstall/xpinstall.css
index 66ecd18d6d60..0a61acdf4e3d 100644
--- a/themes/classic/communicator/xpinstall/xpinstall.css
+++ b/themes/classic/communicator/xpinstall/xpinstall.css
@@ -65,23 +65,23 @@ div#table-housing {
   width                     : 32em;
 }
 
-spring#verticalSmallSpacer {
+spacer#verticalSmallSpacer {
   height                    : 1ex;
 }
 
-spring#verticalLargeSpacer {
+spacer#verticalLargeSpacer {
   height                    : 6ex;
 }
 
-spring#verticalMediumSpacer {
+spacer#verticalMediumSpacer {
   height                    : 3ex;
 }
 
-spring#horizontalSmallSpacer {
+spacer#horizontalSmallSpacer {
   width                     : 2em;
 }
 
-spring#horizontalLargeSpacer {
+spacer#horizontalLargeSpacer {
   width                     : 10em;
 }
 
@@ -89,4 +89,4 @@ spring#horizontalLargeSpacer {
   font-size                 : x-large;
   margin                    : 4px;
   font-weight               : bold;
-}
\ No newline at end of file
+}
diff --git a/themes/classic/editor/mac/EditModeTabs.css b/themes/classic/editor/mac/EditModeTabs.css
index 814ede6f2935..091583473ae5 100644
--- a/themes/classic/editor/mac/EditModeTabs.css
+++ b/themes/classic/editor/mac/EditModeTabs.css
@@ -4,7 +4,7 @@
   border-top: none;
 }
 
-.tabs-bottom > .tabs-spring {
+.tabs-bottom > .tabs-spacer {
   border-top: 1px solid threedshadow !important;
   border-bottom: none;
 }
diff --git a/themes/classic/editor/win/EditModeTabs.css b/themes/classic/editor/win/EditModeTabs.css
index a1bf88575f63..22996d3782b1 100644
--- a/themes/classic/editor/win/EditModeTabs.css
+++ b/themes/classic/editor/win/EditModeTabs.css
@@ -4,7 +4,7 @@
   border-top: none;
 }
 
-.tabs-bottom > .tabs-spring {
+.tabs-bottom > .tabs-spacer {
   border-top: 1px solid ThreeDShadow !important;
   border-bottom: none;
 }
diff --git a/themes/classic/global/mac/button.css b/themes/classic/global/mac/button.css
index cb6a172cd687..58805ebce83b 100644
--- a/themes/classic/global/mac/button.css
+++ b/themes/classic/global/mac/button.css
@@ -145,11 +145,11 @@ button {
 	height				: 20px;
 }
 
-.button-top-spring {
+.button-top-spacer {
 	height				: 2px;
 }
 
-.button-bottom-spring {
+.button-bottom-spacer {
 	height				: 3px;
 }
 
@@ -566,11 +566,11 @@ button[default="true"] {
 	height				: 26px;
 }
 
-.button-image-middle[default="true"] > .button-top-spring {
+.button-image-middle[default="true"] > .button-top-spacer {
 	height				: 3px;
 }
 
-.button-image-middle[default="true"] > .button-bottom-spring {
+.button-image-middle[default="true"] > .button-bottom-spacer {
 	height				: 2px;
 }
 
diff --git a/themes/classic/global/mac/buttonBindings.xml b/themes/classic/global/mac/buttonBindings.xml
index 13068e58a1bb..8d143eb2a2a0 100644
--- a/themes/classic/global/mac/buttonBindings.xml
+++ b/themes/classic/global/mac/buttonBindings.xml
@@ -63,9 +63,9 @@
 
   <binding id="exit-button" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
-      <xul:spring class="button-image-left" inherits="default,disabled"/>
+      <xul:spacer class="button-image-left" inherits="default,disabled"/>
       <xul:vbox flex="1" class="button-image-middle" inherits="default,disabled" align="center">
-        <xul:spring flex="1" class="button-top-spring"/>
+        <xul:spacer flex="1" class="button-top-spacer"/>
         <xul:hbox flex="1">
           <xul:image class="button-icon" inherits="src"/>
           <xul:hbox class="button-text-box" flex="1">
@@ -73,25 +73,25 @@
           </xul:hbox>
           <children/>
         </xul:hbox>
-        <xul:spring flex="1" class="button-bottom-spring"/>
+        <xul:spacer flex="1" class="button-bottom-spacer"/>
       </xul:vbox>
-      <xul:spring class="button-image-right" inherits="default,disabled"/>
+      <xul:spacer class="button-image-right" inherits="default,disabled"/>
     </content>
   </binding>
 
   <binding id="nine-slice-button" extends="chrome://global/content/bindings/button.xml#button-base">
     <content>
       <xul:vbox class="button-box-left" inherits="default,disabled">
-        <xul:spring class="button-left-top" inherits="default,disabled"/>
-        <xul:spring class="button-left-mid" inherits="default,disabled" flex="1"/>
-        <xul:spring class="button-left-btm" inherits="default,disabled"/>
+        <xul:spacer class="button-left-top" inherits="default,disabled"/>
+        <xul:spacer class="button-left-mid" inherits="default,disabled" flex="1"/>
+        <xul:spacer class="button-left-btm" inherits="default,disabled"/>
       </xul:vbox>
       
       <xul:stack class="button-stack" flex="1">
         <xul:vbox class="button-box-mid" inherits="default,disabled">
-           <xul:spring class="button-mid-top" inherits="default,disabled"/>
-           <xul:spring class="button-mid-mid" inherits="default,disabled" flex="1"/>
-           <xul:spring class="button-mid-btm" inherits="default,disabled"/>
+           <xul:spacer class="button-mid-top" inherits="default,disabled"/>
+           <xul:spacer class="button-mid-mid" inherits="default,disabled" flex="1"/>
+           <xul:spacer class="button-mid-btm" inherits="default,disabled"/>
         </xul:vbox>
 
         <xul:hbox class="button-text-box" align="center" pack="center">
@@ -102,9 +102,9 @@
      </xul:stack>
       
       <xul:vbox class="button-box-right" inherits="default,disabled">
-        <xul:spring class="button-right-top" inherits="default,disabled"/>
-        <xul:spring class="button-right-mid" inherits="default,disabled" flex="1"/>
-        <xul:spring class="button-right-btm" inherits="default,disabled"/>
+        <xul:spacer class="button-right-top" inherits="default,disabled"/>
+        <xul:spacer class="button-right-mid" inherits="default,disabled" flex="1"/>
+        <xul:spacer class="button-right-btm" inherits="default,disabled"/>
       </xul:vbox>
     <children includes="menupopup"/>
     </content>
diff --git a/themes/classic/global/mac/classicBindings.xml b/themes/classic/global/mac/classicBindings.xml
index 8cf38c74c475..a3c5673a976f 100644
--- a/themes/classic/global/mac/classicBindings.xml
+++ b/themes/classic/global/mac/classicBindings.xml
@@ -18,7 +18,7 @@
       <xul:hbox align="center">
         <xul:image class="toolbargrippy-twisty"/>
       </xul:hbox>
-      <xul:spring class="toolbargrippy-texture" flex="1"/>
+      <xul:spacer class="toolbargrippy-texture" flex="1"/>
     </content>
   </binding>
 
@@ -27,7 +27,7 @@
       <xul:hbox align="center">
         <xul:image class="toolbargrippy-twisty-collapsed"/>
       </xul:hbox>
-      <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
+      <xul:spacer class="toolbargrippy-texture-collapsed" flex="1"/>
     </content>
   </binding>
 
@@ -63,13 +63,13 @@
 <binding id="thumb" extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
       <xul:vbox class="thumb-border" flex="1">
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:hbox>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:image inherits="src"/>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
         </xul:hbox>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
       </xul:vbox>
     </content>
   </binding>
@@ -148,24 +148,24 @@
 
   <binding id="tab" extends="chrome://global/content/bindings/tabbox.xml#tab">
     <content>
-      <xul:spring class="tab-image-left" inherits="selected"/>
+      <xul:spacer class="tab-image-left" inherits="selected"/>
       <xul:hbox flex="1" class="tab-image-middle" align="center" inherits="selected">
         <xul:image class="tab-left"/>
         <xul:text flex="1" inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
       </xul:hbox>
-      <xul:spring class="tab-image-right" inherits="selected"/>
+      <xul:spacer class="tab-image-right" inherits="selected"/>
     </content>
   </binding>
 
   <binding id="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs">
     <content>
-      <xul:spring class="tab-border-top-left-cap"/>
-      <xul:spring class="tab-border-top-left"/>
+      <xul:spacer class="tab-border-top-left-cap"/>
+      <xul:spacer class="tab-border-top-left"/>
       <xul:box inherits="orient,align,pack">
         <children/>
       </xul:box>
-      <xul:spring class="tab-border-top-right" flex="1"/>
-      <xul:spring class="tab-border-top-right-cap"/>
+      <xul:spacer class="tab-border-top-right" flex="1"/>
+      <xul:spacer class="tab-border-top-right-cap"/>
     </content>
   </binding>
   
@@ -178,7 +178,7 @@
         <xul:hbox class="box-header-text-box" align="center">
           <xul:text class="box-header-text" inherits="value=title"/>
         </xul:hbox>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
       </xul:hbox>
     </content>
   </binding>  
diff --git a/themes/classic/global/mac/menulistBindings.xml b/themes/classic/global/mac/menulistBindings.xml
index 70e857e4517a..62f9976f4a6a 100644
--- a/themes/classic/global/mac/menulistBindings.xml
+++ b/themes/classic/global/mac/menulistBindings.xml
@@ -8,16 +8,16 @@
   <binding id="nine-slice-menulist" extends="chrome://global/content/bindings/menulist.xml#menulist">
   	<content>
       <xul:vbox class="menulist-box-left" inherits="disabled">
-        <xul:spring class="menulist-left-top" inherits="disabled"/>
-        <xul:spring class="menulist-left-mid" inherits="disabled" flex="1"/>
-        <xul:spring class="menulist-left-btm" inherits="disabled"/>
+        <xul:spacer class="menulist-left-top" inherits="disabled"/>
+        <xul:spacer class="menulist-left-mid" inherits="disabled" flex="1"/>
+        <xul:spacer class="menulist-left-btm" inherits="disabled"/>
       </xul:vbox>
 
       <xul:stack class="menulist-stack" flex="1">
         <xul:vbox class="menulist-box-mid" inherits="disabled">
-           <xul:spring class="menulist-mid-top" inherits="disabled"/>
-           <xul:spring class="menulist-mid-mid" inherits="disabled" flex="1"/>
-           <xul:spring class="menulist-mid-btm" inherits="disabled"/>
+           <xul:spacer class="menulist-mid-top" inherits="disabled"/>
+           <xul:spacer class="menulist-mid-mid" inherits="disabled" flex="1"/>
+           <xul:spacer class="menulist-mid-btm" inherits="disabled"/>
         </xul:vbox>
 
         <xul:hbox class="menulist-text-box" align="center">
@@ -32,7 +32,7 @@
         		<xul:image class="menulist-dropmarker" inherits="disabled"/>
           </xul:hbox>
         </xul:hbox>
-        <xul:spring class="menulist-right-btm" inherits="disabled"/>
+        <xul:spacer class="menulist-right-btm" inherits="disabled"/>
       </xul:vbox>
 	  <children includes="menupopup"/>
     </content>
@@ -42,7 +42,7 @@
     <content flex="1">
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
 	  <children includes="menupopup"/>
diff --git a/themes/classic/global/win/classicBindings.xml b/themes/classic/global/win/classicBindings.xml
index cc64ce4e5d59..a852883903a4 100644
--- a/themes/classic/global/win/classicBindings.xml
+++ b/themes/classic/global/win/classicBindings.xml
@@ -19,7 +19,7 @@
       <xul:hbox align="center" pack="center">
         <xul:image class="toolbargrippy-twisty"/>
       </xul:hbox>
-      <xul:spring class="toolbargrippy-texture" flex="1"/>
+      <xul:spacer class="toolbargrippy-texture" flex="1"/>
     </content>
   </binding>
 
@@ -28,7 +28,7 @@
       <xul:hbox align="center">
         <xul:image class="toolbargrippy-twisty-collapsed"/>
       </xul:hbox>
-      <xul:spring class="toolbargrippy-texture-collapsed" flex="1"/>
+      <xul:spacer class="toolbargrippy-texture-collapsed" flex="1"/>
     </content>
   </binding>
 
@@ -66,7 +66,7 @@
   <binding id="thumb" extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
       <xul:vbox class="thumb-box" align="center" flex="1">
-        <xul:spring class="thumb-spring" flex="1"/>
+        <xul:spacer class="thumb-spacer" flex="1"/>
       </xul:vbox>
     </content>
   </binding>
@@ -111,7 +111,7 @@
       <xul:vbox class="menu-iconic-left" align="center" inherits="selected,menuactive,disabled,checked">
         <xul:image/>
       </xul:vbox>
-      <xul:spring class="menuitem-iconic-spring"/>
+      <xul:spacer class="menuitem-iconic-spacer"/>
       <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value=label,accesskey,crop" crop="right"/>
       <xul:text class="menu-iconic-accel" inherits="value=acceltext"/>
     </content>
@@ -121,12 +121,12 @@
     <content>
       <xul:hbox class="largeheader-box" flex="1">
         <xul:vbox class="largeheader-text-container">
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
           <xul:html class="largeheader-desc-text" inherits="value=description"/>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
         </xul:vbox>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:hbox class="largeheader-icon-container" align="center">
           <xul:image class="largeheader-icon" inherits="src"/>
         </xul:hbox>
diff --git a/themes/classic/global/win/menulistBindings.xml b/themes/classic/global/win/menulistBindings.xml
index 51d8fd3736be..91b622e3c1c3 100644
--- a/themes/classic/global/win/menulistBindings.xml
+++ b/themes/classic/global/win/menulistBindings.xml
@@ -54,7 +54,7 @@
     <content>
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
     <children includes="menupopup"/>
diff --git a/themes/classic/global/win/scrollbars.css b/themes/classic/global/win/scrollbars.css
index 82aa4415e421..10907e92529b 100644
--- a/themes/classic/global/win/scrollbars.css
+++ b/themes/classic/global/win/scrollbars.css
@@ -28,7 +28,7 @@ thumb
     border-bottom         : 1px solid ThreeDShadow;
   }
   
-.thumb-spring
+.thumb-spacer
   {
   	min-width			  : 4px;
   	min-height			  : 4px;
diff --git a/themes/classic/global/win/tabBindings.xml b/themes/classic/global/win/tabBindings.xml
index 718be9e033c8..4deea00802ba 100644
--- a/themes/classic/global/win/tabBindings.xml
+++ b/themes/classic/global/win/tabBindings.xml
@@ -9,7 +9,7 @@
       <xul:hbox class="tabcontainer">
         <children/>
       </xul:hbox>
-      <xul:spring class="tabs-spring" flex="1"/>
+      <xul:spacer class="tabs-spacer" flex="1"/>
     </content>
   </binding>
 
diff --git a/themes/classic/global/win/tabbox.css b/themes/classic/global/win/tabbox.css
index 2288f17f5270..005a015c815f 100644
--- a/themes/classic/global/win/tabbox.css
+++ b/themes/classic/global/win/tabbox.css
@@ -46,35 +46,35 @@ tabpanels.light {
   border-bottom: 1px solid ThreeDShadow;
 }
 
-/* tabs-spring ========================== */
+/* tabs-spacer ========================== */
 
 /* top tabs */
-tabbox[orient="vertical"] > tabs > .tabs-spring {
+tabbox[orient="vertical"] > tabs > .tabs-spacer {
   border-bottom: 1px solid ThreeDHighlight;
 }
 
 /* bottom tabs */
-tabbox[orient="vertical"] > tabpanels + tabs > .tabs-spring {
+tabbox[orient="vertical"] > tabpanels + tabs > .tabs-spacer {
   border-top: 1px solid ThreeDShadow !important;
   border-bottom: none;
 }
 
 /* left tabs */
-tabbox[orient="horizontal"] > tabs > .tabs-spring {
+tabbox[orient="horizontal"] > tabs > .tabs-spacer {
   border-right: 1px solid ThreeDHighlight;
 }
 
 /* right tabs */
-tabbox[orient="horizontal"] > tabpanels + tabs > .tabs-spring {
+tabbox[orient="horizontal"] > tabpanels + tabs > .tabs-spacer {
   border-left: 1px solid ThreeDShadow !important;
   border-right: none;
 }
 
 /*============ tab widget ============*/
 /* NOTE: there should be code in here for indenting the first tab
-   by two pixels, however, this needs to be done with a spring to
-   fill in the border, but current attempts to use said spring 
-   result in said spring not rendering.  Will revisit.  - JRH */
+   by two pixels, however, this needs to be done with a spacer to
+   fill in the border, but current attempts to use said spacer 
+   result in said spacer not rendering.  Will revisit.  - JRH */
    
 tab {
   border: none;
diff --git a/themes/classic/global/win/toolbar.css b/themes/classic/global/win/toolbar.css
index 432d83836bd1..9948f0d21c3d 100644
--- a/themes/classic/global/win/toolbar.css
+++ b/themes/classic/global/win/toolbar.css
@@ -87,7 +87,7 @@ toolbargrippy[tbgrippy-collapsed="true"]
   } 
 
 
-.collapsed-tray-spring
+.collapsed-tray-spacer
   {
     border-bottom         : 1px solid ThreeDShadow;
   }  
diff --git a/themes/classic/messenger/addressbook/mac/selectAddressesDialog.css b/themes/classic/messenger/addressbook/mac/selectAddressesDialog.css
index b2b9b78ffaac..b3c5fb049cc4 100644
--- a/themes/classic/messenger/addressbook/mac/selectAddressesDialog.css
+++ b/themes/classic/messenger/addressbook/mac/selectAddressesDialog.css
@@ -89,10 +89,10 @@
   padding-right  : 0px;
 }
 
-.third-column-spring {  /* Vertical Springs between 3rd column buttons */
+.third-column-spacer {  /* Vertical Spacers between 3rd column buttons */
   height      : 10px;
 }
 
-.middle-button-spring { /* Springs between To, CC, and BCC buttons */
+.middle-button-spacer { /* Spacers between To, CC, and BCC buttons */
   width      : 10px;
 }
diff --git a/themes/classic/messenger/addressbook/win/selectAddressesDialog.css b/themes/classic/messenger/addressbook/win/selectAddressesDialog.css
index 1e6b11fcfefe..b1c7379f838e 100644
--- a/themes/classic/messenger/addressbook/win/selectAddressesDialog.css
+++ b/themes/classic/messenger/addressbook/win/selectAddressesDialog.css
@@ -62,11 +62,11 @@
 	padding-right	: 0px;
 }
 
-.third-column-spring {  /* Vertical Springs between 3rd column buttons */
+.third-column-spacer {  /* Vertical Spacers between 3rd column buttons */
 	height			: 10px;
 }
 
-.middle-button-spring { /* Springs between To, CC, and BCC buttons */
+.middle-button-spacer { /* Spacers between To, CC, and BCC buttons */
 	width			: 10px;
 }
 
diff --git a/themes/modern/communicator/brand/brandBindings.xml b/themes/modern/communicator/brand/brandBindings.xml
index 29b71cf6db9d..35ab878fa1da 100644
--- a/themes/modern/communicator/brand/brandBindings.xml
+++ b/themes/modern/communicator/brand/brandBindings.xml
@@ -13,13 +13,13 @@
   <binding id="throbber-fancy" extends="chrome://global/content/bindings/general.xml#basetext">
   	<content>
       <xul:vbox class="throbber-internal-box" flex="1">
-       	<xul:spring class="throbber-groove-top"/>
+       	<xul:spacer class="throbber-groove-top"/>
     	  <xul:hbox class="throbber-middle">
-      	  <xul:spring class="throbber-groove-left"/>
+      	  <xul:spacer class="throbber-groove-left"/>
     	  	<xul:image class="throbber-icon" inherits="src"/>
-    	  	<xul:spring class="throbber-groove-right"/>
+    	  	<xul:spacer class="throbber-groove-right"/>
     	  </xul:hbox>
-    	  <xul:spring class="throbber-groove-bottom"/>
+    	  <xul:spacer class="throbber-groove-bottom"/>
       </xul:vbox>
     </content>
   </binding>
diff --git a/themes/modern/communicator/dialog/dialogBindings.xml b/themes/modern/communicator/dialog/dialogBindings.xml
index edc364c74995..a9cf4b0e02c8 100644
--- a/themes/modern/communicator/dialog/dialogBindings.xml
+++ b/themes/modern/communicator/dialog/dialogBindings.xml
@@ -9,7 +9,7 @@
       <xul:hbox class="box-smallheader-text-container" align="center" flex="1">
         <children/>
         <xul:text class="box-smallheader-left" inherits="value=title"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="box-smallheader-right" inherits="value=description"/>
       </xul:hbox>
     </content>
@@ -19,13 +19,13 @@
     <content>
       <xul:hbox class="largeheader-box" flex="1">
         <xul:vbox class="largeheader-text-container">
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:text class="largeheader-header-text" inherits="value=title" crop="right"/>
           <xul:html class="largeheader-desc-text" inherits="value=description"/>
           <children/>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
         </xul:vbox>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:hbox class="largeheader-icon-container" align="center">
           <xul:image class="largeheader-icon" inherits="src"/>
         </xul:hbox>
diff --git a/themes/modern/communicator/sidebar/sidebarBindings.xml b/themes/modern/communicator/sidebar/sidebarBindings.xml
index 7ca2e3c5536f..c1dde10239b9 100644
--- a/themes/modern/communicator/sidebar/sidebarBindings.xml
+++ b/themes/modern/communicator/sidebar/sidebarBindings.xml
@@ -7,17 +7,17 @@
   <binding id="sidebar-tab" extends="xul:button">
     <content>
       <xul:vbox class="sidebar-tab-left">
-        <xul:spring class="sidebar-tab-left-top" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
-        <xul:spring class="sidebar-tab-left-mid" inherits="selected,first-panel-after-selected,top-panel,last-panel"
+        <xul:spacer class="sidebar-tab-left-top" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        <xul:spacer class="sidebar-tab-left-mid" inherits="selected,first-panel-after-selected,top-panel,last-panel"
                     flex="1"/>
-        <xul:spring class="sidebar-tab-left-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        <xul:spacer class="sidebar-tab-left-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
       </xul:vbox>
   
       <xul:stack class="sidebar-tab-mid-1">
         <xul:vbox class="sidebar-tab-mid-2">
-          <xul:spring class="sidebar-tab-mid-top" inherits="selected,first-panel-after-selected,top-panel,last-panel"
+          <xul:spacer class="sidebar-tab-mid-top" inherits="selected,first-panel-after-selected,top-panel,last-panel"
                       flex="1"/>
-          <xul:spring class="sidebar-tab-mid-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+          <xul:spacer class="sidebar-tab-mid-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
         </xul:vbox>
       
         <xul:vbox class="sidebar-tab-text-box">
@@ -26,13 +26,13 @@
       </xul:stack>
       
       <xul:vbox class="sidebar-tab-right">
-        <xul:spring class="sidebar-tab-right-top" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
-        <xul:spring class="sidebar-tab-right-mid" inherits="selected,first-panel-after-selected,top-panel,last-panel"
+        <xul:spacer class="sidebar-tab-right-top" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        <xul:spacer class="sidebar-tab-right-mid" inherits="selected,first-panel-after-selected,top-panel,last-panel"
                     flex="1"/>
-        <xul:spring class="sidebar-tab-right-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        <xul:spacer class="sidebar-tab-right-btm" inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
       </xul:vbox>
             
-      <xul:spring class="sidebar-tab-rightcap" flex="1"/>
+      <xul:spacer class="sidebar-tab-rightcap" flex="1"/>
     </content>
   </binding>
 
diff --git a/themes/modern/communicator/toolbar/toolbarBindings.xml b/themes/modern/communicator/toolbar/toolbarBindings.xml
index 700597e17fde..1ed40ce46565 100644
--- a/themes/modern/communicator/toolbar/toolbarBindings.xml
+++ b/themes/modern/communicator/toolbar/toolbarBindings.xml
@@ -13,13 +13,13 @@
         <xul:stack class="toolbar-primary-mid" flex="1">
           <xul:hbox class="toolbar-primary-mid-2" flex="1">
             <xul:vbox class="toolbar-primary-mid-bg" flex="1">
-              <xul:spring class="toolbar-primary-mid-top" flex="1"/> 
-              <xul:spring class="toolbar-primary-mid-btm"/> 
+              <xul:spacer class="toolbar-primary-mid-top" flex="1"/> 
+              <xul:spacer class="toolbar-primary-mid-btm"/> 
             </xul:vbox>
             <xul:vbox class="toolbar-primary-right">
-              <xul:spring class="toolbar-primary-right-top"/> 
-              <xul:spring class="toolbar-primary-right-mid" flex="1"/> 
-              <xul:spring class="toolbar-primary-right-btm"/> 
+              <xul:spacer class="toolbar-primary-right-top"/> 
+              <xul:spacer class="toolbar-primary-right-mid" flex="1"/> 
+              <xul:spacer class="toolbar-primary-right-btm"/> 
             </xul:vbox>
           </xul:hbox>
           <xul:hbox class="toolbar-primary-mid-fg"
diff --git a/themes/modern/global/globalBindings.xml b/themes/modern/global/globalBindings.xml
index 088b967dd3ba..ed5d7934587b 100644
--- a/themes/modern/global/globalBindings.xml
+++ b/themes/modern/global/globalBindings.xml
@@ -9,16 +9,16 @@
 
   <binding id="toolbargrippy" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
-      <xul:spring class="toolbargrippy-top"/>
-      <xul:spring class="toolbargrippy-mid" flex="1"/>
-      <xul:spring class="toolbargrippy-btm"/>
+      <xul:spacer class="toolbargrippy-top"/>
+      <xul:spacer class="toolbargrippy-mid" flex="1"/>
+      <xul:spacer class="toolbargrippy-btm"/>
     </content>
   </binding>
 
   <binding id="toolbargrippy-collapsed" extends="chrome://global/content/bindings/toolbar.xml#toolbargrippy">
     <content>
-      <xul:spring class="toolbargrippy-collapsed-left"/>
-      <xul:spring class="toolbargrippy-collapsed-right" flex="1"/>
+      <xul:spacer class="toolbargrippy-collapsed-left"/>
+      <xul:spacer class="toolbargrippy-collapsed-right" flex="1"/>
     </content>
   </binding>
 
@@ -29,16 +29,16 @@
       <children includes="observes|template|menupopup|tooltip"/>
       <xul:box class="box-inherit" orient="horizontal" dir="ltr" flex="1">
         <xul:vbox class="button-box-left" dir="normal" inherits="default,disabled">
-          <xul:spring class="button-left-top" inherits="default,disabled"/>
-          <xul:spring class="button-left-mid" inherits="default,disabled" flex="1"/>
-          <xul:spring class="button-left-btm" inherits="default,disabled"/>
+          <xul:spacer class="button-left-top" inherits="default,disabled"/>
+          <xul:spacer class="button-left-mid" inherits="default,disabled" flex="1"/>
+          <xul:spacer class="button-left-btm" inherits="default,disabled"/>
         </xul:vbox>
       
         <xul:stack class="box-inherit button-stack" flex="1">
           <xul:vbox class="button-box-mid" dir="normal" inherits="default,disabled">
-             <xul:spring class="button-mid-top" inherits="default,disabled"/>
-             <xul:spring class="button-mid-mid" inherits="default,disabled" flex="1"/>
-             <xul:spring class="button-mid-btm" inherits="default,disabled"/>
+             <xul:spacer class="button-mid-top" inherits="default,disabled"/>
+             <xul:spacer class="button-mid-mid" inherits="default,disabled" flex="1"/>
+             <xul:spacer class="button-mid-btm" inherits="default,disabled"/>
           </xul:vbox>
 
           <xul:hbox inherits="orient,align,pack,dir" class="box-inherit button-text-box" align="center" pack="center">
@@ -51,9 +51,9 @@
         </xul:stack>
       
         <xul:vbox class="button-box-right" dir="normal" inherits="default,disabled">
-          <xul:spring class="button-right-top" inherits="default,disabled"/>
-          <xul:spring class="button-right-mid" inherits="default,disabled" flex="1"/>
-          <xul:spring class="button-right-btm" inherits="default,disabled"/>
+          <xul:spacer class="button-right-top" inherits="default,disabled"/>
+          <xul:spacer class="button-right-mid" inherits="default,disabled" flex="1"/>
+          <xul:spacer class="button-right-btm" inherits="default,disabled"/>
         </xul:vbox>
       </xul:box>
     </content>
@@ -81,16 +81,16 @@
   <binding id="menulist" extends="chrome://global/content/bindings/menulist.xml#menulist">
   	<content>
       <xul:vbox class="menulist-box-left" inherits="disabled">
-        <xul:spring class="menulist-left-top" inherits="disabled"/>
-        <xul:spring class="menulist-left-mid" inherits="disabled" flex="1"/>
-        <xul:spring class="menulist-left-btm" inherits="disabled"/>
+        <xul:spacer class="menulist-left-top" inherits="disabled"/>
+        <xul:spacer class="menulist-left-mid" inherits="disabled" flex="1"/>
+        <xul:spacer class="menulist-left-btm" inherits="disabled"/>
       </xul:vbox>
 
       <xul:stack class="menulist-stack" flex="1">
         <xul:vbox class="menulist-box-mid" inherits="disabled">
-           <xul:spring class="menulist-mid-top" inherits="disabled"/>
-           <xul:spring class="menulist-mid-mid" inherits="disabled" flex="1"/>
-           <xul:spring class="menulist-mid-btm" inherits="disabled"/>
+           <xul:spacer class="menulist-mid-top" inherits="disabled"/>
+           <xul:spacer class="menulist-mid-mid" inherits="disabled" flex="1"/>
+           <xul:spacer class="menulist-mid-btm" inherits="disabled"/>
         </xul:vbox>
 
         <xul:hbox class="menulist-text-box" align="center">
@@ -102,9 +102,9 @@
       <xul:vbox class="menulist-box-right" inherits="disabled">
         <xul:stack flex="1">
           <xul:vbox>
-        		<xul:spring class="menulist-right-top" inherits="disabled"/>
-            <xul:spring class="menulist-right-mid" inherits="disabled" flex="1"/>
-            <xul:spring class="menulist-right-btm" inherits="disabled"/>
+        		<xul:spacer class="menulist-right-top" inherits="disabled"/>
+            <xul:spacer class="menulist-right-mid" inherits="disabled" flex="1"/>
+            <xul:spacer class="menulist-right-btm" inherits="disabled"/>
           </xul:vbox>
           <xul:hbox class="menulist-dropmarker-box" align="center" pack="center">
             <xul:image class="menulist-dropmarker" inherits="disabled"/>
@@ -132,7 +132,7 @@
     <content flex="1">
       <xul:hbox class="menulist-compact-internal-box" flex="1" align="center">
         <xul:image class="menulist-compact-dropmarker" inherits="disabled"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="menulist-compact-text" inherits="value=label,accesskey,crop,disabled" crop="right"/>
       </xul:hbox>
       <children includes="menupopup"/>
@@ -189,13 +189,13 @@
            extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
       <xul:vbox flex="1">
-        <xul:spring class="thumb-vert-spring-top"/>
+        <xul:spacer class="thumb-vert-spacer-top"/>
         <xul:vbox flex="1" class="thumb-vert-box-middle">
-          <xul:spring flex="1"/>
-          <xul:spring class="thumb-vert-grippy"/>
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
+          <xul:spacer class="thumb-vert-grippy"/>
+          <xul:spacer flex="1"/>
         </xul:vbox>
-        <xul:spring class="thumb-vert-spring-bottom"/>
+        <xul:spacer class="thumb-vert-spacer-bottom"/>
       </xul:vbox>
     </content>
   </binding>
@@ -203,13 +203,13 @@
   <binding id="thumb-horizontal"
            extends="chrome://global/content/bindings/scrollbar.xml#thumb">
     <content>
-      <xul:spring class="thumb-horz-spring-left"/>
+      <xul:spacer class="thumb-horz-spacer-left"/>
       <xul:hbox flex="1" class="thumb-horz-box-middle">
-        <xul:spring flex="1"/>
-        <xul:spring class="thumb-horz-grippy"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
+        <xul:spacer class="thumb-horz-grippy"/>
+        <xul:spacer flex="1"/>
       </xul:hbox>
-      <xul:spring class="thumb-horz-spring-right"/>
+      <xul:spacer class="thumb-horz-spacer-right"/>
     </content>
   </binding>
 
@@ -234,35 +234,35 @@
   <binding id="tab" extends="chrome://global/content/bindings/tabbox.xml#tab">
     <content orient="horizontal">
       <xul:vbox class="tab-left">
-        <xul:spring class="tab-left-top" inherits="selected"/>
-        <xul:spring class="tab-left-mid" inherits="selected" flex="1"/>
-        <xul:spring class="tab-left-btm" inherits="selected"/>
+        <xul:spacer class="tab-left-top" inherits="selected"/>
+        <xul:spacer class="tab-left-mid" inherits="selected" flex="1"/>
+        <xul:spacer class="tab-left-btm" inherits="selected"/>
       </xul:vbox>
       <xul:vbox flex="1" class="tab-mid" inherits="selected">
-        <xul:spring class="tab-mid-top" inherits="selected"/>
+        <xul:spacer class="tab-mid-top" inherits="selected"/>
         <xul:hbox class="tab-mid-mid" align="center" pack="center" flex="1">
   	      <xul:image class="tab-icon"/>
       	  <xul:text flex="1" inherits="value=label,crop,accesskey" crop="right" class="tab-text"/>
         </xul:hbox>
-        <xul:spring class="tab-mid-btm" inherits="selected"/>
+        <xul:spacer class="tab-mid-btm" inherits="selected"/>
       </xul:vbox>
       <xul:vbox class="tab-right">
-        <xul:spring class="tab-right-top" inherits="selected"/>
-        <xul:spring class="tab-right-mid" inherits="selected" flex="1"/>
-        <xul:spring class="tab-right-btm" inherits="selected"/>
+        <xul:spacer class="tab-right-top" inherits="selected"/>
+        <xul:spacer class="tab-right-mid" inherits="selected" flex="1"/>
+        <xul:spacer class="tab-right-btm" inherits="selected"/>
       </xul:vbox>
     </content>
   </binding>
   
   <binding id="tabs" extends="chrome://global/content/bindings/tabbox.xml#tabs">
     <content>
-      <xul:spring class="tabs-left-cap"/>
-  	  <xul:spring class="tabs-left"/>
+      <xul:spacer class="tabs-left-cap"/>
+  	  <xul:spacer class="tabs-left"/>
   	  <xul:hbox class="tabs-mid">
   		  <children/>
   	  </xul:hbox>
-  	  <xul:spring class="tabs-right" flex="1"/>
-  	  <xul:spring class="tabs-right-cap"/>
+  	  <xul:spacer class="tabs-right" flex="1"/>
+  	  <xul:spacer class="tabs-right-cap"/>
   	</content>
   </binding>
 
diff --git a/themes/modern/global/scrollbars-mini.css b/themes/modern/global/scrollbars-mini.css
index 474f9adbee49..d1ab93372e69 100644
--- a/themes/modern/global/scrollbars-mini.css
+++ b/themes/modern/global/scrollbars-mini.css
@@ -53,7 +53,7 @@ thumb {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#thumb-horizontal");
 }
 
-.thumb-horz-spring-left {
+.thumb-horz-spacer-left {
   width: 3px;
   height: 8px;
   background: url("chrome://global/skin/scrollbar/mini-thumb-hrz-lft.gif") no-repeat;
@@ -64,7 +64,7 @@ thumb {
   background: url("chrome://global/skin/scrollbar/mini-thumb-hrz-mid.gif") repeat-x;
 }
 
-.thumb-horz-spring-right {
+.thumb-horz-spacer-right {
   width: 3px;
   height: 8px;
   background: url("chrome://global/skin/scrollbar/mini-thumb-hrz-rit.gif") no-repeat;
@@ -78,7 +78,7 @@ thumb {
 
 /* ..... active state ..... */
 
-thumb:active > .thumb-horz-spring-left {
+thumb:active > .thumb-horz-spacer-left {
   background-image: url("chrome://global/skin/scrollbar/mini-thumb-hrz-lft-act.gif");
 }
 
@@ -86,7 +86,7 @@ thumb:active > .thumb-horz-box-middle {
   background-image: url("chrome://global/skin/scrollbar/mini-thumb-hrz-mid-act.gif");
 }
 
-thumb:active > .thumb-horz-spring-right {
+thumb:active > .thumb-horz-spacer-right {
   background-image: url("chrome://global/skin/scrollbar/mini-thumb-hrz-rit-act.gif");
 }
 
@@ -100,7 +100,7 @@ thumb[orient="vertical"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#thumb-vertical");
 }
 
-.thumb-vert-spring-top {
+.thumb-vert-spacer-top {
   background: url("chrome://global/skin/scrollbar/mini-thumb-vrt-top.gif") no-repeat;
   height: 3px;
   width: 8px;
@@ -111,7 +111,7 @@ thumb[orient="vertical"] {
   width: 8px;
 }
 
-.thumb-vert-spring-bottom {
+.thumb-vert-spacer-bottom {
   background: url("chrome://global/skin/scrollbar/mini-thumb-vrt-btm.gif") no-repeat;
   height: 3px;
   width: 8px;
@@ -125,7 +125,7 @@ thumb[orient="vertical"] {
 
 /* ..... active state ..... */
 
-thumb:active > .thumb-vert-spring-top {
+thumb:active > .thumb-vert-spacer-top {
   background-image: url("chrome://global/skin/scrollbar/mini-thumb-vrt-top-act.gif") no-repeat;
 }
 
@@ -133,7 +133,7 @@ thumb:active > .thumb-vert-box-middle {
   background-image: url("chrome://global/skin/scrollbar/mini-thumb-vrt-mid-act.gif") repeat-y;
 }
 
-thumb:active > .thumb-vert-spring-bottom {
+thumb:active > .thumb-vert-spacer-bottom {
   background-image: url("chrome://global/skin/scrollbar/mini-thumb-vrt-btm-act.gif") no-repeat;
 }
 
diff --git a/themes/modern/global/scrollbars.css b/themes/modern/global/scrollbars.css
index c1483ff86205..86ae3a78d5d5 100644
--- a/themes/modern/global/scrollbars.css
+++ b/themes/modern/global/scrollbars.css
@@ -55,7 +55,7 @@ thumb {
   height: 14px;
 }
 
-.thumb-horz-spring-left {
+.thumb-horz-spacer-left {
   width: 3px;
   background: url("chrome://global/skin/scrollbar/thumb-hrz-lft.gif") no-repeat;
 }
@@ -64,7 +64,7 @@ thumb {
   background: url("chrome://global/skin/scrollbar/thumb-hrz-mid.gif") repeat-x;
 }
 
-.thumb-horz-spring-right {
+.thumb-horz-spacer-right {
   width: 3px;
   background: url("chrome://global/skin/scrollbar/thumb-hrz-rit.gif") no-repeat;
 }
@@ -77,7 +77,7 @@ thumb {
 
 /* ..... active state ..... */
 
-thumb:active > .thumb-horz-spring-left {
+thumb:active > .thumb-horz-spacer-left {
   background: url("chrome://global/skin/scrollbar/thumb-hrz-act-lft-act.gif") no-repeat;
 }
 
@@ -85,7 +85,7 @@ thumb:active > .thumb-horz-box-middle {
   background: url("chrome://global/skin/scrollbar/thumb-hrz-mid-act.gif") repeat-x;
 }
 
-thumb:active > .thumb-horz-spring-right {
+thumb:active > .thumb-horz-spacer-right {
   background: url("chrome://global/skin/scrollbar/thumb-hrz-rit-act.gif") no-repeat;
 }
 
@@ -99,7 +99,7 @@ thumb[orient="vertical"] {
   -moz-binding: url("chrome://global/skin/globalBindings.xml#thumb-vertical");
 }
 
-.thumb-vert-spring-top {
+.thumb-vert-spacer-top {
   background: url("chrome://global/skin/scrollbar/thumb-vrt-top.gif") no-repeat;
   height: 3px;
   width: 14px;
@@ -110,7 +110,7 @@ thumb[orient="vertical"] {
   width: 14px;
 }
 
-.thumb-vert-spring-bottom {
+.thumb-vert-spacer-bottom {
   background: url("chrome://global/skin/scrollbar/thumb-vrt-btm.gif") no-repeat;
   height: 3px;
   width: 14px;
@@ -124,7 +124,7 @@ thumb[orient="vertical"] {
 
 /* ..... active state ..... */
 
-thumb:active > .thumb-vert-spring-top {
+thumb:active > .thumb-vert-spacer-top {
   background: url("chrome://global/skin/scrollbar/thumb-vrt-top-act.gif") no-repeat;
 }
 
@@ -132,7 +132,7 @@ thumb:active > .thumb-vert-box-middle {
   background: url("chrome://global/skin/scrollbar/thumb-vrt-mid-act.gif") repeat-y;
 }
 
-thumb:active > .thumb-vert-spring-bottom {
+thumb:active > .thumb-vert-spacer-bottom {
   background: url("chrome://global/skin/scrollbar/thumb-vrt-btm-act.gif") no-repeat;
 }
 
diff --git a/themes/modern/messenger/addressbook/selectAddressesDialog.css b/themes/modern/messenger/addressbook/selectAddressesDialog.css
index 992e4cd15719..e47dc55f38af 100644
--- a/themes/modern/messenger/addressbook/selectAddressesDialog.css
+++ b/themes/modern/messenger/addressbook/selectAddressesDialog.css
@@ -76,10 +76,10 @@
   padding-right: 0px;
 }
 
-.third-column-spring {
+.third-column-spacer {
   height: 10px;
 }
 
-.middle-button-spring {
+.middle-button-spacer {
   width: 10px;
 }
diff --git a/themes/modern/messenger/messenger.css b/themes/modern/messenger/messenger.css
index 7bd5260b7639..edf1fea27cef 100644
--- a/themes/modern/messenger/messenger.css
+++ b/themes/modern/messenger/messenger.css
@@ -38,7 +38,7 @@
 
 /* ::::: miscellany :::::: */
 
-spring.spacer {
+spacer.spacer {
   width: 5px;
   height: 5px;
 }
diff --git a/themes/modern/messenger/messengercompose/messengercompose.css b/themes/modern/messenger/messengercompose/messengercompose.css
index b2cb9b7d8c3f..8345bb53dc2b 100644
--- a/themes/modern/messenger/messengercompose/messengercompose.css
+++ b/themes/modern/messenger/messengercompose/messengercompose.css
@@ -255,7 +255,7 @@ statusbarpanel,
   border-top: none;
 }
 
-spring.spacer {
+spacer.spacer {
   width: 5px;
   height: 5px;
 }
diff --git a/themes/modern/navigator/navigatorBindings.xml b/themes/modern/navigator/navigatorBindings.xml
index 4b5a7b6a5d14..a844c0df14a4 100644
--- a/themes/modern/navigator/navigatorBindings.xml
+++ b/themes/modern/navigator/navigatorBindings.xml
@@ -9,9 +9,9 @@
   <binding id="nav-bar-inner">
     <content>
       <xul:vbox class="navbar-inner-groove-lft">
-        <xul:spring class="navbar-inner-groove-lft-top"/>
-        <xul:spring class="navbar-inner-groove-lft-mid" flex="1"/>
-        <xul:spring class="navbar-inner-groove-lft-btm"/>
+        <xul:spacer class="navbar-inner-groove-lft-top"/>
+        <xul:spacer class="navbar-inner-groove-lft-mid" flex="1"/>
+        <xul:spacer class="navbar-inner-groove-lft-btm"/>
       </xul:vbox>
       <xul:hbox flex="1" class="navbar-inner-border-outer">
         <xul:hbox flex="1" class="navbar-inner-border-middle">
@@ -21,9 +21,9 @@
         </xul:hbox>
       </xul:hbox>
       <xul:vbox class="navbar-inner-groove-rit">
-        <xul:spring class="navbar-inner-groove-rit-top"/>
-        <xul:spring class="navbar-inner-groove-rit-mid" flex="1"/>
-        <xul:spring class="navbar-inner-groove-rit-btm"/>
+        <xul:spacer class="navbar-inner-groove-rit-top"/>
+        <xul:spacer class="navbar-inner-groove-rit-mid" flex="1"/>
+        <xul:spacer class="navbar-inner-groove-rit-btm"/>
       </xul:vbox>
     </content>
   </binding>
@@ -31,21 +31,21 @@
   <binding id="urlbar-group">
     <content>
       <xul:vbox class="urlbar-lft">
-        <xul:spring class="urlbar-lft-top"/>
-        <xul:spring class="urlbar-lft-mid" flex="1"/>
-        <xul:spring class="urlbar-lft-btm"/>
+        <xul:spacer class="urlbar-lft-top"/>
+        <xul:spacer class="urlbar-lft-mid" flex="1"/>
+        <xul:spacer class="urlbar-lft-btm"/>
       </xul:vbox>
       <xul:vbox flex="1" class="urlbar-mid">
-        <xul:spring class="urlbar-mid-top"/>
+        <xul:spacer class="urlbar-mid-top"/>
         <xul:hbox class="urlbar-mid-mid" flex="1">
           <children/>
         </xul:hbox>
-        <xul:spring class="urlbar-mid-btm"/>
+        <xul:spacer class="urlbar-mid-btm"/>
       </xul:vbox>
       <xul:vbox class="urlbar-rit">
-        <xul:spring class="urlbar-rit-top"/>
-        <xul:spring class="urlbar-rit-mid" flex="1"/>
-        <xul:spring class="urlbar-rit-btm"/>
+        <xul:spacer class="urlbar-rit-top"/>
+        <xul:spacer class="urlbar-rit-mid" flex="1"/>
+        <xul:spacer class="urlbar-rit-btm"/>
       </xul:vbox>
     </content>
   </binding>
diff --git a/webshell/tests/viewer/samples/scrollbarTest1.xul b/webshell/tests/viewer/samples/scrollbarTest1.xul
index f83ca58fd919..6b94dcbb6d0d 100644
--- a/webshell/tests/viewer/samples/scrollbarTest1.xul
+++ b/webshell/tests/viewer/samples/scrollbarTest1.xul
@@ -11,7 +11,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
     <!-- scroll bar -->
 	<scrollbar orient="vertical"/>
 
-    <spring style="width: 10px"/>
+    <spacer style="width: 10px"/>
 
     <!-- scroll bar with NeXt button order-->
 	<scrollbar orient="vertical">
@@ -20,7 +20,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
 		<scrollbarbutton class="increment"/>
 	</scrollbar>
 
-    <spring style="width: 10px"/>
+    <spacer style="width: 10px"/>
 
     <!-- fixed thumb and different increments -->
     <scrollbar orient="vertical" curpos="50" pageIncrement="20" increment="5" flex="100%">
@@ -31,7 +31,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
 		<scrollbarbutton class="increment"/>
 	</scrollbar>
 
-    <spring style="width: 10px"/>
+    <spacer style="width: 10px"/>
 
    <!-- scrollbar with table in it -->
    <scrollbar orient="vertical" curpos="50" pageIncrement="20" increment="5" >
diff --git a/webshell/tests/viewer/samples/scrollbarTest2.xul b/webshell/tests/viewer/samples/scrollbarTest2.xul
index 190df227ed77..b3cec65f08e8 100644
--- a/webshell/tests/viewer/samples/scrollbarTest2.xul
+++ b/webshell/tests/viewer/samples/scrollbarTest2.xul
@@ -10,7 +10,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
    <scrollbar orient="vertical"/>
    <vbox flex="100%">
 	   <scrollbar orient="horizontal"/>
-	   <spring flex="100%" style="background-color: white"/>
+	   <spacer flex="100%" style="background-color: white"/>
 	   <scrollbar orient="horizontal"/>      
    </vbox>
    <scrollbar orient="vertical"/>
diff --git a/webshell/tests/viewer/samples/toolbarTest1.xul b/webshell/tests/viewer/samples/toolbarTest1.xul
index e10fa8c09267..dc1200f6abae 100644
--- a/webshell/tests/viewer/samples/toolbarTest1.xul
+++ b/webshell/tests/viewer/samples/toolbarTest1.xul
@@ -29,9 +29,9 @@
 	  <button id="print-button"   align="top" value="Print"/> 
 
           <vbox flex="100%">
-            <spring flex="100%"/>
+            <spacer flex="100%"/>
             <html:input id="urlbar" type="text"/>   
-	    <spring flex="100%"/>
+	    <spacer flex="100%"/>
           </vbox>
 
           <button src="resource:/res/throbber/anims00.gif" align="right"/>
@@ -41,7 +41,7 @@
     <toolbar>
       <button align="left" id="translate-button" value="Mozilla" />
       <button align="left" id="translate-button" value="ABC News"/>
-	  <spring flex="100%"/>
+	  <spacer flex="100%"/>
     </toolbar>
     
     <toolbar>
diff --git a/xpfe/browser/resources/content/metadata.xul b/xpfe/browser/resources/content/metadata.xul
index 56b5014181fd..3869fc04e9ff 100644
--- a/xpfe/browser/resources/content/metadata.xul
+++ b/xpfe/browser/resources/content/metadata.xul
@@ -74,7 +74,7 @@
           <hbox>
             <text id="link-url-text" value="" class="text-link" 
                   onclick="openLink(this)"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
           </hbox>
         </row>
         <row id="link-target">
@@ -113,7 +113,7 @@
           <hbox>
             <text id="image-url-text" value="" class="text-link" 
                   onclick="openLink(this)"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
           </hbox>
         </row>
         <row id="image-width">
@@ -135,7 +135,7 @@
           <hbox>
             <text id="image-desc-text" value="" class="text-link" 
                   onclick="openLink(this)"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
           </hbox>
         </row>
       </rows>
@@ -154,7 +154,7 @@
           <hbox>
             <text id="insdel-cite-text" value="" class="text-link" 
                   onclick="openLink(this)"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
           </hbox>
         </row>
         <row id="insdel-date">
@@ -177,7 +177,7 @@
           <hbox>
             <text id="quote-cite-text" value="" class="text-link" 
                   onclick="openLink(this)"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
           </hbox>
         </row>
       </rows>
@@ -209,6 +209,6 @@
     </grid>
   </groupbox>
 
-  <spring flex="1"/>
+  <spacer flex="1"/>
 
  </window>
diff --git a/xpfe/browser/resources/content/openLocation.xul b/xpfe/browser/resources/content/openLocation.xul
index e685be9aaf46..a35ef477e3c9 100644
--- a/xpfe/browser/resources/content/openLocation.xul
+++ b/xpfe/browser/resources/content/openLocation.xul
@@ -59,7 +59,7 @@
   <box>
     <box orient="vertical">
       <image class="question-icon"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </box>
     <separator orient="vertical" class="thin"/>
     <box orient="vertical" flex="1">
@@ -80,7 +80,7 @@
             <menuitem data="2" id="editWindow" value="&editNewWindow.label;"/>
           </menupopup>
         </menulist>
-        <spring flex="1"/>
+        <spacer flex="1"/>
       </box>
     </box>
   </box> 
diff --git a/xpfe/browser/resources/content/turboDialog.xul b/xpfe/browser/resources/content/turboDialog.xul
index 78ba96ec29a1..d4e27afad6e0 100644
--- a/xpfe/browser/resources/content/turboDialog.xul
+++ b/xpfe/browser/resources/content/turboDialog.xul
@@ -69,9 +69,9 @@
       <vbox flex="1" style="max-width: 36em;"/>
       <separator/>
       <hbox>
-        <spring flex="45%"/>
+        <spacer flex="45%"/>
         <image id="turboTrayImage"/>
-        <spring flex="55%"/>
+        <spacer flex="55%"/>
       </hbox>
       <separator class="thin"/>
       <separator class="thin"/>
@@ -86,9 +86,9 @@
   <separator class="thin"/>
   <separator class="thin"/>
   <hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button id="okButton" label="&okButton.label;" oncommand="window.close();" default="true"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox> 
 
 </window>
diff --git a/xpfe/browser/samples/dexopenchrome.xul b/xpfe/browser/samples/dexopenchrome.xul
index 9ffe949d1a37..a2ffcc036bef 100644
--- a/xpfe/browser/samples/dexopenchrome.xul
+++ b/xpfe/browser/samples/dexopenchrome.xul
@@ -77,39 +77,39 @@
       </row>
       <row>
         <checkbox id="resizable" label="resizable"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="scrollbars" label="scrollbars"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="alwaysRaised" label="raised"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="alwaysLowered" label="lowered"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="menubar" label="menubar"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="toolbar" label="toolbar"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="status" label="status"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="location" label="location"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="chrome" label="chrome"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="dialog" label="dialog"/>
@@ -117,25 +117,25 @@
       </row>
       <row>
         <checkbox id="modal" label="modal"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="dependent" label="dependent"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <checkbox id="centerscreen" label="centered"/>
-        <spring/>
+        <spacer/>
       </row>
     </rows>
   </grid>
 </vbox>
-<spring style="width: 8px"/>
+<spacer style="width: 8px"/>
 <vbox>
   <hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <text value="Open"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
   <grid>
     <columns><column/><column/></columns>
diff --git a/xpfe/browser/samples/hidetoolicon.xul b/xpfe/browser/samples/hidetoolicon.xul
index 70b44e140818..f51eaf48a003 100644
--- a/xpfe/browser/samples/hidetoolicon.xul
+++ b/xpfe/browser/samples/hidetoolicon.xul
@@ -30,7 +30,7 @@
 		<toolbar>
 			<html:input type="BUTTON" value="Button 1" id="ButtonOne"/>
 			<html:input type="BUTTON" value="Button 2" id="ButtonTwo"/>
-			<spring flex="1"/>
+			<spacer flex="1"/>
 		</toolbar>
 	</toolbox>
 
diff --git a/xpfe/browser/samples/tab.xul b/xpfe/browser/samples/tab.xul
index c277c541cf12..0cfd6303e277 100644
--- a/xpfe/browser/samples/tab.xul
+++ b/xpfe/browser/samples/tab.xul
@@ -16,21 +16,21 @@ xmlns:html="http://www.w3.org/1999/xhtml"
       <tab label="native"/>
       <tab label="iframe"/>
       <tab label="dialog"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
      </tabs>
    
     <tabpanels flex="100%" style="border: 2px outset gray">
 
        <!-- tab 1 -->
        <hbox>
-         <spring flex="100%"/> 
+         <spacer flex="100%"/> 
          <vbox> 
-          <spring flex="100%"/> 
+          <spacer flex="100%"/> 
                 <button class="push" label="centered"/>
           <!--html:button>This is a test</html:button-->
-          <spring flex="100%"/> 
+          <spacer flex="100%"/> 
          </vbox> 
-         <spring flex="100%"/> 
+         <spacer flex="100%"/> 
       </hbox> 
 
       <!-- tab2 -->
@@ -57,7 +57,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
           <button src="resource:/res/toolbar/home.gif" align="bottom" label="Home"/>
           <button src="resource:/res/toolbar/print.gif" align="bottom" label="Print"/> 
         
-                  <spring flex="100%"/>
+                  <spacer flex="100%"/>
 
             <button src="resource:/res/throbber/anims00.gif"/>
     
@@ -89,7 +89,7 @@ xmlns:html="http://www.w3.org/1999/xhtml"
         <vbox flex="100%">
           <hbox style="margin: 10px; margin-top: 0; margin-bottom: 0; background-color: #8080c0; color: white">
              <html:div><html:B>Navigator</html:B></html:div>
-               <spring flex="100%"/>
+               <spacer flex="100%"/>
              <html:div>Specify you preferences for browsing the web</html:div>
           </hbox>
 
@@ -106,9 +106,9 @@ xmlns:html="http://www.w3.org/1999/xhtml"
               <html:input type="text" flex="100%"/>
              </hbox>
                <hbox>
-              <spring flex="100%"/>
+              <spacer flex="100%"/>
               <html:input disabled="true" type="button" value="Use current page"/>
-              <spring style="width:10px"/>
+              <spacer style="width:10px"/>
               <html:input type="button" value="Browse"/>
              </hbox>
           </vbox>
@@ -117,27 +117,27 @@ xmlns:html="http://www.w3.org/1999/xhtml"
              <html:div>History is a list a pages you have previously visited.</html:div>
                <hbox>
                <html:div>Pages in history expire in: <html:input type="text" value="9"/> days. </html:div>
-               <spring flex="100%"/>
+               <spacer flex="100%"/>
                <html:input type="button" value="Clear History"/>
              </hbox>
             <hbox>
                <html:div>Clear the list of sites on the location bar.</html:div>
-               <spring flex="100%"/>
+               <spacer flex="100%"/>
                <html:input type="button" value="Clear Location Bar"/>
              </hbox>
           </vbox>
 
-          <spring flex="100%"/>
+          <spacer flex="100%"/>
 
         </vbox>
         
       </hbox>
         <hbox style="margin: 5px;">
-           <spring flex="100%"/>
+           <spacer flex="100%"/>
            <html:input type="button" value="Ok"/>
-           <spring style="width:10px"/>
+           <spacer style="width:10px"/>
            <html:input type="button" value="Cancel"/>
-           <spring style="width:10px"/>
+           <spacer style="width:10px"/>
            <html:input type="button" value="Help"/>
          </hbox>
     </vbox>
diff --git a/xpfe/browser/samples/widgets.xul b/xpfe/browser/samples/widgets.xul
index 5d68651ebb51..dee1fad016db 100644
--- a/xpfe/browser/samples/widgets.xul
+++ b/xpfe/browser/samples/widgets.xul
@@ -114,7 +114,7 @@
       <vbox align="center">
         <hbox flex="1">
           <checkbox label="Checkbox 1" id="checkbox1"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button label="Test Property APIs" oncommand="testProperty('checkbox1');"/>
         </hbox>
         <checkbox label="Checkbox 2" disabled="true" checked="true"/>
@@ -124,7 +124,7 @@
       <radiogroup id="group" orient="vertical">
         <hbox>
           <radio group="group" label="Radio 1" id="radio1"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button label="Test Property APIs" oncommand="testProperty('radio1');"/>
         </hbox>
         <radio group="group" label="Radio 2"/>
@@ -147,19 +147,19 @@
   <hbox>
     <vbox>
       <text class="label" value="Foo Label 6:"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox>
     <textbox id="textarea" rows="3" multiline="true" value="Regular multiline textbox"/>
     <vbox>
       <button label="Test Property APIs" oncommand="testProperty('textarea');"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox>
   </hbox>
   
   <hbox>
     <vbox>
       <text class="label" value="Foo Label 6:"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox>
     <textbox rows="3" multiline="true" disabled="true" value="Disabled multiline textbox"/>
   </hbox>
diff --git a/xpfe/browser/samples/xpmenu.xul b/xpfe/browser/samples/xpmenu.xul
index b1f1d35185ed..fff54d7739f0 100644
--- a/xpfe/browser/samples/xpmenu.xul
+++ b/xpfe/browser/samples/xpmenu.xul
@@ -34,7 +34,7 @@ Contributor(s): ______________________________________. -->
     <menu label="New" accesskey="n" key="newKey">
       <button class="menu-left"/> 
       <html:div><html:u>N</html:u>ew </html:div> 
-        <spring flex="100%"/> 
+        <spacer flex="100%"/> 
         <html:div>Ctrl+N</html:div>
       <button class="menu-right"/> 
       <menupopup>
@@ -45,34 +45,34 @@ Contributor(s): ______________________________________. -->
       <menuitem>
       <button class="menu-left"/> 
       <html:div><html:u>O</html:u>pen...</html:div> 
-        <spring flex="100%"/> 
+        <spacer flex="100%"/> 
         <html:div>Ctrl+O</html:div>
           <button class="menu-right"/>
       </menuitem> 
       <menuitem>
           <button class="menu-left"/> 
         <html:div><html:u>C</html:u>lose</html:div>
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
         <button class="menu-right"/>
       </menuitem> 
       <menuseparator/>
       <menuitem disabled="true"> 
           <button class="menu-left"/> 
         <html:div><html:u>S</html:u>ave</html:div>
-          <spring flex="100%"/> 
+          <spacer flex="100%"/> 
           <html:div>Ctrl+S</html:div>
         <button class="menu-right"/>  
       </menuitem> 
       <menuitem> 
           <button class="menu-left"/> 
         <html:div>S<html:u>a</html:u>ve as...</html:div>
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
         <button class="menu-right"/>  
       </menuitem> 
       <menuitem>
           <button class="menu-left"/> 
         <html:div><html:u>Q</html:u>uit</html:div>
-        <spring flex="100%"/> 
+        <spacer flex="100%"/> 
           <html:div>Ctrl+Q</html:div>
         <button class="menu-right"/>  
       </menuitem> 
@@ -127,7 +127,7 @@ Contributor(s): ______________________________________. -->
       <menuitem><html:div>Sample Item</html:div></menuitem>
     </menupopup>
     </menu>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     </menubar>
   </toolbox>
 
diff --git a/xpfe/browser/src/navigator-test1.xul b/xpfe/browser/src/navigator-test1.xul
index d45469d70a46..a45486a281e4 100644
--- a/xpfe/browser/src/navigator-test1.xul
+++ b/xpfe/browser/src/navigator-test1.xul
@@ -543,10 +543,10 @@
   <vbox id="outer-box">
   <hbox style="margin: 5px;">
   <vbox flex="100%">
-  <spring flex="100%"/>
+  <spacer flex="100%"/>
   <html:input id="urlbar" type="text" style="min-width: 100px; min-height: 25px"
     onkeyup="if (event.keyCode == 13) { BrowserLoadURL(); }"/>   
-  <spring flex="100%"/>
+  <spacer flex="100%"/>
   </vbox>
   <button id="Throbber" onclick="window.frames[0].home()">
      <observes element="Browser:Throbber" attribute="busy"/>
@@ -588,7 +588,7 @@
       onclick="BrowserHome()"/>
     <button id="netscape-button" align="bottom" label="Netscape" 
       onclick="window.frames[0].location.href='http://my.netscape.com'"/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
   </toolbar>
   </toolbox>
   
@@ -726,19 +726,19 @@
 
   <hbox id="security-box" class="insecure" flex="100%">
     <vbox style="width:100px">
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
       <progressmeter id="statusbar-icon" mode="normal" value="0" onclick="dumpProgress()">
         <observes element="Browser:LoadingProgress" attribute="mode"/>
         <observes element="Browser:Throbber" attribute="busy" onbroadcast="onProgress()"/>
       </progressmeter>
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
     </vbox>
 
     <button id="statusText" align="right" flex="1%" label="Document: Done" style="font-family:sans-serif;font-size:2.5mm">
              <observes element="Browser:Status" attribute="label" onbroadcast="onStatus()"/>      
     </button>
 
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
 
     <button align="right" label="Build ID: 99032911" style="font-family:sans-serif;font-size:2.5mm">
     </button>
@@ -754,13 +754,13 @@
            <button align="left" class="popup"  label="Mail" />
            <button align="left" class="popup"  label="Chat" />
       </hbox>
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
       <hbox>
         <button align="left"  class="popup"  label="DayPlanner" />
         <button align="left"  class="popup"  label="Shopping" />
         <button align="left"  class="popup"  label="My Desk" />
           </hbox>
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
         <hbox>
         <button align="left" class="popup" label="Open Windows" />
         <button align="left" id="mini-nav" label="" />
diff --git a/xpfe/communicator/resources/content/dialogBindings.xml b/xpfe/communicator/resources/content/dialogBindings.xml
index 8188142511b2..678554e60b22 100644
--- a/xpfe/communicator/resources/content/dialogBindings.xml
+++ b/xpfe/communicator/resources/content/dialogBindings.xml
@@ -9,7 +9,7 @@
     <content>
       <xul:box class="box-smallheader-box toolbar-primary" align="center" flex="1">
         <xul:text class="box-smallheader-left" inherits="value=title"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="box-smallheader-right" inherits="value=description"/>
       </xul:box>
     </content>
@@ -30,7 +30,7 @@
         <xul:box align="center" class="box-header-text-box">
           <xul:text class="box-header-text" inherits="value"/>
         </xul:box>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
       </xul:box>
     </content>
   </binding>
@@ -39,7 +39,7 @@
     <content>
       <xul:box class="box-status-bg toolbar-standard" flex="1">
         <xul:text class="box-status-text" inherits="label"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="box-status-progress" inherits="value=progress"/>
       </xul:box>  
     </content>
diff --git a/xpfe/communicator/resources/content/taskbarOverlay.xul b/xpfe/communicator/resources/content/taskbarOverlay.xul
index 55c6498fdb17..44d4705b2a60 100644
--- a/xpfe/communicator/resources/content/taskbarOverlay.xul
+++ b/xpfe/communicator/resources/content/taskbarOverlay.xul
@@ -15,7 +15,7 @@
         ref="chrome://communicator-region/locale/taskbar.rdf#root" 
         containment="http://home.netscape.com/NC-rdf#entry http://home.netscape.com/NC-rdf#child">
        
-   <spring flex="1"/>
+   <spacer flex="1"/>
    
    <template>
       <!-- Rules for content hanging _directly_ off the toolbar -->
@@ -26,7 +26,7 @@
                     label="rdf:http://home.netscape.com/NC-rdf#title">
           <menupopup popupalign="bottomleft" popupanchor="topleft"/>
         </menubutton>
-        <spring uri="rdf:*" class="taskbarspacer" flex="1"/>
+        <spacer uri="rdf:*" class="taskbarspacer" flex="1"/>
       </rule>
       
       <rule parent="box">
@@ -68,7 +68,7 @@
       </rule>
 
     </template>
-    <spring class="taskbarspacer" flex="9"/>
+    <spacer class="taskbarspacer" flex="9"/>
   </hbox>
     
   <hbox id="taskbarGotoMenuBox" flex="1">
@@ -87,7 +87,7 @@
     </menubutton>
   
     <!-- spacer to accommodate mac resize box -->
-    <spring id="resizer" style="width: 20px;"/>
+    <spacer id="resizer" style="width: 20px;"/>
   </hbox>
 
 </overlay>
diff --git a/xpfe/communicator/resources/content/tasksOverlay.xul b/xpfe/communicator/resources/content/tasksOverlay.xul
index 7ba170369bd7..1482ae73ae51 100644
--- a/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/xpfe/communicator/resources/content/tasksOverlay.xul
@@ -77,7 +77,7 @@
               tooltip="aTooltip" tooltiptext="&taskComposer.tooltip;"/>
     </hbox>
    
-    <spring id="taskbar-middle-spacer" flex="10"/>
+    <spacer id="taskbar-middle-spacer" flex="10"/>
     
     <hbox id="taskbarMenuBox"/>
     
@@ -89,7 +89,7 @@
   
     
  
-    <spring id="taskbar-right-spacer" flex="7"/>
+    <spacer id="taskbar-right-spacer" flex="7"/>
     
   
   </hbox>
diff --git a/xpfe/communicator/resources/content/utilityOverlay.xul b/xpfe/communicator/resources/content/utilityOverlay.xul
index cccc6164e610..6e02a5b99862 100644
--- a/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -254,26 +254,26 @@
   <!-- XXX needs xbl-ification! gray horizontal splitter -->
   <splitter id="gray_horizontal_splitter" class="gray-horizontal-splitter">
     <hbox id="begincap">
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
     </hbox>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <grippy/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <hbox id="endcap">
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
     </hbox>
  </splitter>
 
   <!-- XXX needs xbl-ification! gray vertical splitter -->
   <splitter id="gray_vertical_splitter" class="gray-vertical-splitter">
     <vbox id="begincap">
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
     </vbox>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <grippy/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <vbox id="endcap">
-      <spring flex="100%"/>
+      <spacer flex="100%"/>
     </vbox>
  </splitter>
 
diff --git a/xpfe/components/bookmarks/resources/addBookmark.xul b/xpfe/components/bookmarks/resources/addBookmark.xul
index 805dddab08a7..e64c239f4ac5 100644
--- a/xpfe/components/bookmarks/resources/addBookmark.xul
+++ b/xpfe/components/bookmarks/resources/addBookmark.xul
@@ -68,17 +68,17 @@
       <row align="center">
         <text class="label" value="&name.label;" accesskey="&name.accesskey;" for="name"/>
         <textbox id="name"/>
-        <spring/>
+        <spacer/>
       </row>
       <row>
         <separator class="thin"/>
         <separator class="thin"/>
-        <spring/>
+        <spacer/>
       </row>
       <row align="center">
         <text class="label" value="&url.label;" accesskey="&url.accesskey;" for="url"/>
         <textbox id="url" oninput="onLocationInput();"/>
-        <spring/>
+        <spacer/>
       </row>
     </rows>
   </grid>
diff --git a/xpfe/components/bookmarks/resources/bm-panel.xul b/xpfe/components/bookmarks/resources/bm-panel.xul
index c40b4ca92c8b..a41c7348a350 100644
--- a/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -80,7 +80,7 @@
             oncommand="gBookmarksShell.addBookmark();"/>
     <button class="button-toolbar" label="&command.manageBookmarks.label;"
             oncommand="gBookmarksShell.manageBookmarks();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <toolbarseparator/>
     <button class="button-toolbar" label="&command.findBookmarks.label;"
             oncommand="gBookmarksShell.findInBookmarks();"/>
diff --git a/xpfe/components/bookmarks/resources/bm-props.xul b/xpfe/components/bookmarks/resources/bm-props.xul
index 298628779cb6..134460f888fd 100644
--- a/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/xpfe/components/bookmarks/resources/bm-props.xul
@@ -103,7 +103,7 @@
         </hbox>
         <separator class="thin"/>
         <hbox class="box-padded">
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <groupbox orient="vertical">
             <caption class="label" label="&checkforupdates.legend.label;"/>
             <grid flex="1">
@@ -209,7 +209,7 @@
             </grid>
             <separator class="thin"/>
           </groupbox>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </hbox>
       </vbox>
           
@@ -222,7 +222,7 @@
         </hbox>
         <separator class="thin"/>
         <hbox class="box-padded">
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <groupbox>
             <caption label="&notifications.legend.label;" />
             <vbox align="start">
@@ -232,7 +232,7 @@
               <checkbox id="playSound" label="&notification.sound.label;" />
             </vbox>
           </groupbox>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </hbox>
       </vbox>
     </tabpanels>
diff --git a/xpfe/components/console/resources/content/consoleBindings.xml b/xpfe/components/console/resources/content/consoleBindings.xml
index 6b5726128890..0abde4b4e879 100644
--- a/xpfe/components/console/resources/content/consoleBindings.xml
+++ b/xpfe/components/console/resources/content/consoleBindings.xml
@@ -355,7 +355,7 @@
           <xul:box class="console-row-file" inherits="hidden=hideSource">
             <xul:text class="label" value="&errFile.label;"/>
             <xul:box class="console-error-source" inherits="url"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
             <xul:text class="label" value="&errLine.label;"/>
             <xul:text class="label" inherits="value=line" flex="1"/>
           </xul:box>
@@ -364,7 +364,7 @@
             <xul:box inherits="hidden=hideCaret">
               <xul:text class="monospace console-dots" inherits="value=errorDots"/>
               <xul:text class="monospace console-caret" inherits="value=errorCaret"/>
-              <xul:spring flex="1"/>
+              <xul:spacer flex="1"/>
             </xul:box>
           </xul:vbox>
         </xul:vbox>
diff --git a/xpfe/components/find/resources/finddialog.xul b/xpfe/components/find/resources/finddialog.xul
index bdff59cb2ab7..dd78143e1dfa 100644
--- a/xpfe/components/find/resources/finddialog.xul
+++ b/xpfe/components/find/resources/finddialog.xul
@@ -63,7 +63,7 @@ Contributor(s):
         </hbox>
       </row>
       <row>
-        <spring/>
+        <spacer/>
         <vbox>
           <checkbox id="dialog.caseSensitive" label="&caseSensitiveCheckbox.label;"/>
           <checkbox id="dialog.wrap" label="&wrapCheckbox.label;"/>
diff --git a/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul b/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
index 7d2fbfd022f2..c089aca6157b 100644
--- a/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
+++ b/xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
@@ -32,7 +32,7 @@ Contributor(s): ______________________________________. -->
     <groupbox orient="vertical">
       <caption label="&fontScaling;"/>
       <html:div>&fontScalingIntro;</html:div>
-      <spring style="height: 10px;"/>
+      <spacer style="height: 10px;"/>
       <html:div>
         <html:label for="browserScreenResolution">&resolution;</html:label>
         <html:input type="text" id="browserScreenResolution" pref="true" preftype="int"
diff --git a/xpfe/components/prefwindow/resources/content/pref-applications-new.xul b/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
index ae3a9594cb10..4df88933df66 100644
--- a/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-applications-new.xul
@@ -71,9 +71,9 @@
         
       </row>
       <row>
-        <spring/>
+        <spacer/>
         <hbox>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button label="&browse.label;" accesskey="&browse.accesskey;" 
                   oncommand="chooseApp();"/>
         </hbox>
diff --git a/xpfe/components/prefwindow/resources/content/pref-charset.xul b/xpfe/components/prefwindow/resources/content/pref-charset.xul
index e40568a15cbd..316fcb4ef1e2 100644
--- a/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-charset.xul
@@ -83,12 +83,12 @@
       </hbox>
     </vbox> 
     <vbox>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button id="up_button" class="up small" disabled="true"
               oncommand="MoveUp();"/>
       <button id="down_button" class="down small" disabled="true"
               oncommand="MoveDown();"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox>
   </hbox>
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-colors.xul b/xpfe/components/prefwindow/resources/content/pref-colors.xul
index b1d3ad733211..900eeb0691bf 100644
--- a/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -49,13 +49,13 @@
       <caption label="&color;"/>
       <hbox>
         <text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="foregroundtextmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="foregroundText" pref="true" preftype="color" prefstring="browser.display.foreground_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
       <hbox style="margin-top: 5px">
         <text class="label" value="&backgroundColor.label;" accesskey="&backgroundColor.accesskey;" for="backgroundmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="backgroundmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="background" pref="true" preftype="color" prefstring="browser.display.background_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
@@ -70,13 +70,13 @@
       <caption label="&links;"/>
       <hbox>
         <text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="unvisitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="unvisitedLinks" pref="true" preftype="string" prefstring="browser.anchor_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
       <hbox style="margin-top: 5px">
         <text class="label" value="&visitedLinkColor.label;" accesskey="&visitedLinkColor.accesskey;" for="visitedlinkmenu"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <colorpicker type="button" id="visitedlinkmenu" palettename="standard" onchange="setColorWell(this)"/> 
         <data id="visitedLinks" pref="true" preftype="string" prefstring="browser.visited_color" prefattribute="value" wsm_attributes="value"/>
       </hbox>
diff --git a/xpfe/components/prefwindow/resources/content/pref-download.xul b/xpfe/components/prefwindow/resources/content/pref-download.xul
index 7c6aec3f0b60..b31bf6de9e11 100644
--- a/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -137,7 +137,7 @@
         <button class="dialog push" label="&select;" align="left"/>
       </html:div>
     </vbox>
-    <spring style="height: 30px;"/>
+    <spacer style="height: 30px;"/>
   </html:fieldset>
 
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index 4c8bc02ba949..c87741b7843d 100644
--- a/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -151,7 +151,7 @@
           <menulist id="serif" class="small-margin" flex="1" style="width: 0px;">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
@@ -163,7 +163,7 @@
           <menulist id="sans-serif" class="small-margin" flex="1" style="width: 0px;">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
@@ -175,7 +175,7 @@
           <menulist id="cursive" class="small-margin">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
@@ -187,7 +187,7 @@
           <menulist id="fantasy" class="small-margin">
             <menupopup/>
           </menulist>
-          <spring/>
+          <spacer/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
diff --git a/xpfe/components/prefwindow/resources/content/pref-history.xul b/xpfe/components/prefwindow/resources/content/pref-history.xul
index b64386946e3b..748115d3b8de 100644
--- a/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-history.xul
@@ -113,7 +113,7 @@
                  pref="true" preftype="int" prefstring="browser.history_expire_days"
                  prefattribute="value"/>
       <text class="label" value="&days.label;"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button class="dialog" label="&clearHistory.label;" accesskey="&clearHistory.accesskey;"
         oncommand="prefClearGlobalHistory();"
         id="browserClearHistory" pref="true" preftype="bool"
@@ -145,7 +145,7 @@
       <textbox id="shistMax" size="3" wsm_persist="true"
                   pref="true" preftype="int" prefstring="browser.sessionhistory.max_entries"
                   prefattribute="value"/>      
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
   </groupbox>  
 
diff --git a/xpfe/components/prefwindow/resources/content/pref-languages.xul b/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 7c0459e32efe..924574c92984 100644
--- a/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -75,7 +75,7 @@
                 accesskey="&languages.customize.moveDown.accesskey;"
                 pref="true" preftype="bool"
                 prefstring="pref.browser.language.disable_button.down" prefattribute="disabled"/>
-        <spring flex="1"/>
+        <spacer flex="1"/>
         <button class="dialog" id="add"
                 label="&languages.customize.addButton.label;"
                 oncommand="AddLanguage();"
diff --git a/xpfe/components/prefwindow/resources/content/pref-policies.xul b/xpfe/components/prefwindow/resources/content/pref-policies.xul
index 414a9cd7d4da..27965522a92c 100644
--- a/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-policies.xul
@@ -71,7 +71,7 @@
       <vbox>
         <button class="dialog" label="&addSite.label;" accesskey="&addSite.accesskey;"
                 oncommand="addSite();"/>
-        <spring flex="1"/>              
+        <spacer flex="1"/>              
       </vbox>    
     </hbox>
     
diff --git a/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul b/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
index 111b49b12fb5..7c0ccf5da869 100644
--- a/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
@@ -52,7 +52,7 @@
 		</html:div>
 		<html:input name="ftpproxy" type="text" id="networkProxyHTTP"
                 pref="true" preftype="string" prefstring="network.proxy.http" size="30"/>
-		<spring flex="100%"/>
+		<spacer flex="100%"/>
 		<html:div>
 		&port.label;
 		</html:div>
@@ -65,7 +65,7 @@
 		</html:div>
 		<html:input name="gopherproxy" type="text" id="networkProxyGopher"
                 pref="true" preftype="string" prefstring="network.proxy.gopher" size="30"/>
-		<spring flex="100%"/>
+		<spacer flex="100%"/>
 		<html:div>
 		&port.label;
 		</html:div>
@@ -78,7 +78,7 @@
 		</html:div>
 		<html:input name="httpproxy" type="text" id="networkProxyHTTP"
                 pref="true" preftype="string" prefstring="network.proxy.http" size="30"/>
-		<spring flex="100%"/>
+		<spacer flex="100%"/>
 		<html:div>
 		&port.label;
 		</html:div>
@@ -91,7 +91,7 @@
 		</html:div>
 		<html:input name="waisproxy" type="text" id="networkProxyWAIS"
                 pref="true" preftype="string" prefstring="network.proxy.wais" size="30"/>
-		<spring flex="100%"/>
+		<spacer flex="100%"/>
 		<html:div>
 		&port.label;
 		</html:div>
@@ -116,7 +116,7 @@
 		</html:div>
 		<html:input name="sockshost" type="text" id="networkSocksHost"
                 pref="true" preftype="string" prefstring="network.socks.host" size="30"/>
-		<spring flex="100%"/>
+		<spacer flex="100%"/>
 		<html:div>
 		&port.label;
 		</html:div>
diff --git a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index 8540f7145821..06a6c65a19b3 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -110,7 +110,7 @@
       <checkbox class="small-margin" id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
                 pref="true" preftype="bool" prefstring="keyword.enabled"
                 prefattribute="checked"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button class="small-margin" label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"
         id="moreInformationButton" pref="true" preftype="bool"
         prefstring="pref.browser.smartbrowsing.disable_button.more_info" prefattribute="disabled"/>
@@ -125,7 +125,7 @@
         <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
                   pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
                   prefattribute="checked"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button label="&autoCompleteAdvanced.label;" oncommand="showACAdvanced()"/>
       <data id="browserUrlbarAutoFill" pref="true" preftype="bool" prefattribute="value"
             prefstring="browser.urlbar.autoFill"/>"
diff --git a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index afb5362f6096..f7bcce11ad7f 100644
--- a/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -63,13 +63,13 @@
           </treeitem>
         </treechildren>
       </tree>
-      <spring flex="5%"/>
+      <spacer flex="5%"/>
       <vbox>
         <button class="dialog push" id="pref:0:bool:smartupdate" label="&uninstallButton.label;" accesskey="&uninstallButton.accesskey;"/>
-        <spring flex="100%"/>
+        <spacer flex="100%"/>
       </vbox>
     </hbox>
-    <spring style="height: 28px;"/>
+    <spacer style="height: 28px;"/>
   </html:fieldset>
 -->
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
index bdfe8fad20d1..18161f5080f3 100644
--- a/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@@ -143,7 +143,7 @@
     <hbox align="center">
         <checkbox id="showDialog" label="&showDialog.label;" accesskey="&showDialog.accesskey;"/>     
     </hbox>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     
 </window>
 
diff --git a/xpfe/components/search/resources/findresults.xul b/xpfe/components/search/resources/findresults.xul
index ce3d82886682..e810303b0aa8 100644
--- a/xpfe/components/search/resources/findresults.xul
+++ b/xpfe/components/search/resources/findresults.xul
@@ -68,7 +68,7 @@
 
     <treechildren open="true" flex="1"/>
   </tree>
-  <spring flex="100%" orient="horizontal" />
+  <spacer flex="100%" orient="horizontal" />
 
 <!--
 This extra "status" bar is necessary because the bottom right corner of the window on MacOS is
diff --git a/xpfe/components/search/resources/internet.xul b/xpfe/components/search/resources/internet.xul
index 4c169e35e02f..c2a0bcf1f6b6 100644
--- a/xpfe/components/search/resources/internet.xul
+++ b/xpfe/components/search/resources/internet.xul
@@ -13,7 +13,7 @@
   <script type="application/x-javascript" src="chrome://communicator/content/search/shared.js" />
 
   <hbox>
-    <spring flex="100%" />
+    <spacer flex="100%" />
 
     <html>&search.label;</html>
 
@@ -40,11 +40,11 @@
     <textfield id="searchtext" size="20" onkeypress="if (event.keyCode == 13) { doSearch(); }" />
     <button id="searchbutton" oncommand="return doSearch();" label="&search.button.label;"/>
     <button id="stopbutton" oncommand="return doStop();" style="display: none;" label="&stop.button.label;"/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
   </hbox>
 
   <hbox style="height: 85%; width: 100%;" flex="1" >
-    <spring flex="50%" />
+    <spacer flex="50%" />
     <tree orient="horizontal" id="searchengines" border="1" flex="1" datasources="rdf:internetsearch" ref="NC:SearchEngineRoot">
       <treecolgroup>
         <treecol id="CheckboxColumn" flex="1"/>
@@ -78,14 +78,14 @@
         </treerow>
       </treehead>
     </tree>
-    <spring flex="50%" />
+    <spacer flex="50%" />
   </hbox>
 
   <hbox style="width: 100%;" >
-    <spring flex="100%" />
+    <spacer flex="100%" />
     <button oncommand="doCheckAll(true);" label="&checkall.button.label;"/>
     <button oncommand="doCheckAll(false);" label="&uncheckall.button.label;"/> 
     <button id="SaveSearch" disabled="true" oncommand="saveSearch();" label="&savesearch.button.label;"/>
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
   </hbox>
 </window>
diff --git a/xpfe/components/search/resources/search-editor.xul b/xpfe/components/search/resources/search-editor.xul
index e82a5040af45..91f4d6e68fd2 100644
--- a/xpfe/components/search/resources/search-editor.xul
+++ b/xpfe/components/search/resources/search-editor.xul
@@ -136,10 +136,10 @@
           
         </tree>
         <vbox>
-          <spring flex="1"/>
+          <spacer flex="1"/>
           <button class="up" oncommand="MoveUp();" id="up" disabled="true"/>
           <button class="down" oncommand="MoveDown();" id="down" disabled="true"/>
-          <spring flex="1"/>
+          <spacer flex="1"/>
         </vbox>
       </hbox>          
       <hbox>
diff --git a/xpfe/components/search/resources/search-panel.xul b/xpfe/components/search/resources/search-panel.xul
index 51542ec14d14..a5a56a82bd44 100644
--- a/xpfe/components/search/resources/search-panel.xul
+++ b/xpfe/components/search/resources/search-panel.xul
@@ -166,10 +166,10 @@
         </tree>
       
         <hbox>
-          <spring flex="1" />
+          <spacer flex="1" />
           <button class="button-slimline" id="saveQueryButton"
                   label="&savesearch.button.label;" oncommand="return saveSearch();"/>
-          <spring flex="1" />
+          <spacer flex="1" />
         </hbox>
       </vbox>
     
diff --git a/xpfe/components/sidebar/resources/customize.xul b/xpfe/components/sidebar/resources/customize.xul
index 6252616cbe13..6ae5db7007ce 100644
--- a/xpfe/components/sidebar/resources/customize.xul
+++ b/xpfe/components/sidebar/resources/customize.xul
@@ -168,12 +168,12 @@
 
     <!-- The 'reorder' buttons -->
     <vbox id="reorder">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button oncommand="MoveUp();" id="up" class="dialog" 
         label="&sidebar.customize.up.label;"/>
       <button oncommand="MoveDown();" id="down" class="dialog"
         label="&sidebar.customize.down.label;"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </vbox> 
 
   </hbox>
@@ -182,7 +182,7 @@
   
   <hbox>
     <button id="more-panels-link" label="&sidebar.more.label;" oncommand="BrowseMorePanels()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <hbox id="okCancelButtonsRight" />
   </hbox>
 
diff --git a/xpfe/components/sidebar/resources/sidebarBindings.xml b/xpfe/components/sidebar/resources/sidebarBindings.xml
index 42660c5f9b21..bbc47c35d55d 100644
--- a/xpfe/components/sidebar/resources/sidebarBindings.xml
+++ b/xpfe/components/sidebar/resources/sidebarBindings.xml
@@ -9,12 +9,12 @@
     <content>
       <xul:image class="box-texttab-left"/>
       <xul:vbox class="box-texttab-text-container" inherits="value" flex="1">
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="box-texttab-text" inherits="value=label" crop="right"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
       </xul:vbox>
       <xul:image class="box-texttab-right"/>
-      <xul:spring class="box-texttab-right-space"/>
+      <xul:spacer class="box-texttab-right-space"/>
     </content>
   </binding>
 
diff --git a/xpfe/components/sidebar/resources/sidebarOverlay.xul b/xpfe/components/sidebar/resources/sidebarOverlay.xul
index 975b74717890..49ef44d3de40 100644
--- a/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -53,9 +53,9 @@
   <vbox id="sidebar-box" persist="hidden width collapsed">
     <splitter id="sidebar-panels-splitter" collapse="after" persist="state"
       onmouseup="PersistHeight();" hidden="true">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <grippy/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </splitter>
 
     <vbox id="sidebar-panels-splitter-box" flex="1" 
@@ -139,7 +139,7 @@
                     <button label="&sidebar.loading.stop.label;" hidden="true"
                       onclick="SidebarStopPanelLoad(this.parentNode.parentNode.parentNode.previousSibling);"/>
                   </hbox>
-                  <spring flex="100%"/>
+                  <spacer flex="100%"/>
                 </vbox>
                 <iframe class="iframe-panel" flex="1*" src="about:blank"
                   hidden="true" collapsed="true" content="?content"/>
diff --git a/xpfe/components/ucth/resources/helperAppDldProgress.xul b/xpfe/components/ucth/resources/helperAppDldProgress.xul
index 172cb6d7d701..927b0105a7e2 100644
--- a/xpfe/components/ucth/resources/helperAppDldProgress.xul
+++ b/xpfe/components/ucth/resources/helperAppDldProgress.xul
@@ -126,7 +126,7 @@ Contributor(s):
         <button class="dialog" id="pause"  label="&pauseButtonText;"  oncommand="doPauseButton()"/>
         <button class="dialog" id="resume" label="&resumeButtonText;" oncommand="doPauseButton()"/>
       </deck>
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button class="dialog" id="open" label="&open.label;" disabled="true" oncommand="doOpen()"/>
       <button class="dialog" id="openFolder" label="&openFolder.label;" disabled="true" oncommand="doOpenFolder()"/>      
     </hbox>
diff --git a/xpfe/components/ucth/resources/helperAppLauncher.xul b/xpfe/components/ucth/resources/helperAppLauncher.xul
index b0e3ee52aaa1..e9765f6510e1 100644
--- a/xpfe/components/ucth/resources/helperAppLauncher.xul
+++ b/xpfe/components/ucth/resources/helperAppLauncher.xul
@@ -55,7 +55,7 @@
     <hbox>
         <vbox>
             <image class="question-icon"/>
-            <spring flex="1"/>
+            <spacer flex="1"/>
         </vbox>
         <separator orient="vertical" class="thin"/>
         <vbox flex="1">
diff --git a/xpfe/components/ucth/resources/unknownContent.xul b/xpfe/components/ucth/resources/unknownContent.xul
index f7a3ad5ad335..56efddd48782 100644
--- a/xpfe/components/ucth/resources/unknownContent.xul
+++ b/xpfe/components/ucth/resources/unknownContent.xul
@@ -38,7 +38,7 @@
     
   <hbox align="center">
     <button class="dialog" id="dialog.more" label="&dialogMore.label;" oncommand="more()"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <hbox id="okCancelButtons"/>
   </hbox>
 
diff --git a/xpfe/components/xfer/resources/downloadProgress.xul b/xpfe/components/xfer/resources/downloadProgress.xul
index 7402aea2454c..b3f4be50b89a 100644
--- a/xpfe/components/xfer/resources/downloadProgress.xul
+++ b/xpfe/components/xfer/resources/downloadProgress.xul
@@ -103,7 +103,7 @@ Contributor(s):
         </row>
         <separator class="thin"/>
         <row>
-          <spring/>
+          <spacer/>
           <progressmeter id="dialog.progress" mode="normal" value="0"/>
         </row>
       </rows>
@@ -112,9 +112,9 @@ Contributor(s):
     <separator/>
     
     <hbox id="CancelButton">
-      <spring flex="1"/>
+      <spacer flex="1"/>
       <button class="dialog" id="cancel" label="&dialogCancel.label;" onclick="doCancelButton()"/>
-      <spring flex="1"/>
+      <spacer flex="1"/>
     </hbox>
 
 </window>
diff --git a/xpfe/global/resources/content/about.xul b/xpfe/global/resources/content/about.xul
index 83e105ceb21e..9de9872cad54 100644
--- a/xpfe/global/resources/content/about.xul
+++ b/xpfe/global/resources/content/about.xul
@@ -53,7 +53,7 @@ Contributor(s): Michael Lowe <michael.lowe@bigfoot.com> -->
 </tabbox>
 
 <hbox style="margin-top: 1em;">
-  <spring flex="100%"/>
+  <spacer flex="100%"/>
   <button id="ok" label="&okButton.label;" default="true" onclick="doOKButton()"/>
 </hbox>
 
diff --git a/xpfe/global/resources/content/bindings/colorpicker.xml b/xpfe/global/resources/content/bindings/colorpicker.xml
index 0619d5e06f45..fb5b909e459f 100644
--- a/xpfe/global/resources/content/bindings/colorpicker.xml
+++ b/xpfe/global/resources/content/bindings/colorpicker.xml
@@ -13,88 +13,88 @@
       <xul:vbox flex="1">
 
         <xul:hbox>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFFFFF" color="#FFFFFF"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFCCCC" color="#FFCCCC"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFCC99" color="#FFCC99"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFFF99" color="#FFFF99"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFFFCC" color="#FFFFCC"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #99FF99" color="#99FF99"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #99FFFF" color="#99FFFF"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #CCFFFF" color="#CCFFFF"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #CCCCFF" color="#CCCCFF"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFCCFF" color="#FFCCFF"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFFFFF" color="#FFFFFF"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFCCCC" color="#FFCCCC"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFCC99" color="#FFCC99"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF99" color="#FFFF99"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFFFCC" color="#FFFFCC"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #99FF99" color="#99FF99"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #99FFFF" color="#99FFFF"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #CCFFFF" color="#CCFFFF"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #CCCCFF" color="#CCCCFF"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFCCFF" color="#FFCCFF"/>
         </xul:hbox>
         <xul:hbox>
-          <xul:spring class="colorpickertile" style="background-color: #CCCCCC" color="#CCCCCC"/>
-          <xul:spring class="colorpickertile" style="background-color: #FF6666" color="#FF6666"/>
-          <xul:spring class="colorpickertile" style="background-color: #FFCC33" color="#FFCC33"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFFF66" color="#FFFF66"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFFF99" color="#FFFF99"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #66FF99" color="#66FF99"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #33FFFF" color="#33FFFF"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #66FFFF" color="#66FFFF"/>
-          <xul:spring class="colorpickertile" style="background-color: #9999FF" color="#9999FF"/>
-          <xul:spring class="colorpickertile" style="background-color: #FF99FF" color="#FF99FF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #CCCCCC" color="#CCCCCC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FF6666" color="#FF6666"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FFCC33" color="#FFCC33"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF66" color="#FFFF66"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF99" color="#FFFF99"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #66FF99" color="#66FF99"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #33FFFF" color="#33FFFF"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #66FFFF" color="#66FFFF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #9999FF" color="#9999FF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FF99FF" color="#FF99FF"/>
         </xul:hbox>
         <xul:hbox>
-          <xul:spring class="colorpickertile" style="background-color: #C0C0C0" color="#C0C0C0"/>
-          <xul:spring class="colorpickertile" style="background-color: #FF0000" color="#FF0000"/>
-          <xul:spring class="colorpickertile" style="background-color: #FF9900" color="#FF9900"/>
-          <xul:spring class="colorpickertile" style="background-color: #FFCC66" color="#FFCC66"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #FFFF00" color="#FFFF00"/>
-          <xul:spring class="colorpickertile cp-light" style="background-color: #33FF33" color="#33FF33"/>
-          <xul:spring class="colorpickertile" style="background-color: #66CCCC" color="#66CCCC"/>
-          <xul:spring class="colorpickertile" style="background-color: #33CCFF" color="#33CCFF"/>
-          <xul:spring class="colorpickertile" style="background-color: #6666CC" color="#6666CC"/>
-          <xul:spring class="colorpickertile" style="background-color: #CC66CC" color="#CC66CC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #C0C0C0" color="#C0C0C0"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FF0000" color="#FF0000"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FF9900" color="#FF9900"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FFCC66" color="#FFCC66"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #FFFF00" color="#FFFF00"/>
+          <xul:spacer class="colorpickertile cp-light" style="background-color: #33FF33" color="#33FF33"/>
+          <xul:spacer class="colorpickertile" style="background-color: #66CCCC" color="#66CCCC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #33CCFF" color="#33CCFF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #6666CC" color="#6666CC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #CC66CC" color="#CC66CC"/>
         </xul:hbox>
         <xul:hbox>
-          <xul:spring class="colorpickertile" style="background-color: #999999" color="#999999"/>
-          <xul:spring class="colorpickertile" style="background-color: #CC0000" color="#CC0000"/>
-          <xul:spring class="colorpickertile" style="background-color: #FF6600" color="#FF6600"/>
-          <xul:spring class="colorpickertile" style="background-color: #FFCC33" color="#FFCC33"/>
-          <xul:spring class="colorpickertile" style="background-color: #FFCC00" color="#FFCC00"/>
-          <xul:spring class="colorpickertile" style="background-color: #33CC00" color="#33CC00"/>
-          <xul:spring class="colorpickertile" style="background-color: #00CCCC" color="#00CCCC"/>
-          <xul:spring class="colorpickertile" style="background-color: #3366FF" color="#3366FF"/>
-          <xul:spring class="colorpickertile" style="background-color: #6633FF" color="#6633FF"/>
-          <xul:spring class="colorpickertile" style="background-color: #CC33CC" color="#CC33CC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #999999" color="#999999"/>
+          <xul:spacer class="colorpickertile" style="background-color: #CC0000" color="#CC0000"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FF6600" color="#FF6600"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FFCC33" color="#FFCC33"/>
+          <xul:spacer class="colorpickertile" style="background-color: #FFCC00" color="#FFCC00"/>
+          <xul:spacer class="colorpickertile" style="background-color: #33CC00" color="#33CC00"/>
+          <xul:spacer class="colorpickertile" style="background-color: #00CCCC" color="#00CCCC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #3366FF" color="#3366FF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #6633FF" color="#6633FF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #CC33CC" color="#CC33CC"/>
         </xul:hbox>
         <xul:hbox>
-          <xul:spring class="colorpickertile" style="background-color: #666666" color="#666666"/>
-          <xul:spring class="colorpickertile" style="background-color: #990000" color="#990000"/>
-          <xul:spring class="colorpickertile" style="background-color: #CC6600" color="#CC6600"/>
-          <xul:spring class="colorpickertile" style="background-color: #CC9933" color="#CC9933"/>
-          <xul:spring class="colorpickertile" style="background-color: #999900" color="#999900"/>
-          <xul:spring class="colorpickertile" style="background-color: #009900" color="#009900"/>
-          <xul:spring class="colorpickertile" style="background-color: #339999" color="#339999"/>
-          <xul:spring class="colorpickertile" style="background-color: #3333FF" color="#3333FF"/>
-          <xul:spring class="colorpickertile" style="background-color: #6600CC" color="#6600CC"/>
-          <xul:spring class="colorpickertile" style="background-color: #993399" color="#993399"/>
+          <xul:spacer class="colorpickertile" style="background-color: #666666" color="#666666"/>
+          <xul:spacer class="colorpickertile" style="background-color: #990000" color="#990000"/>
+          <xul:spacer class="colorpickertile" style="background-color: #CC6600" color="#CC6600"/>
+          <xul:spacer class="colorpickertile" style="background-color: #CC9933" color="#CC9933"/>
+          <xul:spacer class="colorpickertile" style="background-color: #999900" color="#999900"/>
+          <xul:spacer class="colorpickertile" style="background-color: #009900" color="#009900"/>
+          <xul:spacer class="colorpickertile" style="background-color: #339999" color="#339999"/>
+          <xul:spacer class="colorpickertile" style="background-color: #3333FF" color="#3333FF"/>
+          <xul:spacer class="colorpickertile" style="background-color: #6600CC" color="#6600CC"/>
+          <xul:spacer class="colorpickertile" style="background-color: #993399" color="#993399"/>
         </xul:hbox>
         <xul:hbox>
-          <xul:spring class="colorpickertile" style="background-color: #333333" color="#333333"/>
-          <xul:spring class="colorpickertile" style="background-color: #660000" color="#660000"/>
-          <xul:spring class="colorpickertile" style="background-color: #993300" color="#993300"/>
-          <xul:spring class="colorpickertile" style="background-color: #996633" color="#996633"/>
-          <xul:spring class="colorpickertile" style="background-color: #666600" color="#666600"/>
-          <xul:spring class="colorpickertile" style="background-color: #006600" color="#006600"/>
-          <xul:spring class="colorpickertile" style="background-color: #336666" color="#336666"/>
-          <xul:spring class="colorpickertile" style="background-color: #000099" color="#000099"/>
-          <xul:spring class="colorpickertile" style="background-color: #333399" color="#333399"/>
-          <xul:spring class="colorpickertile" style="background-color: #663366" color="#663366"/>
+          <xul:spacer class="colorpickertile" style="background-color: #333333" color="#333333"/>
+          <xul:spacer class="colorpickertile" style="background-color: #660000" color="#660000"/>
+          <xul:spacer class="colorpickertile" style="background-color: #993300" color="#993300"/>
+          <xul:spacer class="colorpickertile" style="background-color: #996633" color="#996633"/>
+          <xul:spacer class="colorpickertile" style="background-color: #666600" color="#666600"/>
+          <xul:spacer class="colorpickertile" style="background-color: #006600" color="#006600"/>
+          <xul:spacer class="colorpickertile" style="background-color: #336666" color="#336666"/>
+          <xul:spacer class="colorpickertile" style="background-color: #000099" color="#000099"/>
+          <xul:spacer class="colorpickertile" style="background-color: #333399" color="#333399"/>
+          <xul:spacer class="colorpickertile" style="background-color: #663366" color="#663366"/>
         </xul:hbox>
         <xul:hbox>
-          <xul:spring class="colorpickertile" style="background-color: #000000" color="#000000"/>
-          <xul:spring class="colorpickertile" style="background-color: #330000" color="#330000"/>
-          <xul:spring class="colorpickertile" style="background-color: #663300" color="#663300"/>
-          <xul:spring class="colorpickertile" style="background-color: #663333" color="#663333"/>
-          <xul:spring class="colorpickertile" style="background-color: #333300" color="#333300"/>
-          <xul:spring class="colorpickertile" style="background-color: #003300" color="#003300"/>
-          <xul:spring class="colorpickertile" style="background-color: #003333" color="#003333"/>
-          <xul:spring class="colorpickertile" style="background-color: #000066" color="#000066"/>
-          <xul:spring class="colorpickertile" style="background-color: #330099" color="#330099"/>
-          <xul:spring class="colorpickertile" style="background-color: #330033" color="#330033"/>
+          <xul:spacer class="colorpickertile" style="background-color: #000000" color="#000000"/>
+          <xul:spacer class="colorpickertile" style="background-color: #330000" color="#330000"/>
+          <xul:spacer class="colorpickertile" style="background-color: #663300" color="#663300"/>
+          <xul:spacer class="colorpickertile" style="background-color: #663333" color="#663333"/>
+          <xul:spacer class="colorpickertile" style="background-color: #333300" color="#333300"/>
+          <xul:spacer class="colorpickertile" style="background-color: #003300" color="#003300"/>
+          <xul:spacer class="colorpickertile" style="background-color: #003333" color="#003333"/>
+          <xul:spacer class="colorpickertile" style="background-color: #000066" color="#000066"/>
+          <xul:spacer class="colorpickertile" style="background-color: #330099" color="#330099"/>
+          <xul:spacer class="colorpickertile" style="background-color: #330033" color="#330033"/>
         </xul:hbox>
       </xul:vbox>
       <!-- Something to take tab focus
diff --git a/xpfe/global/resources/content/bindings/progressmeter.xml b/xpfe/global/resources/content/bindings/progressmeter.xml
index d5b115685cb1..f61d9b6584d3 100644
--- a/xpfe/global/resources/content/bindings/progressmeter.xml
+++ b/xpfe/global/resources/content/bindings/progressmeter.xml
@@ -17,9 +17,9 @@
             <xul:box class="progress-remainder"/>
           </xul:progressbar>
           <xul:hbox>
-            <xul:spring flex="1"/>
+            <xul:spacer flex="1"/>
             <xul:text class="progress-text" inherits="value=label"/>
-            <xul:spring flex="1"/>
+            <xul:spacer flex="1"/>
           </xul:hbox>
         </xul:stack>
       </xul:hbox>
diff --git a/xpfe/global/resources/content/bindings/scrollbar.xml b/xpfe/global/resources/content/bindings/scrollbar.xml
index 005ec8f946ae..c061aba47c46 100644
--- a/xpfe/global/resources/content/bindings/scrollbar.xml
+++ b/xpfe/global/resources/content/bindings/scrollbar.xml
@@ -92,9 +92,9 @@
 
   <binding id="thumb">
     <content>
-      <xul:spring flex="1"/>
+      <xul:spacer flex="1"/>
       <xul:image inherits="src"/>
-      <xul:spring flex="1"/>
+      <xul:spacer flex="1"/>
     </content>
   </binding>
 
diff --git a/xpfe/global/resources/content/bindings/stringbundle.xml b/xpfe/global/resources/content/bindings/stringbundle.xml
index a5362b67c48a..e589774e0786 100644
--- a/xpfe/global/resources/content/bindings/stringbundle.xml
+++ b/xpfe/global/resources/content/bindings/stringbundle.xml
@@ -6,7 +6,7 @@
 
   <binding id="stringbundleset" extends="xul:box"/>
 
-  <binding id="stringbundle" extends="xul:spring">
+  <binding id="stringbundle" extends="xul:spacer">
     <implementation name="XStringBundle">
 
       <method name="getString">
diff --git a/xpfe/global/resources/content/bindings/toolbar.xml b/xpfe/global/resources/content/bindings/toolbar.xml
index 79371b537021..42d44f22bad1 100644
--- a/xpfe/global/resources/content/bindings/toolbar.xml
+++ b/xpfe/global/resources/content/bindings/toolbar.xml
@@ -17,7 +17,7 @@
       </xul:vbox>
       <xul:hbox tbattr="collapsed-tray-holder" class="collapsed-tray-holder" moz-collapsed="true">
         <xul:hbox tbattr="collapsed-tray" class="collapsed-tray"/>
-        <xul:spring flex="1" class="collapsed-tray-spring"/>
+        <xul:spacer flex="1" class="collapsed-tray-spacer"/>
       </xul:hbox>
     </content>
     
diff --git a/xpfe/global/resources/content/bindings/tree.xml b/xpfe/global/resources/content/bindings/tree.xml
index 9d1bd7c0fe26..69b288bca9f9 100644
--- a/xpfe/global/resources/content/bindings/tree.xml
+++ b/xpfe/global/resources/content/bindings/tree.xml
@@ -419,7 +419,7 @@
   <binding id="treecell-align-right"
            extends="chrome://global/content/bindings/tree.xml#tree-base">
     <content>
-      <xul:spring flex="5"/>
+      <xul:spacer flex="5"/>
       <xul:text class="tree-cell-text" inherits="crop,value=label,align" flex="1" crop="right"/>
     </content>
   </binding>
diff --git a/xpfe/global/resources/content/bindings/wizard.xml b/xpfe/global/resources/content/bindings/wizard.xml
index 863cafa63a97..56680aeda856 100644
--- a/xpfe/global/resources/content/bindings/wizard.xml
+++ b/xpfe/global/resources/content/bindings/wizard.xml
@@ -370,7 +370,7 @@
       <xul:vbox class="wizard-buttons-box-1" flex="1">
         <xul:separator class="wizard-buttons-separator groove"/>
         <xul:hbox class="wizard-buttons-box-2">
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:button class="wizard-button" wizardbutton="back"/>
           <xul:deck class="wizard-next-deck" anonid="WizardButtonDeck">
             <xul:button class="wizard-button" wizardbutton="finish" default="true"/> 
@@ -409,7 +409,7 @@
           </xul:vbox>
         </xul:vbox>
         <xul:hbox class="wizard-header-box-icon">
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:image class="wizard-header-icon" inherits="src=iconsrc"/>
         </xul:hbox>
       </xul:stack>
@@ -420,13 +420,13 @@
     <content>
       <xul:vbox flex="1">
         <xul:hbox class="wizard-buttons-top" inherits="hidden=hidetoprow">
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:button class="wizard-button" wizardbutton="cancel"/> 
           <xul:button class="wizard-button" wizardbutton="finish" default="true"/> 
         </xul:hbox>
         <xul:separator class="wizard-buttons-separator groove"/>
         <xul:hbox class="wizard-buttons-btm">
-          <xul:spring flex="1"/>
+          <xul:spacer flex="1"/>
           <xul:button class="wizard-button wizard-nav-button" wizardbutton="back"/>
           <xul:hbox class="wizard-label-box" align="center">
             <xul:text class="wizard-page-label" inherits="value=pagestep"/>
diff --git a/xpfe/global/resources/content/commonDialog.xul b/xpfe/global/resources/content/commonDialog.xul
index 23743bb77319..2106c394150d 100644
--- a/xpfe/global/resources/content/commonDialog.xul
+++ b/xpfe/global/resources/content/commonDialog.xul
@@ -42,7 +42,7 @@
         <separator class="thin"/>
       </vbox>
   
-      <spring flex="1"/>
+      <spacer flex="1"/>
       
       <!-- checkbox -->
       <hbox id="checkboxContainer" collapsed="true" align="middle">
diff --git a/xpfe/global/resources/content/dialogBindings.xml b/xpfe/global/resources/content/dialogBindings.xml
index 43c1d9d138c1..5bb8148b1777 100644
--- a/xpfe/global/resources/content/dialogBindings.xml
+++ b/xpfe/global/resources/content/dialogBindings.xml
@@ -9,7 +9,7 @@
     <content>
       <xul:hbox class="toolbar-primary" align="center" flex="1">
         <xul:text class="box-smallheader-left" inherits="value=title"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="box-smallheader-right" inherits="value=description"/>
       </xul:hbox>
     </content>
@@ -28,7 +28,7 @@
         <xul:hbox align="center" class="box-header-text-box">
           <xul:text class="box-header-text" inherits="value"/>
         </xul:hbox>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
       </xul:hbox>
     </content>
   </binding>
@@ -37,7 +37,7 @@
     <content>
       <xul:hbox class="box-status-bg toolbar-standard" flex="1" align="center">
         <xul:text class="box-status-text" inherits="label"/>
-        <xul:spring flex="1"/>
+        <xul:spacer flex="1"/>
         <xul:text class="box-status-progress" inherits="value=progress"/>
       </xul:hbox>  
     </content>
diff --git a/xpfe/global/resources/content/mac/platformDialogOverlay.xul b/xpfe/global/resources/content/mac/platformDialogOverlay.xul
index ae94c3706c60..bee173d0594f 100644
--- a/xpfe/global/resources/content/mac/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/mac/platformDialogOverlay.xul
@@ -28,7 +28,7 @@
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
@@ -37,7 +37,7 @@
 
   <hbox id="okCancelHelpButtons">
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
@@ -45,7 +45,7 @@
   </hbox>
 
   <hbox id="okCancelButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
@@ -54,7 +54,7 @@
 
   <hbox id="okCancelHelpButtonsRight">
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="exit-dialog" id="Button3" label="" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="Button2" label="" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
diff --git a/xpfe/global/resources/content/os2/platformDialogOverlay.xul b/xpfe/global/resources/content/os2/platformDialogOverlay.xul
index aa4b0d37b27f..d88819d04766 100644
--- a/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -29,26 +29,26 @@
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
   <hbox id="okCancelHelpButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
   <hbox id="okCancelButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3()"/>  
@@ -56,7 +56,7 @@
   </hbox>
   
   <hbox id="okCancelHelpButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
diff --git a/xpfe/global/resources/content/unix/platformDialogOverlay.xul b/xpfe/global/resources/content/unix/platformDialogOverlay.xul
index 18abb4b2502e..35b09b2ecee5 100644
--- a/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@@ -28,26 +28,26 @@
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
   <hbox id="okCancelHelpButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
   <hbox id="okCancelButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
@@ -55,7 +55,7 @@
   </hbox>
 
   <hbox id="okCancelHelpButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
diff --git a/xpfe/global/resources/content/win/platformDialogOverlay.xul b/xpfe/global/resources/content/win/platformDialogOverlay.xul
index eeeb0217d4eb..38648a0062b3 100644
--- a/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -29,27 +29,27 @@
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
   <hbox id="okCancelHelpButtons">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
     <button class="exit-dialog" id="cancel" label="&cancelButton.label;" oncommand="doCancelButton();"/>
     <button class="exit-dialog" id="help" label="&helpButton.label;" oncommand="doHelpButton();"/>
-    <spring flex="1"/>
+    <spacer flex="1"/>
   </hbox>
 
 
   <hbox id="okCancelButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/> 
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/> 
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/> 
@@ -57,7 +57,7 @@
   </hbox>
   
   <hbox id="okCancelHelpButtonsRight">
-    <spring flex="1"/>
+    <spacer flex="1"/>
     <button class="right exit-dialog" id="ok" label="&okButton.label;" default="true" oncommand="doOKButton();"/>
     <button class="exit-dialog" id="Button2" label="&cancelButton.label;" collapsed="true" oncommand="doButton2();"/>
     <button class="exit-dialog" id="Button3" label="&cancelButton.label;" collapsed="true" oncommand="doButton3();"/>
diff --git a/xpfe/global/resources/content/wizardOverlay.xul b/xpfe/global/resources/content/wizardOverlay.xul
index 7d86022d6c03..9ffabc2f0430 100644
--- a/xpfe/global/resources/content/wizardOverlay.xul
+++ b/xpfe/global/resources/content/wizardOverlay.xul
@@ -9,14 +9,14 @@
 
   <!-- Wizard Buttons -->
    <hbox id="wizardButtons">
-    <spring flex="100%"/>
+    <spacer flex="100%"/>
     <button class="dialog" id="wiz-cancel-button" label="&cancelButton.label;" oncommand="wizardManager.onCancel();" />
-    <spring flex="20%"/>
+    <spacer flex="20%"/>
     <button class="dialog" id="wiz-back-button" label="&backButton.label;" oncommand="wizardManager.onBack();"/>
     <button class="dialog right" id="wiz-next-button" label="&nextButton.label;" oncommand="wizardManager.onNext();"/>
-    <spring flex="5%"/>
+    <spacer flex="5%"/>
     <button class="dialog" id="wiz-finish-button" label="&finishButton.label;" oncommand="wizardManager.onFinish();" />
-    <spring flex="5%"/>
+    <spacer flex="5%"/>
   </hbox>
   
 </overlay>    
diff --git a/xpinstall/res/content/xpistatus.xul b/xpinstall/res/content/xpistatus.xul
index 14b238d676be..a8633c357ce3 100644
--- a/xpinstall/res/content/xpistatus.xul
+++ b/xpinstall/res/content/xpistatus.xul
@@ -44,17 +44,17 @@
     <vbox id="mainBox">
         <hbox id="interiorTitleBox" autostretch="never">
             <text class="headline" id="interiorTitle" value="&progress.label;"/>
-            <spring flex="100%"/>
+            <spacer flex="100%"/>
             <image src="chrome://global/skin/animthrob_single.gif" />
         </hbox>
 
-        <spring class="vertical-small-spacer"/>
+        <spacer class="vertical-small-spacer"/>
         <separator class="groove" flex="100%"/>            
-        <spring class="vertical-small-spacer"/>
+        <spacer class="vertical-small-spacer"/>
 
         <text class="label" id="componentList" value="&downloadBeforeUpdate.text;"/>
-        <spring class="vertical-small-spacer"/>
-        <spring class="vertical-small-spacer"/>            
+        <spacer class="vertical-small-spacer"/>
+        <spacer class="vertical-small-spacer"/>            
 
         <vbox id="treebox">  
                 <tree id="modulesTree" class="inset">
@@ -75,7 +75,7 @@
                 </tree>
         </vbox>
     
-        <spring class="vertical-small-spacer"/>
+        <spacer class="vertical-small-spacer"/>
 
         <vbox id="statusMessages">
             <textbox id="dialog.uiPackageName" readonly="" />