Update browser actions everytime filters are loaded or saved

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 45 matching lines @@
     var addonVersion = require("info").addonVersion;
     var prevVersion = localStorage.currentVersion;
     if (prevVersion != addonVersion)
     {
       isFirstRun = !prevVersion;
       localStorage.currentVersion = addonVersion;
       if (!importingOldData)
         addSubscription(prevVersion);
     }
   }
+
+  // update browser actions when whitelisting might have changed,
+  // due to loading filters or saving filter changes
+  if (action == "load" || action == "save")
+  {
+    ext.windows.getAll(function(windows)
+    {
+      for (var i = 0; i < windows.length; i++)
+      {
+        windows[i].getAllTabs(function(tabs)
+        {
+          tabs.forEach(refreshIconAndContextMenu);
+        });
+      }
+    });
+  }
 });
 
 // Special-case domains for which we cannot use style-based hiding rules.
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
 function removeDeprecatedOptions()
 {
   var deprecatedOptions = ["specialCaseYouTube", "experimental", "disableInlineTextAds"];
   deprecatedOptions.forEach(function(option)
@@ skipping 318 matching lines @@
         // sendResponse asynchronously
         return true;
       }
       break;
     default:
       sendResponse({});
       break;
   }
 });
 
-// Show icon as browser action for all tabs that already exist
-ext.windows.getAll(function(windows)
-{
-  for (var i = 0; i < windows.length; i++)
-  {
-    windows[i].getAllTabs(function(tabs)
-    {
-      tabs.forEach(refreshIconAndContextMenu);
-    });
-  }
-});
-
 // Update icon if a tab changes location
 ext.tabs.onLoading.addListener(function(tab)
 {
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);