dotlambda
diff --git a/‎src/chrome/content/toolbar_button.js‎
Lines changed: 22 additions & 0 deletions b/‎src/chrome/content/toolbar_button.js‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎src/chrome/skin/https-everywhere-16-gray.png‎
477 Bytes b/‎src/chrome/skin/https-everywhere-16-gray.png‎
477 Bytes
diff --git a/‎src/chrome/skin/https-everywhere-24-gray.png‎
784 Bytes b/‎src/chrome/skin/https-everywhere-24-gray.png‎
784 Bytes
diff --git a/‎src/chrome/skin/https-everywhere.css‎
Lines changed: 9 additions & 0 deletions b/‎src/chrome/skin/https-everywhere.css‎
Lines changed: 9 additions & 0 deletions
@@ -34,6 +34,9 @@ httpsEverywhere.toolbarButton = {
   init: function() {
     var tb = httpsEverywhere.toolbarButton;
 
+    // make sure icon is proper color during init
+    tb.changeIcon();
+
     // decide whether to show toolbar hint
     let hintPref = "extensions.https_everywhere.toolbar_hint_shown";
     if(!Services.prefs.getPrefType(hintPref) 
@@ -73,6 +76,22 @@ httpsEverywhere.toolbarButton = {
 
     // remove listener
     gBrowser.removeEventListener('load', tb.showToolbarHint, true);
+  },
+
+  /**
+   * Changes HTTPS Everywhere toolbar icon based on whether HTTPS Everywhere
+   * is enabled or disabled.
+   */
+  changeIcon: function() {
+    var prefs = HTTPSEverywhere.get_prefs();
+    var enabled = prefs.getBoolPref("globalEnabled");
+
+    var toolbarbutton = document.getElementById('https-everywhere-button');
+    if (enabled) {
+      toolbarbutton.setAttribute('status', 'enabled');
+    } else {
+      toolbarbutton.setAttribute('status', 'disabled');
+    }
   }
 
 };
@@ -171,6 +190,9 @@ function reload_window() {
 function toggleEnabledState(){
 	HTTPSEverywhere.toggleEnabledState();
 	reload_window();	
+
+  // Change icon depending on enable state
+  httpsEverywhere.toolbarButton.changeIcon();
 }
 
 function open_in_tab(url) {
 
@@ -8,6 +8,15 @@ toolbar[iconsize="small"] #https-everywhere-button {
   -moz-box-orient: horizontal;
 }
 
+/* Use CSS attribute selector for changing icon */
+#https-everywhere-button[status="disabled"] {
+  list-style-image: url("chrome://https-everywhere/skin/https-everywhere-24-gray.png");
+}
+
+toolbar[iconsize="small"] #https-everywhere-button[status="disabled"] {
+  list-style-image: url("chrome://https-everywhere/skin/https-everywhere-16-gray.png");
+}
+
 #https-everywhere-button menuitem.active-item label {
   color: #9AD100;
   font-weight: bold;