Relocated icon and redesigned icon popup

lib/prefs.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 17 matching lines @@
   savestats: false,
   privateBrowsing: false,
   subscriptions_fallbackerrors: 5,
   subscriptions_fallbackurl: "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%",
   subscriptions_autoupdate: true,
   subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
   documentation_link: "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%",
   notificationdata: {},
   notificationurl: "https://notification.adblockplus.org/notification.json",
   stats_total: {},
-  show_iconnumber: true,
-  show_popupstats: true
+  show_statsinicon: true,
+  show_statsinpopup: true
 };
 
 let listeners = [];
 
 function defineProperty(key)
 {
   let value = null;
   Prefs.__defineGetter__(key, function()
   {
     if (value === null)
@@ skipping 46 matching lines @@
   removeListener: function(listener)
   {
     let index = listeners.indexOf(listener);
     if (index >= 0)
       listeners.splice(index, 1);
   },
 };
 
 for (let key in defaults)
   defineProperty(key);