diff --git a/mozilla/browser/components/preferences/advanced.js b/mozilla/browser/components/preferences/advanced.js
index adb341e63b5..e38a1794755 100644
--- a/mozilla/browser/components/preferences/advanced.js
+++ b/mozilla/browser/components/preferences/advanced.js
@@ -176,6 +176,18 @@ var gAdvancedPane = {
     return isNaN(intValue) ? 0 : intValue * 1000;
   },
 
+  /**
+   * Clears the cache.
+   */
+  clearCache: function ()
+  {
+    var cacheService = Components.classes["@mozilla.org/network/cache-service;1"]
+                         	       .getService(Components.interfaces.nsICacheService);
+    try {
+      cacheService.evictEntries(Components.interfaces.nsICache.STORE_ANYWHERE);
+    } catch(ex) {}
+  },
+
   // UPDATE TAB
 
   /*
diff --git a/mozilla/browser/components/preferences/advanced.xul b/mozilla/browser/components/preferences/advanced.xul
index 067558e24a4..ef22860ae7c 100644
--- a/mozilla/browser/components/preferences/advanced.xul
+++ b/mozilla/browser/components/preferences/advanced.xul
@@ -44,6 +44,8 @@
 %brandDTD;
 <!ENTITY % advancedDTD SYSTEM "chrome://browser/locale/preferences/advanced.dtd">
 %advancedDTD;
+<!ENTITY % privacyDTD SYSTEM "chrome://browser/locale/preferences/privacy.dtd">
+%privacyDTD;
 ]>
 
 <overlay id="AdvancedPaneOverlay"
@@ -205,7 +207,10 @@
                         onsyncfrompreference="return gAdvancedPane.readCacheSize();"
                         onsynctopreference="return gAdvancedPane.writeCacheSize();"
                         aaa:labelledby="cacheSizeBox"/>
-               <label>&useCacheAfter.label;</label>
+               <label flex="1">&useCacheAfter.label;</label>
+               <button id="clearCacheButton" icon="clear"
+                       label="&clearDataNow.label2;"
+                       oncommand="gAdvancedPane.clearCache();"/>
              </hbox>
            </groupbox>
         </tabpanel>
diff --git a/mozilla/browser/components/preferences/security.xul b/mozilla/browser/components/preferences/security.xul
index 6dc77091286..2c8a71b9693 100644
--- a/mozilla/browser/components/preferences/security.xul
+++ b/mozilla/browser/components/preferences/security.xul
@@ -152,6 +152,7 @@
       </hbox>
 
       <hbox id="showPasswordsBox">
+        <spacer flex="1"/>
         <button id="showPasswords"
                 label="&showPasswords.label;" accesskey="&showPasswords.accesskey;"
                 oncommand="gSecurityPane.showPasswords();"