diff --git a/core/constants.js b/core/constants.js
index f09ad778..d732283f 100644
--- a/core/constants.js
+++ b/core/constants.js
@@ -103,42 +103,42 @@ const BrowserType = {
 const IconType = {
     'Enabled': {
         'Green': {
-            '16': chrome.runtime.getURL('icons/enabled.svg'),
-            '18': chrome.runtime.getURL('icons/enabled.svg'),
-            '19': chrome.runtime.getURL('icons/enabled.svg'),
-            '32': chrome.runtime.getURL('icons/enabled.svg'),
-            '36': chrome.runtime.getURL('icons/enabled.svg'),
-            '38': chrome.runtime.getURL('icons/enabled.svg'),
-            '64': chrome.runtime.getURL('icons/enabled.svg')
+            '16': chrome.runtime.getURL('icons/action/icon16-default.png'),
+            '18': chrome.runtime.getURL('icons/action/icon18-default.png'),
+            '19': chrome.runtime.getURL('icons/action/icon19-default.png'),
+            '32': chrome.runtime.getURL('icons/action/icon32-default.png'),
+            '36': chrome.runtime.getURL('icons/action/icon36-default.png'),
+            '38': chrome.runtime.getURL('icons/action/icon38-default.png'),
+            '64': chrome.runtime.getURL('icons/action/icon64-default.png')
         },
         'White': {
-            '16': chrome.runtime.getURL('icons/enabled-white.svg'),
-            '18': chrome.runtime.getURL('icons/enabled-white.svg'),
-            '19': chrome.runtime.getURL('icons/enabled-white.svg'),
-            '32': chrome.runtime.getURL('icons/enabled-white.svg'),
-            '36': chrome.runtime.getURL('icons/enabled-white.svg'),
-            '38': chrome.runtime.getURL('icons/enabled-white.svg'),
-            '64': chrome.runtime.getURL('icons/enabled-white.svg')
+            '16': chrome.runtime.getURL('icons/action/mono/icon16-default.png'),
+            '18': chrome.runtime.getURL('icons/action/mono/icon18-default.png'),
+            '19': chrome.runtime.getURL('icons/action/mono/icon19-default.png'),
+            '32': chrome.runtime.getURL('icons/action/mono/icon32-default.png'),
+            '36': chrome.runtime.getURL('icons/action/mono/icon36-default.png'),
+            '38': chrome.runtime.getURL('icons/action/mono/icon38-default.png'),
+            '64': chrome.runtime.getURL('icons/action/mono/icon64-default.png')
         }
     },
     'Disabled': {
         'Red': {
-            '16': chrome.runtime.getURL('icons/disabled.svg'),
-            '18': chrome.runtime.getURL('icons/disabled.svg'),
-            '19': chrome.runtime.getURL('icons/disabled.svg'),
-            '32': chrome.runtime.getURL('icons/disabled.svg'),
-            '36': chrome.runtime.getURL('icons/disabled.svg'),
-            '38': chrome.runtime.getURL('icons/disabled.svg'),
-            '64': chrome.runtime.getURL('icons/disabled.svg')
+            '16': chrome.runtime.getURL('icons/action/icon16-disabled.png'),
+            '18': chrome.runtime.getURL('icons/action/icon18-disabled.png'),
+            '19': chrome.runtime.getURL('icons/action/icon19-disabled.png'),
+            '32': chrome.runtime.getURL('icons/action/icon32-disabled.png'),
+            '36': chrome.runtime.getURL('icons/action/icon36-disabled.png'),
+            '38': chrome.runtime.getURL('icons/action/icon38-disabled.png'),
+            '64': chrome.runtime.getURL('icons/action/icon64-disabled.png')
         },
         'White': {
-            '16': chrome.runtime.getURL('icons/disabled-white.svg'),
-            '18': chrome.runtime.getURL('icons/disabled-white.svg'),
-            '19': chrome.runtime.getURL('icons/disabled-white.svg'),
-            '32': chrome.runtime.getURL('icons/disabled-white.svg'),
-            '36': chrome.runtime.getURL('icons/disabled-white.svg'),
-            '38': chrome.runtime.getURL('icons/disabled-white.svg'),
-            '64': chrome.runtime.getURL('icons/disabled-white.svg')
+            '16': chrome.runtime.getURL('icons/action/mono/icon16-disabled.png'),
+            '18': chrome.runtime.getURL('icons/action/mono/icon18-disabled.png'),
+            '19': chrome.runtime.getURL('icons/action/mono/icon19-disabled.png'),
+            '32': chrome.runtime.getURL('icons/action/mono/icon32-disabled.png'),
+            '36': chrome.runtime.getURL('icons/action/mono/icon36-disabled.png'),
+            '38': chrome.runtime.getURL('icons/action/mono/icon38-disabled.png'),
+            '64': chrome.runtime.getURL('icons/action/mono/icon64-disabled.png')
         }
     }
 };
diff --git a/core/state-manager.js b/core/state-manager.js
index 2f5fc0f0..3596b0dc 100644
--- a/core/state-manager.js
+++ b/core/state-manager.js
@@ -212,6 +212,9 @@ stateManager._handleStorageChanged = function (changes) {
     if (Setting.NEGATE_HTML_FILTER_LIST in changes) {
         stateManager.getInvertOption = changes.negateHtmlFilterList.newValue;
     }
+    if (Setting.USE_MONOCHROME_ICONS in changes) {
+        stateManager.useMonochromeIcons = changes.useMonochromeIcons.newValue;
+    }
 };
 
 stateManager._clearBadgeText = function (tabIdentifier) {
@@ -249,7 +252,7 @@ stateManager._domainIsListed = function (domain, listname) {
 stateManager._setIconDisabled = function (tabIdentifier) {
 
     wrappers.setIcon({
-        'path': stateManager.useMonochromeIcons ? IconType.Disabled.White : IconType.Disabled.Green,
+        'path': stateManager.useMonochromeIcons ? IconType.Disabled.White : IconType.Disabled.Red,
         'tabId': tabIdentifier
     });
 };
@@ -275,17 +278,13 @@ chrome.tabs.query({}, function (tabs) {
     tabs.forEach(stateManager._createTab);
 });
 
-chrome.storage.sync.get([Setting.SHOW_ICON_BADGE, Setting.USE_MONOCHROME_ICONS], function (items) {
+chrome.storage.sync.get([Setting.SHOW_ICON_BADGE], function (items) {
 
     if (items.showIconBadge === undefined) {
         items.showIconBadge = true;
     }
-    if (items.useMonochromeIcons === undefined) {
-        items.useMonochromeIcons = true;
-    }
 
     stateManager.showIconBadge = items.showIconBadge;
-    stateManager.useMonochromeIcons = items.useMonochromeIcons;
 });
 
 /**
diff --git a/icons/action/icon16-default.png b/icons/action/icon16-default.png
new file mode 100644
index 00000000..d5b5cbb5
Binary files /dev/null and b/icons/action/icon16-default.png differ
diff --git a/icons/action/icon16-disabled.png b/icons/action/icon16-disabled.png
new file mode 100644
index 00000000..62ba2693
Binary files /dev/null and b/icons/action/icon16-disabled.png differ
diff --git a/icons/action/icon18-default.png b/icons/action/icon18-default.png
new file mode 100644
index 00000000..a8dcf1ef
Binary files /dev/null and b/icons/action/icon18-default.png differ
diff --git a/icons/action/icon18-disabled.png b/icons/action/icon18-disabled.png
new file mode 100644
index 00000000..a099ec2c
Binary files /dev/null and b/icons/action/icon18-disabled.png differ
diff --git a/icons/action/icon19-default.png b/icons/action/icon19-default.png
new file mode 100644
index 00000000..10bd27f0
Binary files /dev/null and b/icons/action/icon19-default.png differ
diff --git a/icons/action/icon19-disabled.png b/icons/action/icon19-disabled.png
new file mode 100644
index 00000000..61530422
Binary files /dev/null and b/icons/action/icon19-disabled.png differ
diff --git a/icons/action/icon32-default.png b/icons/action/icon32-default.png
new file mode 100644
index 00000000..64864e3f
Binary files /dev/null and b/icons/action/icon32-default.png differ
diff --git a/icons/action/icon32-disabled.png b/icons/action/icon32-disabled.png
new file mode 100644
index 00000000..42d19ec0
Binary files /dev/null and b/icons/action/icon32-disabled.png differ
diff --git a/icons/action/icon36-default.png b/icons/action/icon36-default.png
new file mode 100644
index 00000000..7c6bf09a
Binary files /dev/null and b/icons/action/icon36-default.png differ
diff --git a/icons/action/icon36-disabled.png b/icons/action/icon36-disabled.png
new file mode 100644
index 00000000..a5c4bc11
Binary files /dev/null and b/icons/action/icon36-disabled.png differ
diff --git a/icons/action/icon38-default.png b/icons/action/icon38-default.png
new file mode 100644
index 00000000..e42a7eaf
Binary files /dev/null and b/icons/action/icon38-default.png differ
diff --git a/icons/action/icon38-disabled.png b/icons/action/icon38-disabled.png
new file mode 100644
index 00000000..ea69477f
Binary files /dev/null and b/icons/action/icon38-disabled.png differ
diff --git a/icons/action/icon64-default.png b/icons/action/icon64-default.png
new file mode 100644
index 00000000..6c70624d
Binary files /dev/null and b/icons/action/icon64-default.png differ
diff --git a/icons/action/icon64-disabled.png b/icons/action/icon64-disabled.png
new file mode 100644
index 00000000..a47a79de
Binary files /dev/null and b/icons/action/icon64-disabled.png differ
diff --git a/icons/action/mono/icon16-default.png b/icons/action/mono/icon16-default.png
new file mode 100644
index 00000000..82185c9a
Binary files /dev/null and b/icons/action/mono/icon16-default.png differ
diff --git a/icons/action/mono/icon16-disabled.png b/icons/action/mono/icon16-disabled.png
new file mode 100644
index 00000000..83375a9d
Binary files /dev/null and b/icons/action/mono/icon16-disabled.png differ
diff --git a/icons/action/mono/icon18-default.png b/icons/action/mono/icon18-default.png
new file mode 100644
index 00000000..71f24725
Binary files /dev/null and b/icons/action/mono/icon18-default.png differ
diff --git a/icons/action/mono/icon18-disabled.png b/icons/action/mono/icon18-disabled.png
new file mode 100644
index 00000000..6b6ad9ea
Binary files /dev/null and b/icons/action/mono/icon18-disabled.png differ
diff --git a/icons/action/mono/icon19-default.png b/icons/action/mono/icon19-default.png
new file mode 100644
index 00000000..a1bfac02
Binary files /dev/null and b/icons/action/mono/icon19-default.png differ
diff --git a/icons/action/mono/icon19-disabled.png b/icons/action/mono/icon19-disabled.png
new file mode 100644
index 00000000..445cff36
Binary files /dev/null and b/icons/action/mono/icon19-disabled.png differ
diff --git a/icons/action/mono/icon32-default.png b/icons/action/mono/icon32-default.png
new file mode 100644
index 00000000..b37c5477
Binary files /dev/null and b/icons/action/mono/icon32-default.png differ
diff --git a/icons/action/mono/icon32-disabled.png b/icons/action/mono/icon32-disabled.png
new file mode 100644
index 00000000..fdc141e3
Binary files /dev/null and b/icons/action/mono/icon32-disabled.png differ
diff --git a/icons/action/mono/icon36-default.png b/icons/action/mono/icon36-default.png
new file mode 100644
index 00000000..f85e5ef5
Binary files /dev/null and b/icons/action/mono/icon36-default.png differ
diff --git a/icons/action/mono/icon36-disabled.png b/icons/action/mono/icon36-disabled.png
new file mode 100644
index 00000000..40f2a944
Binary files /dev/null and b/icons/action/mono/icon36-disabled.png differ
diff --git a/icons/action/mono/icon38-default.png b/icons/action/mono/icon38-default.png
new file mode 100644
index 00000000..3d7a2dbf
Binary files /dev/null and b/icons/action/mono/icon38-default.png differ
diff --git a/icons/action/mono/icon38-disabled.png b/icons/action/mono/icon38-disabled.png
new file mode 100644
index 00000000..100bb48b
Binary files /dev/null and b/icons/action/mono/icon38-disabled.png differ
diff --git a/icons/action/mono/icon64-default.png b/icons/action/mono/icon64-default.png
new file mode 100644
index 00000000..672c7fab
Binary files /dev/null and b/icons/action/mono/icon64-default.png differ
diff --git a/icons/action/mono/icon64-disabled.png b/icons/action/mono/icon64-disabled.png
new file mode 100644
index 00000000..476d958f
Binary files /dev/null and b/icons/action/mono/icon64-disabled.png differ
diff --git a/icons/icon128.png b/icons/icon128.png
new file mode 100644
index 00000000..67a2f669
Binary files /dev/null and b/icons/icon128.png differ
diff --git a/icons/icon16.png b/icons/icon16.png
new file mode 100644
index 00000000..a50bbd1a
Binary files /dev/null and b/icons/icon16.png differ
diff --git a/icons/icon48.png b/icons/icon48.png
new file mode 100644
index 00000000..086c5549
Binary files /dev/null and b/icons/icon48.png differ
diff --git a/icons/icon96.png b/icons/icon96.png
new file mode 100644
index 00000000..130c90f6
Binary files /dev/null and b/icons/icon96.png differ
diff --git a/manifest.json b/manifest.json
index 8fd1c0d3..1178cc5f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -14,10 +14,10 @@
 
   "description": "__MSG_extensionDescription__",
   "icons": {
-    "16": "icons/enabled.svg",
-    "48": "icons/enabled.svg",
-    "96": "icons/enabled.svg",
-    "128": "icons/enabled.svg"
+    "16": "icons/icon16.png",
+    "48": "icons/icon48.png",
+    "96": "icons/icon96.png",
+    "128": "icons/icon128.png"
   },
 
   "permissions": [
@@ -37,13 +37,13 @@
 
   "browser_action": {
     "default_icon": {
-      "16": "icons/enabled.svg",
-      "18": "icons/enabled.svg",
-      "19": "icons/enabled.svg",
-      "32": "icons/enabled.svg",
-      "36": "icons/enabled.svg",
-      "38": "icons/enabled.svg",
-      "64": "icons/enabled.svg"
+      "16": "icons/action/icon16-default.png",
+      "18": "icons/action/icon18-default.png",
+      "19": "icons/action/icon19-default.png",
+      "32": "icons/action/icon32-default.png",
+      "36": "icons/action/icon36-default.png",
+      "38": "icons/action/icon38-default.png",
+      "64": "icons/action/icon64-default.png"
     },
     "default_popup": "pages/popup/popup.html",
     "browser_style": false