diff --git a/mozilla/suite/debugQA/content/pref-debug.xul b/mozilla/suite/debugQA/content/pref-debug.xul
index 3e8081568b2..b096665779f 100644
--- a/mozilla/suite/debugQA/content/pref-debug.xul
+++ b/mozilla/suite/debugQA/content/pref-debug.xul
@@ -40,9 +40,9 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&widgetRendering.label;"/>
     <checkbox id="nglayoutDebugWindow" label="&debugWindow.label;"
               pref="true" preftype="bool" prefstring="nglayout.widget.debugWindow"
@@ -50,11 +50,11 @@
     <checkbox id="debugXULBoxes" label="&debugXULBox.label;"
               pref="true" preftype="bool" prefstring="xul.debug.box"
               prefattribute="checked"/>
-  </titledbox>
+  </groupbox>
 
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
-  <titledbox orient="vertical" autostretch="never">
+  <groupbox orient="vertical" autostretch="never">
     <label value="&debugMiscellaneous.label;"/>
     <checkbox id="nglayoutDebugUseXBLForms" label="Use XBL-based form controls (takes effect after restart). Don't file bugs on these controls; they are still under construction."
               pref="true" preftype="bool" prefstring="nglayout.debug.enable_xbl_forms"
@@ -68,10 +68,10 @@
     <checkbox id="showAboutAsStupidModalWindow" label="&debugShowAboutAsStupidModalWindow.label;"
               pref="true" preftype="bool" prefstring="browser.show_about_as_stupid_modal_window"
               prefattribute="checked"/>
-  </titledbox>              
+  </groupbox>              
 
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&accelerators.label;"/>
     <label value="&acceleratorsBlurb.label;"/>
 
@@ -95,7 +95,7 @@
         </rows>
       </grid>
 
-  </titledbox>
+  </groupbox>
 
 </window>
 
diff --git a/mozilla/suite/debugQA/content/pref-debug1.xul b/mozilla/suite/debugQA/content/pref-debug1.xul
index 51ea8edb455..1b52d3716a9 100644
--- a/mozilla/suite/debugQA/content/pref-debug1.xul
+++ b/mozilla/suite/debugQA/content/pref-debug1.xul
@@ -41,13 +41,13 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
 
   <!-- Event Debugging -->  
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugEventDebugging.label;"/>
     <vbox autostretch="never">
       <checkbox id="nglayoutDebugPaintFlashing" label="&debugPaintFlashing.label;"
@@ -69,10 +69,10 @@
                 pref="true" preftype="bool" prefstring="nglayout.debug.motion_event_dumping"
                 prefattribute="checked"/>
     </vbox>
-  </titledbox>
+  </groupbox>
 
   <!-- Reflow events -->
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugReflowEvents.label;"/>
     <vbox autostretch="never">
       <checkbox id="layoutReflowShowFrameCounts" label="&debugReflowShowFrameCounts.label;"
@@ -85,7 +85,7 @@
                 pref="true" preftype="bool" prefstring="layout.reflow.dumpframebyframecounts"
                 prefattribute="checked"/>
     </vbox>
-  </titledbox>
+  </groupbox>
 
 
 </window>
diff --git a/mozilla/suite/debugQA/content/pref-debug2.xul b/mozilla/suite/debugQA/content/pref-debug2.xul
index ac9df10ade6..eb70d5e4015 100644
--- a/mozilla/suite/debugQA/content/pref-debug2.xul
+++ b/mozilla/suite/debugQA/content/pref-debug2.xul
@@ -39,12 +39,12 @@
   ]]>
   </script>
         
-  <box class="box-smallheader" title="&lHeader;"/>
+  <hbox class="box-smallheader" title="&lHeader;"/>
   
   <!-- nothing on this page has accesskeys because this is a temporary debug
        panel and you can damn well click the widgets! -->
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugNetworking.label;"/>
     <vbox autostretch="never">
       <checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;"
@@ -65,9 +65,9 @@
     <textbox id="acceptEncodingString" flex="1" wsm_persist="true"
               pref="true" preftype="string" prefstring="network.http.accept-encoding"
               prefattribute="value"/> 
-  </titledbox>
+  </groupbox>
 
-  <titledbox orient="vertical">
+  <groupbox orient="vertical">
     <label value="&debugCache.label;"/>
     <vbox autostretch="never">
     <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
@@ -81,7 +81,7 @@
               prefattribute="checked"/>
 
     </vbox>
-  </titledbox>
+  </groupbox>
 
 </window>