--- a/mobile/android/base/ConfirmPreference.java
+++ b/mobile/android/base/ConfirmPreference.java
@@ -61,16 +61,17 @@ class ConfirmPreference extends DialogPr
     }
     protected void onDialogClosed(boolean positiveResult) {
         if (!positiveResult)
             return;
         if ("clear_history".equalsIgnoreCase(mAction)) {
             GeckoAppShell.getHandler().post(new Runnable(){
                 public void run() {
                     BrowserDB.clearHistory(mContext.getContentResolver());
+                    GeckoApp.mAppContext.mFavicons.clearFavicons();
                 }
             });
         } else if ("clear_private_data".equalsIgnoreCase(mAction)) {
             GeckoAppShell.getHandler().post(new Runnable(){
                 public void run() {
                     GeckoAppShell.sendEventToGecko(new GeckoEvent("Sanitize:ClearAll", null));
                 }
             });

--- a/mobile/android/base/Favicons.java
+++ b/mobile/android/base/Favicons.java
@@ -147,16 +147,22 @@ public class Favicons {
             SQLiteDatabase db = mDbHelper.getWritableDatabase();
 
             ContentValues values = new ContentValues();
             values.put(COLUMN_FAVICON_URL, faviconUrl);
             values.put(COLUMN_PAGE_URL, pageUrl);
 
             db.replace(TABLE_NAME, null, values);
         }
+
+
+        public void clearFavicons() {
+            SQLiteDatabase db = mDbHelper.getWritableDatabase();
+            db.delete(TABLE_NAME, null, null);
+        }
     }
 
     public Favicons(Context context) {
         Log.d(LOGTAG, "Creating Favicons instance");
 
         mContext = context;
         mDbHelper = new DatabaseHelper(context);
 
@@ -194,16 +200,20 @@ public class Favicons {
             return false;
 
         Log.d(LOGTAG, "Cancelling favicon load (" + taskId + ")");
 
         LoadFaviconTask task = mLoadTasks.get(taskId);
         return task.cancel(false);
     }
 
+    public void clearFavicons() {
+        mDbHelper.clearFavicons();
+    }
+
     public void close() {
         Log.d(LOGTAG, "Closing Favicons database");
         mDbHelper.close();
 
         // Cancel any pending tasks
         Set<Long> taskIds = mLoadTasks.keySet();
         Iterator iter = taskIds.iterator();
         while (iter.hasNext()) {