diff --git a/entropy-notification-applet/gfx/applet/applet-busy.png b/entropy-notification-applet/gfx/applet/applet-busy.png
index b0e2e32d4..07cf0102d 100644
Binary files a/entropy-notification-applet/gfx/applet/applet-busy.png and b/entropy-notification-applet/gfx/applet/applet-busy.png differ
diff --git a/entropy-notification-applet/gfx/applet/applet-critical-blank.png b/entropy-notification-applet/gfx/applet/applet-critical-blank.png
deleted file mode 100644
index d8ed015ac..000000000
Binary files a/entropy-notification-applet/gfx/applet/applet-critical-blank.png and /dev/null differ
diff --git a/entropy-notification-applet/gfx/applet/applet-critical.png b/entropy-notification-applet/gfx/applet/applet-critical.png
index 493807460..c1d13482b 100644
Binary files a/entropy-notification-applet/gfx/applet/applet-critical.png and b/entropy-notification-applet/gfx/applet/applet-critical.png differ
diff --git a/entropy-notification-applet/gfx/applet/applet-disable.png b/entropy-notification-applet/gfx/applet/applet-disable.png
new file mode 100644
index 000000000..7d6aaf6f2
Binary files /dev/null and b/entropy-notification-applet/gfx/applet/applet-disable.png differ
diff --git a/entropy-notification-applet/gfx/applet/applet-disconnect.png b/entropy-notification-applet/gfx/applet/applet-disconnect.png
index 4e9b201c4..d36ce29cc 100644
Binary files a/entropy-notification-applet/gfx/applet/applet-disconnect.png and b/entropy-notification-applet/gfx/applet/applet-disconnect.png differ
diff --git a/entropy-notification-applet/gfx/applet/applet-error.png b/entropy-notification-applet/gfx/applet/applet-error.png
index 0dc2c345f..0ce38d936 100644
Binary files a/entropy-notification-applet/gfx/applet/applet-error.png and b/entropy-notification-applet/gfx/applet/applet-error.png differ
diff --git a/entropy-notification-applet/gfx/applet/applet-okay.png b/entropy-notification-applet/gfx/applet/applet-okay.png
index a7e23d4b2..5f7a362bc 100644
Binary files a/entropy-notification-applet/gfx/applet/applet-okay.png and b/entropy-notification-applet/gfx/applet/applet-okay.png differ
diff --git a/entropy-notification-applet/src/etp_applet.py b/entropy-notification-applet/src/etp_applet.py
index 2cfa95691..65b031a4c 100644
--- a/entropy-notification-applet/src/etp_applet.py
+++ b/entropy-notification-applet/src/etp_applet.py
@@ -114,16 +114,18 @@ class EntropyApplet:
             elif new_state == "CRITICAL":
                 self.status_icon.set_blinking(True)
                 if self.never_viewed_notices:
-                    self.change_icon("critical", "critical-blank")
+                    self.change_icon("critical")
                 else:
                     self.set_displayed_image("critical")
             elif new_state == "NOCONSENT":
                 if self.never_viewed_consent:
-                    self.change_icon("noconsent", "noconsent-blank")
+                    self.change_icon("noconsent")
                 else:
                     self.set_displayed_image("noconsent")
             elif new_state == "DISCONNECTED":
                 self.change_icon("disconnect")
+            elif new_state == "DISABLE":
+                self.change_icon("disable")
             elif new_state == "ERROR":
                 self.change_icon("error")
             self.current_state = new_state
@@ -182,9 +184,8 @@ class EntropyApplet:
         self.icons.add_file("error", "applet-error.png")
         self.icons.add_file("busy", "applet-busy.png")
         self.icons.add_file("critical", "applet-critical.png")
-        self.icons.add_file("critical-blank", "applet-critical-blank.png")
+        self.icons.add_file("disable", "applet-disable.png")
         self.icons.add_file("noconsent", "applet-critical.png")
-        self.icons.add_file("noconsent-blank", "applet-critical-blank.png")
         self.icons.add_file("disconnect", "applet-disconnect.png")
         self.icons.add_file("spritz","spritz.png")
         self.icons.add_file("about","applet-about.png")
@@ -293,7 +294,7 @@ class EntropyApplet:
         elif name == "configure_applet":
             pix = self.icons.best_match("configuration",22)
         elif name == "disable_applet":
-            pix = self.icons.best_match("disconnect",22)
+            pix = self.icons.best_match("disable",22)
         elif name == "enable_applet":
             pix = self.icons.best_match("okay",22)
         else:
@@ -362,7 +363,7 @@ class EntropyApplet:
     def disable_applet(self, *args):
         self.update_tooltip(_("Updates Notification Applet Disabled"))
         self.disable_refresh_timer()
-        self.set_state("DISCONNECTED")
+        self.set_state("DISABLE")
         etp_applet_config.settings['APPLET_ENABLED'] = 0
         etp_applet_config.save_settings(etp_applet_config.settings)
         self.menu_items['disable_applet'].hide()
diff --git a/entropy-notification-applet/src/etp_applet_config.py b/entropy-notification-applet/src/etp_applet_config.py
index f151d7131..1d266a067 100644
--- a/entropy-notification-applet/src/etp_applet_config.py
+++ b/entropy-notification-applet/src/etp_applet_config.py
@@ -8,7 +8,7 @@
 import os
 import dumpTools
 
-APPLET_STATES = [ "STARTUP", "NOCONSENT", "CONFIGURING", "OKAY", "CRITICAL", "BUSY", "ERROR", "DISCONNECTED" ]
+APPLET_STATES = [ "STARTUP", "NOCONSENT", "CONFIGURING", "OKAY", "CRITICAL", "BUSY", "ERROR", "DISCONNECTED", "DISABLE" ]
 APPLET_MENUS = [ "about", "update_now", "web_panel", "web_site", "configure_applet", "check_now" ]
 
 APPLET_SENSITIVE_MENU = {
@@ -20,6 +20,7 @@ APPLET_SENSITIVE_MENU = {
     "BUSY"        : [ ],
     "ERROR"       : [ "about", "update_now", "check_now" ],
     "DISCONNECTED": [ "about", "update_now", "check_now" ],
+    "DISABLE": [ "about", "update_now", "check_now" ],
 }
 
 RANDOM_REFRESH_DELTA = abs(hash(os.urandom(2)))%1800