diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 267a0ca562d..340e591eb6b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -40,7 +40,7 @@
 	</box>
 
   <html:fieldset style="width: 100%">
-   	<box align="vertical" style="width: 100%;" flex="100%">
+   	<box align="vertical" style="width: 93%;" flex="100%" class="hspace-both">
 	  	<html:div>&cachePara;</html:div>
       <spring style="height: 15px;"/>
       <box align="horizontal" flex="100%">
@@ -78,8 +78,10 @@
        			<titledbutton class="dialog push" name="clearm" value="&clearDiskcacheButton.label;" />
           </box>
           <box align="vertical" flex="100%">
+            <box align="horizontal" style="padding-right: 3px;">
          			<html:input name="disk" type="text" id="browserCacheDirectory"
                           pref="true" preftype="string" prefstring="browser.cache.directory" flex="100%"/>
+            </box>
           </box>
           <box align="horizontal">
             <spring flex="100%"/>
@@ -92,23 +94,23 @@
   </html:fieldset>
   
   <html:fieldset>
+    <html:div class="hspace-both">&docCache;</html:div>
 	  <box align="vertical" style="width: 100%;">
-		  <html:div>&docCache;</html:div>
-  		<html:div>
+  		<html:div class="hspace-both vspace">
     		<html:input name="cacheDocFreq" type="radio" id="browserCacheCheckDocFrequency0"
                     pref="true" preftype="int" prefindex="0" prefstring="browser.cache.check_doc_frequency"/>
 			<html:label for="browserCacheCheckDocFrequency0" accesskey="o" tabindex="0">
 			&oncePsessionRadio.label;
 			</html:label>
 		</html:div>
-		<html:div>
+		<html:div class="hspace-both">
     		<html:input name="cacheDocFreq" type="radio" id="browserCacheCheckDocFrequency1"
                     pref="true" preftype="int" prefindex="1" prefstring="browser.cache.check_doc_frequency"/>
 			<html:label for="browserCacheCheckDocFrequency1" accesskey="e" tabindex="0">
 			&everyTimeRadio.label;	
 			</html:label>
 		</html:div>
-    	<html:div>
+    	<html:div class="hspace-both">
     		<html:input name="cacheDocFreq" type="radio" id="browserCacheCheckDocFrequency2"
                     pref="true" preftype="int" prefinex="1" prefstring="browser.cache.check_doc_frequency"/>
 			<html:label for="browserCacheCheckDocFrequency2" accesskey="n" tabindex="0">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
index ce0eb1396fb..c0880618c42 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@@ -43,10 +43,8 @@
 	</box>
 
  	<html:fieldset>
-  	<html:legend align="left">
-  		 <html:div>&cookies;</html:div> 
-  	</html:legend>  
-    <html:table width="100%" cellpadding="0" cellspacing="0">
+  	<html:legend align="left">&cookies;</html:legend>  
+    <html:table width="100%" cellpadding="0" cellspacing="0" class="hspace-both">
       <html:tr>
         <html:td colspan="2">
           <html:div>
@@ -99,7 +97,7 @@
         </html:td>
       </html:tr>
     </html:table>
-    <box align="horizontal" flex="100%" style="width: 100%">
+    <box align="horizontal" flex="100%" style="width: 93%" class="hspace-both">
       <spring flex="100%"/>
       <titledbutton value="&viewCookies.label;" class="dialog push" onclick="viewCookies();"/>
     </box>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
index 35c3d7194ef..ff919d528c8 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-wallet.xul
@@ -48,34 +48,26 @@
 	</box>
  
   <html:fieldset>
-    <html:legend>
-      &walletHeader;
-    </html:legend>
-    <html:div>
-      &walletDetails;
-    </html:div>
+    <html:legend>&walletHeader;</html:legend>
+    <html:div class="hspace-both">&walletDetails;</html:div>
     <spring style="height: 10px;"/>
-		<box align="horizontal" style="width: 100%;" flex="100%">
+		<box align="horizontal" style="width: 93%;" flex="100%" class="hspace-both">
      	<html:label for="walletServer" accesskey="c" tabindex="0">
 	    	&server.label;
   	  </html:label> 
    		<html:input name="Wallet Server:" type="text"	id="walletServer" 
                   pref="true" preftype="string" prefstring="wallet.Server" flex="100%"/> 
 	  </box> 
-    <box align="horizontal" flex="100%" style="width: 100%">
+    <box align="horizontal" flex="100%" style="width: 93%" class="hspace-both">
       <spring flex="100%"/>
       <titledbutton value="&viewWallet.label;" class="dialog push" onclick="viewWallet();"/>
     </box>
   </html:fieldset>
 
   <html:fieldset>
-    <html:legend>
-      &signonHeader;
-    </html:legend>
-    <html:div>
-      &signonDetails;
-    </html:div>
-    <box align="horizontal" flex="100%" style="width: 100%">
+    <html:legend>&signonHeader;</html:legend>
+    <html:div class="hspace-both">&signonDetails;</html:div>
+    <box align="horizontal" flex="100%" style="width: 93%" class="hspace-both">
       <spring flex="100%"/>
       <titledbutton value="&viewSignons.label;" class="dialog push" onclick="viewSignons();"/>
     </box>