diff --git a/core/constants.js b/core/constants.js
index dc72eb19..573aff34 100644
--- a/core/constants.js
+++ b/core/constants.js
@@ -103,82 +103,62 @@ const BrowserType = {
 const IconType = {
     'Default': {
         'Enabled': {
-            '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')
+            '16': chrome.runtime.getURL('icons/action/default/icon16-default.png'),
+            '18': chrome.runtime.getURL('icons/action/default/icon18-default.png'),
+            '19': chrome.runtime.getURL('icons/action/default/icon19-default.png'),
+            '32': chrome.runtime.getURL('icons/action/default/icon32-default.png'),
+            '36': chrome.runtime.getURL('icons/action/default/icon36-default.png'),
+            '38': chrome.runtime.getURL('icons/action/default/icon38-default.png'),
+            '64': chrome.runtime.getURL('icons/action/default/icon64-default.png')
         },
         'Disabled': {
-            '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')
+            '16': chrome.runtime.getURL('icons/action/default/icon16-disabled.png'),
+            '18': chrome.runtime.getURL('icons/action/default/icon18-disabled.png'),
+            '19': chrome.runtime.getURL('icons/action/default/icon19-disabled.png'),
+            '32': chrome.runtime.getURL('icons/action/default/icon32-disabled.png'),
+            '36': chrome.runtime.getURL('icons/action/default/icon36-disabled.png'),
+            '38': chrome.runtime.getURL('icons/action/default/icon38-disabled.png'),
+            '64': chrome.runtime.getURL('icons/action/default/icon64-disabled.png')
         }
     },
     'Light': {
         'Enabled': {
-            '16': chrome.runtime.getURL('icons/action/brighter/icon16-default.png'),
-            '18': chrome.runtime.getURL('icons/action/brighter/icon18-default.png'),
-            '19': chrome.runtime.getURL('icons/action/brighter/icon19-default.png'),
-            '32': chrome.runtime.getURL('icons/action/brighter/icon32-default.png'),
-            '36': chrome.runtime.getURL('icons/action/brighter/icon36-default.png'),
-            '38': chrome.runtime.getURL('icons/action/brighter/icon38-default.png'),
-            '64': chrome.runtime.getURL('icons/action/brighter/icon64-default.png')
+            '16': chrome.runtime.getURL('icons/action/light/icon16-default.png'),
+            '18': chrome.runtime.getURL('icons/action/light/icon18-default.png'),
+            '19': chrome.runtime.getURL('icons/action/light/icon19-default.png'),
+            '32': chrome.runtime.getURL('icons/action/light/icon32-default.png'),
+            '36': chrome.runtime.getURL('icons/action/light/icon36-default.png'),
+            '38': chrome.runtime.getURL('icons/action/light/icon38-default.png'),
+            '64': chrome.runtime.getURL('icons/action/light/icon64-default.png')
         },
         'Disabled': {
-            '16': chrome.runtime.getURL('icons/action/brighter/icon16-disabled.png'),
-            '18': chrome.runtime.getURL('icons/action/brighter/icon18-disabled.png'),
-            '19': chrome.runtime.getURL('icons/action/brighter/icon19-disabled.png'),
-            '32': chrome.runtime.getURL('icons/action/brighter/icon32-disabled.png'),
-            '36': chrome.runtime.getURL('icons/action/brighter/icon36-disabled.png'),
-            '38': chrome.runtime.getURL('icons/action/brighter/icon38-disabled.png'),
-            '64': chrome.runtime.getURL('icons/action/brighter/icon64-disabled.png')
+            '16': chrome.runtime.getURL('icons/action/light/icon16-disabled.png'),
+            '18': chrome.runtime.getURL('icons/action/light/icon18-disabled.png'),
+            '19': chrome.runtime.getURL('icons/action/light/icon19-disabled.png'),
+            '32': chrome.runtime.getURL('icons/action/light/icon32-disabled.png'),
+            '36': chrome.runtime.getURL('icons/action/light/icon36-disabled.png'),
+            '38': chrome.runtime.getURL('icons/action/light/icon38-disabled.png'),
+            '64': chrome.runtime.getURL('icons/action/light/icon64-disabled.png')
         }
     },
-    'Monochrome': {
+    'Grey': {
         'Enabled': {
-            '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')
+            '16': chrome.runtime.getURL('icons/action/grey/icon16-default.png'),
+            '18': chrome.runtime.getURL('icons/action/grey/icon18-default.png'),
+            '19': chrome.runtime.getURL('icons/action/grey/icon19-default.png'),
+            '32': chrome.runtime.getURL('icons/action/grey/icon32-default.png'),
+            '36': chrome.runtime.getURL('icons/action/grey/icon36-default.png'),
+            '38': chrome.runtime.getURL('icons/action/grey/icon38-default.png'),
+            '64': chrome.runtime.getURL('icons/action/grey/icon64-default.png')
         },
         'Disabled': {
-            '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')
-        }
-    },
-    'Shield': {
-        'Enabled': {
-            '16': chrome.runtime.getURL('icons/action/shield/icon16-default.png'),
-            '18': chrome.runtime.getURL('icons/action/shield/icon18-default.png'),
-            '19': chrome.runtime.getURL('icons/action/shield/icon19-default.png'),
-            '32': chrome.runtime.getURL('icons/action/shield/icon32-default.png'),
-            '36': chrome.runtime.getURL('icons/action/shield/icon36-default.png'),
-            '38': chrome.runtime.getURL('icons/action/shield/icon38-default.png'),
-            '64': chrome.runtime.getURL('icons/action/shield/icon64-default.png')
-        },
-        'Disabled': {
-            '16': chrome.runtime.getURL('icons/action/shield/icon16-disabled.png'),
-            '18': chrome.runtime.getURL('icons/action/shield/icon18-disabled.png'),
-            '19': chrome.runtime.getURL('icons/action/shield/icon19-disabled.png'),
-            '32': chrome.runtime.getURL('icons/action/shield/icon32-disabled.png'),
-            '36': chrome.runtime.getURL('icons/action/shield/icon36-disabled.png'),
-            '38': chrome.runtime.getURL('icons/action/shield/icon38-disabled.png'),
-            '64': chrome.runtime.getURL('icons/action/shield/icon64-disabled.png')
+            '16': chrome.runtime.getURL('icons/action/grey/icon16-disabled.png'),
+            '18': chrome.runtime.getURL('icons/action/grey/icon18-disabled.png'),
+            '19': chrome.runtime.getURL('icons/action/grey/icon19-disabled.png'),
+            '32': chrome.runtime.getURL('icons/action/grey/icon32-disabled.png'),
+            '36': chrome.runtime.getURL('icons/action/grey/icon36-disabled.png'),
+            '38': chrome.runtime.getURL('icons/action/grey/icon38-disabled.png'),
+            '64': chrome.runtime.getURL('icons/action/grey/icon64-disabled.png')
         }
     }
 };
diff --git a/icons/action/icon16-default.png b/icons/action/default/icon16-default.png
similarity index 100%
rename from icons/action/icon16-default.png
rename to icons/action/default/icon16-default.png
diff --git a/icons/action/icon16-disabled.png b/icons/action/default/icon16-disabled.png
similarity index 100%
rename from icons/action/icon16-disabled.png
rename to icons/action/default/icon16-disabled.png
diff --git a/icons/action/icon18-default.png b/icons/action/default/icon18-default.png
similarity index 100%
rename from icons/action/icon18-default.png
rename to icons/action/default/icon18-default.png
diff --git a/icons/action/icon18-disabled.png b/icons/action/default/icon18-disabled.png
similarity index 100%
rename from icons/action/icon18-disabled.png
rename to icons/action/default/icon18-disabled.png
diff --git a/icons/action/icon19-default.png b/icons/action/default/icon19-default.png
similarity index 100%
rename from icons/action/icon19-default.png
rename to icons/action/default/icon19-default.png
diff --git a/icons/action/icon19-disabled.png b/icons/action/default/icon19-disabled.png
similarity index 100%
rename from icons/action/icon19-disabled.png
rename to icons/action/default/icon19-disabled.png
diff --git a/icons/action/icon32-default.png b/icons/action/default/icon32-default.png
similarity index 100%
rename from icons/action/icon32-default.png
rename to icons/action/default/icon32-default.png
diff --git a/icons/action/icon32-disabled.png b/icons/action/default/icon32-disabled.png
similarity index 100%
rename from icons/action/icon32-disabled.png
rename to icons/action/default/icon32-disabled.png
diff --git a/icons/action/icon36-default.png b/icons/action/default/icon36-default.png
similarity index 100%
rename from icons/action/icon36-default.png
rename to icons/action/default/icon36-default.png
diff --git a/icons/action/icon36-disabled.png b/icons/action/default/icon36-disabled.png
similarity index 100%
rename from icons/action/icon36-disabled.png
rename to icons/action/default/icon36-disabled.png
diff --git a/icons/action/icon38-default.png b/icons/action/default/icon38-default.png
similarity index 100%
rename from icons/action/icon38-default.png
rename to icons/action/default/icon38-default.png
diff --git a/icons/action/icon38-disabled.png b/icons/action/default/icon38-disabled.png
similarity index 100%
rename from icons/action/icon38-disabled.png
rename to icons/action/default/icon38-disabled.png
diff --git a/icons/action/icon64-default.png b/icons/action/default/icon64-default.png
similarity index 100%
rename from icons/action/icon64-default.png
rename to icons/action/default/icon64-default.png
diff --git a/icons/action/icon64-disabled.png b/icons/action/default/icon64-disabled.png
similarity index 100%
rename from icons/action/icon64-disabled.png
rename to icons/action/default/icon64-disabled.png
diff --git a/icons/action/grey/icon16-default.png b/icons/action/grey/icon16-default.png
new file mode 100644
index 00000000..bca4f699
Binary files /dev/null and b/icons/action/grey/icon16-default.png differ
diff --git a/icons/action/grey/icon16-disabled.png b/icons/action/grey/icon16-disabled.png
new file mode 100644
index 00000000..6dc35d8c
Binary files /dev/null and b/icons/action/grey/icon16-disabled.png differ
diff --git a/icons/action/grey/icon18-default.png b/icons/action/grey/icon18-default.png
new file mode 100644
index 00000000..40d379a6
Binary files /dev/null and b/icons/action/grey/icon18-default.png differ
diff --git a/icons/action/grey/icon18-disabled.png b/icons/action/grey/icon18-disabled.png
new file mode 100644
index 00000000..8ef8b080
Binary files /dev/null and b/icons/action/grey/icon18-disabled.png differ
diff --git a/icons/action/grey/icon19-default.png b/icons/action/grey/icon19-default.png
new file mode 100644
index 00000000..415b37c6
Binary files /dev/null and b/icons/action/grey/icon19-default.png differ
diff --git a/icons/action/grey/icon19-disabled.png b/icons/action/grey/icon19-disabled.png
new file mode 100644
index 00000000..435433e8
Binary files /dev/null and b/icons/action/grey/icon19-disabled.png differ
diff --git a/icons/action/grey/icon32-default.png b/icons/action/grey/icon32-default.png
new file mode 100644
index 00000000..f53d69b6
Binary files /dev/null and b/icons/action/grey/icon32-default.png differ
diff --git a/icons/action/grey/icon32-disabled.png b/icons/action/grey/icon32-disabled.png
new file mode 100644
index 00000000..7608deeb
Binary files /dev/null and b/icons/action/grey/icon32-disabled.png differ
diff --git a/icons/action/grey/icon36-default.png b/icons/action/grey/icon36-default.png
new file mode 100644
index 00000000..0bb0a1bd
Binary files /dev/null and b/icons/action/grey/icon36-default.png differ
diff --git a/icons/action/grey/icon36-disabled.png b/icons/action/grey/icon36-disabled.png
new file mode 100644
index 00000000..872b51fc
Binary files /dev/null and b/icons/action/grey/icon36-disabled.png differ
diff --git a/icons/action/grey/icon38-default.png b/icons/action/grey/icon38-default.png
new file mode 100644
index 00000000..9e7b2a6a
Binary files /dev/null and b/icons/action/grey/icon38-default.png differ
diff --git a/icons/action/grey/icon38-disabled.png b/icons/action/grey/icon38-disabled.png
new file mode 100644
index 00000000..a9931b11
Binary files /dev/null and b/icons/action/grey/icon38-disabled.png differ
diff --git a/icons/action/grey/icon64-default.png b/icons/action/grey/icon64-default.png
new file mode 100644
index 00000000..cec840eb
Binary files /dev/null and b/icons/action/grey/icon64-default.png differ
diff --git a/icons/action/grey/icon64-disabled.png b/icons/action/grey/icon64-disabled.png
new file mode 100644
index 00000000..ebab5e78
Binary files /dev/null and b/icons/action/grey/icon64-disabled.png differ
diff --git a/icons/action/brighter/icon128.png b/icons/action/light/icon128.png
similarity index 100%
rename from icons/action/brighter/icon128.png
rename to icons/action/light/icon128.png
diff --git a/icons/action/brighter/icon16-default.png b/icons/action/light/icon16-default.png
similarity index 100%
rename from icons/action/brighter/icon16-default.png
rename to icons/action/light/icon16-default.png
diff --git a/icons/action/brighter/icon16-disabled.png b/icons/action/light/icon16-disabled.png
similarity index 100%
rename from icons/action/brighter/icon16-disabled.png
rename to icons/action/light/icon16-disabled.png
diff --git a/icons/action/brighter/icon16.png b/icons/action/light/icon16.png
similarity index 100%
rename from icons/action/brighter/icon16.png
rename to icons/action/light/icon16.png
diff --git a/icons/action/brighter/icon18-default.png b/icons/action/light/icon18-default.png
similarity index 100%
rename from icons/action/brighter/icon18-default.png
rename to icons/action/light/icon18-default.png
diff --git a/icons/action/brighter/icon18-disabled.png b/icons/action/light/icon18-disabled.png
similarity index 100%
rename from icons/action/brighter/icon18-disabled.png
rename to icons/action/light/icon18-disabled.png
diff --git a/icons/action/brighter/icon19-default.png b/icons/action/light/icon19-default.png
similarity index 100%
rename from icons/action/brighter/icon19-default.png
rename to icons/action/light/icon19-default.png
diff --git a/icons/action/brighter/icon19-disabled.png b/icons/action/light/icon19-disabled.png
similarity index 100%
rename from icons/action/brighter/icon19-disabled.png
rename to icons/action/light/icon19-disabled.png
diff --git a/icons/action/brighter/icon32-default.png b/icons/action/light/icon32-default.png
similarity index 100%
rename from icons/action/brighter/icon32-default.png
rename to icons/action/light/icon32-default.png
diff --git a/icons/action/brighter/icon32-disabled.png b/icons/action/light/icon32-disabled.png
similarity index 100%
rename from icons/action/brighter/icon32-disabled.png
rename to icons/action/light/icon32-disabled.png
diff --git a/icons/action/brighter/icon36-default.png b/icons/action/light/icon36-default.png
similarity index 100%
rename from icons/action/brighter/icon36-default.png
rename to icons/action/light/icon36-default.png
diff --git a/icons/action/brighter/icon36-disabled.png b/icons/action/light/icon36-disabled.png
similarity index 100%
rename from icons/action/brighter/icon36-disabled.png
rename to icons/action/light/icon36-disabled.png
diff --git a/icons/action/brighter/icon38-default.png b/icons/action/light/icon38-default.png
similarity index 100%
rename from icons/action/brighter/icon38-default.png
rename to icons/action/light/icon38-default.png
diff --git a/icons/action/brighter/icon38-disabled.png b/icons/action/light/icon38-disabled.png
similarity index 100%
rename from icons/action/brighter/icon38-disabled.png
rename to icons/action/light/icon38-disabled.png
diff --git a/icons/action/brighter/icon48.png b/icons/action/light/icon48.png
similarity index 100%
rename from icons/action/brighter/icon48.png
rename to icons/action/light/icon48.png
diff --git a/icons/action/brighter/icon64-default.png b/icons/action/light/icon64-default.png
similarity index 100%
rename from icons/action/brighter/icon64-default.png
rename to icons/action/light/icon64-default.png
diff --git a/icons/action/brighter/icon64-disabled.png b/icons/action/light/icon64-disabled.png
similarity index 100%
rename from icons/action/brighter/icon64-disabled.png
rename to icons/action/light/icon64-disabled.png
diff --git a/icons/action/brighter/icon96.png b/icons/action/light/icon96.png
similarity index 100%
rename from icons/action/brighter/icon96.png
rename to icons/action/light/icon96.png
diff --git a/icons/action/mono/icon16-default.png b/icons/action/mono/icon16-default.png
deleted file mode 100644
index 82185c9a..00000000
Binary files a/icons/action/mono/icon16-default.png and /dev/null differ
diff --git a/icons/action/mono/icon16-disabled.png b/icons/action/mono/icon16-disabled.png
deleted file mode 100644
index 83375a9d..00000000
Binary files a/icons/action/mono/icon16-disabled.png and /dev/null differ
diff --git a/icons/action/mono/icon18-default.png b/icons/action/mono/icon18-default.png
deleted file mode 100644
index 71f24725..00000000
Binary files a/icons/action/mono/icon18-default.png and /dev/null differ
diff --git a/icons/action/mono/icon18-disabled.png b/icons/action/mono/icon18-disabled.png
deleted file mode 100644
index 6b6ad9ea..00000000
Binary files a/icons/action/mono/icon18-disabled.png and /dev/null differ
diff --git a/icons/action/mono/icon19-default.png b/icons/action/mono/icon19-default.png
deleted file mode 100644
index a1bfac02..00000000
Binary files a/icons/action/mono/icon19-default.png and /dev/null differ
diff --git a/icons/action/mono/icon19-disabled.png b/icons/action/mono/icon19-disabled.png
deleted file mode 100644
index 445cff36..00000000
Binary files a/icons/action/mono/icon19-disabled.png and /dev/null differ
diff --git a/icons/action/mono/icon32-default.png b/icons/action/mono/icon32-default.png
deleted file mode 100644
index b37c5477..00000000
Binary files a/icons/action/mono/icon32-default.png and /dev/null differ
diff --git a/icons/action/mono/icon32-disabled.png b/icons/action/mono/icon32-disabled.png
deleted file mode 100644
index fdc141e3..00000000
Binary files a/icons/action/mono/icon32-disabled.png and /dev/null differ
diff --git a/icons/action/mono/icon36-default.png b/icons/action/mono/icon36-default.png
deleted file mode 100644
index f85e5ef5..00000000
Binary files a/icons/action/mono/icon36-default.png and /dev/null differ
diff --git a/icons/action/mono/icon36-disabled.png b/icons/action/mono/icon36-disabled.png
deleted file mode 100644
index 40f2a944..00000000
Binary files a/icons/action/mono/icon36-disabled.png and /dev/null differ
diff --git a/icons/action/mono/icon38-default.png b/icons/action/mono/icon38-default.png
deleted file mode 100644
index 3d7a2dbf..00000000
Binary files a/icons/action/mono/icon38-default.png and /dev/null differ
diff --git a/icons/action/mono/icon38-disabled.png b/icons/action/mono/icon38-disabled.png
deleted file mode 100644
index 100bb48b..00000000
Binary files a/icons/action/mono/icon38-disabled.png and /dev/null differ
diff --git a/icons/action/mono/icon64-default.png b/icons/action/mono/icon64-default.png
deleted file mode 100644
index 672c7fab..00000000
Binary files a/icons/action/mono/icon64-default.png and /dev/null differ
diff --git a/icons/action/mono/icon64-disabled.png b/icons/action/mono/icon64-disabled.png
deleted file mode 100644
index 476d958f..00000000
Binary files a/icons/action/mono/icon64-disabled.png and /dev/null differ
diff --git a/icons/action/shield/disabled.svg b/icons/action/shield/disabled.svg
deleted file mode 100644
index 21f44396..00000000
--- a/icons/action/shield/disabled.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Capa_1"
-   x="0px"
-   y="0px"
-   width="910.288px"
-   height="910.287px"
-   viewBox="0 0 910.288 910.287"
-   style="enable-background:new 0 0 910.288 910.287;"
-   xml:space="preserve"
-   sodipodi:docname="disabled.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
-   id="metadata45"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs43" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1680"
-   inkscape:window-height="997"
-   id="namedview41"
-   showgrid="false"
-   inkscape:zoom="0.7332949"
-   inkscape:cx="222.40895"
-   inkscape:cy="483.7236"
-   inkscape:window-x="0"
-   inkscape:window-y="25"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g6" />
-<g
-   id="g8">
-	<g
-   id="g6">
-		<path
-   d="M873.206,202.06l-1.212-28.51l-28.386-2.915c-109.036-11.198-202.773-51.887-262.21-84.049    c-65.099-35.226-104.56-68.274-104.922-68.579L455.165,0L433.84,17.981c-0.392,0.33-39.853,33.379-104.951,68.604    c-59.437,32.162-153.173,72.851-262.209,84.049l-28.387,2.915l-1.212,28.51c-0.217,5.104-4.777,126.698,42.059,273.937    c27.637,86.887,67.549,164.736,118.627,231.396c64.139,83.701,145.948,149.68,243.155,196.102l14.221,6.793l14.221-6.793    c97.207-46.422,179.017-112.398,243.155-196.102c51.079-66.658,90.991-144.51,118.628-231.395    C877.982,328.759,873.423,207.165,873.206,202.06z M455.143,836.93c-81.095-41.209-149.731-97.887-204.194-168.646    c-46.393-60.275-82.812-130.998-108.248-210.201c-31.088-96.808-38.06-183.144-39.471-225.538    c43.735-6.494,87.949-17.421,131.833-32.597c42.9-14.836,85.598-33.752,126.907-56.221c41.915-22.798,73.81-44.573,93.172-58.812    c19.362,14.238,51.258,36.014,93.173,58.812c41.309,22.47,84.007,41.385,126.907,56.221    c43.896,15.181,88.123,26.108,131.87,32.602c-1.359,41.978-8.194,127.098-38.842,223.443    c-25.317,79.594-61.694,150.672-108.12,211.258C605.537,738.494,536.632,795.52,455.143,836.93z"
-   id="path2"
-   style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
-		<polygon
-   points="635.013,305.016 588.969,351.06 417.368,522.662 330.399,435.693 318.573,423.867 295.239,447.201     295.239,447.202 271.904,470.537 417.368,616 681.682,351.686   "
-   id="polygon4"
-   style="fill:#ffffff" />
-	<path
-   style="fill:#aa0000;fill-opacity:1;stroke:#100000;stroke-width:0;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   d="M 433.97892,824.49841 C 297.17439,748.4211 198.50447,624.48159 144.7895,461.24698 124.34918,399.13083 109.3784,320.83672 105.48016,255.6673 l -1.34037,-22.40795 19.88299,-3.36397 c 98.54835,-16.67322 208.47033,-61.97362 303.83213,-125.21349 14.6928,-9.743646 27.27675,-17.499645 27.96432,-17.235558 0.68758,0.264087 14.26802,9.044315 30.17875,19.511618 93.97036,61.8209 203.17558,106.4794 300.85782,123.0331 l 19.28601,3.2683 -1.36883,23.28212 c -3.66774,62.38446 -18.52858,140.76356 -38.22837,201.62437 -17.48578,54.02088 -46.03053,116.23668 -73.23465,159.6215 -37.36078,59.58257 -86.83522,114.3587 -142.70474,157.99701 -17.31225,13.52216 -59.31627,40.85246 -79.1722,51.51408 l -16.49351,8.85621 z"
-   id="path852"
-   inkscape:connector-curvature="0"
-   sodipodi:nodetypes="ssscsscsscssssccs" /></g>
-<path
-   inkscape:connector-curvature="0"
-   style="fill:#ffffff;fill-opacity:1;stroke-width:27.71558189"
-   d="m 621.74236,350.25391 -61.75027,-61.72262 c 0,0 -98.44574,104.84801 -104.84807,104.84801 -6.43,0 -104.90345,-104.84801 -104.90345,-104.84801 l -61.72262,61.75033 c 0,0 104.84802,96.25618 104.84802,104.95889 0,8.61956 -104.84802,104.87573 -104.84802,104.87573 l 61.72262,61.63946 c 0,0 97.6697,-104.8203 104.90345,-104.8203 7.2338,0 104.84807,104.8203 104.84807,104.8203 l 61.77799,-61.63946 c 0,0 -104.90345,-97.86367 -104.90345,-104.87573 -0.028,-7.23375 104.87573,-104.9866 104.87573,-104.9866 z"
-   id="path4" /></g>
-<g
-   id="g10">
-</g>
-<g
-   id="g12">
-</g>
-<g
-   id="g14">
-</g>
-<g
-   id="g16">
-</g>
-<g
-   id="g18">
-</g>
-<g
-   id="g20">
-</g>
-<g
-   id="g22">
-</g>
-<g
-   id="g24">
-</g>
-<g
-   id="g26">
-</g>
-<g
-   id="g28">
-</g>
-<g
-   id="g30">
-</g>
-<g
-   id="g32">
-</g>
-<g
-   id="g34">
-</g>
-<g
-   id="g36">
-</g>
-<g
-   id="g38">
-</g>
-</svg>
\ No newline at end of file
diff --git a/icons/action/shield/enabled.svg b/icons/action/shield/enabled.svg
deleted file mode 100644
index ae3ed71a..00000000
--- a/icons/action/shield/enabled.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="Capa_1"
-   x="0px"
-   y="0px"
-   width="910.288px"
-   height="910.287px"
-   viewBox="0 0 910.288 910.287"
-   style="enable-background:new 0 0 910.288 910.287;"
-   xml:space="preserve"
-   sodipodi:docname="enabled.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"><metadata
-   id="metadata45"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
-   id="defs43" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1680"
-   inkscape:window-height="997"
-   id="namedview41"
-   showgrid="false"
-   inkscape:zoom="0.51851779"
-   inkscape:cx="35.868776"
-   inkscape:cy="273.48433"
-   inkscape:window-x="0"
-   inkscape:window-y="25"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g6" />
-<g
-   id="g8">
-	<g
-   id="g6">
-		<path
-   d="M873.206,202.06l-1.212-28.51l-28.386-2.915c-109.036-11.198-202.773-51.887-262.21-84.049    c-65.099-35.226-104.56-68.274-104.922-68.579L455.165,0L433.84,17.981c-0.392,0.33-39.853,33.379-104.951,68.604    c-59.437,32.162-153.173,72.851-262.209,84.049l-28.387,2.915l-1.212,28.51c-0.217,5.104-4.777,126.698,42.059,273.937    c27.637,86.887,67.549,164.736,118.627,231.396c64.139,83.701,145.948,149.68,243.155,196.102l14.221,6.793l14.221-6.793    c97.207-46.422,179.017-112.398,243.155-196.102c51.079-66.658,90.991-144.51,118.628-231.395    C877.982,328.759,873.423,207.165,873.206,202.06z M455.143,836.93c-81.095-41.209-149.731-97.887-204.194-168.646    c-46.393-60.275-82.812-130.998-108.248-210.201c-31.088-96.808-38.06-183.144-39.471-225.538    c43.735-6.494,87.949-17.421,131.833-32.597c42.9-14.836,85.598-33.752,126.907-56.221c41.915-22.798,73.81-44.573,93.172-58.812    c19.362,14.238,51.258,36.014,93.173,58.812c41.309,22.47,84.007,41.385,126.907,56.221    c43.896,15.181,88.123,26.108,131.87,32.602c-1.359,41.978-8.194,127.098-38.842,223.443    c-25.317,79.594-61.694,150.672-108.12,211.258C605.537,738.494,536.632,795.52,455.143,836.93z"
-   id="path2"
-   style="fill:#ffffff;stroke:#000000;stroke-opacity:1" />
-		<polygon
-   points="635.013,305.016 588.969,351.06 417.368,522.662 330.399,435.693 318.573,423.867 295.239,447.201     295.239,447.202 271.904,470.537 417.368,616 681.682,351.686   "
-   id="polygon4"
-   style="fill:#ffffff" />
-	<path
-   style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1.45781982;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-   d="M 433.97892,824.49841 C 297.17439,748.4211 198.50447,624.48159 144.7895,461.24698 124.34918,399.13083 109.3784,320.83672 105.48016,255.6673 l -1.34037,-22.40795 19.88299,-3.36397 c 98.54835,-16.67322 208.47033,-61.97362 303.83213,-125.21349 14.6928,-9.743646 27.27675,-17.499645 27.96432,-17.235558 0.68758,0.264087 14.26802,9.044315 30.17875,19.511618 93.97036,61.8209 203.17558,106.4794 300.85782,123.0331 l 19.28601,3.2683 -1.36883,23.28212 c -3.66774,62.38446 -18.52858,140.76356 -38.22837,201.62437 -17.48578,54.02088 -46.03053,116.23668 -73.23465,159.6215 -37.36078,59.58257 -86.83522,114.3587 -142.70474,157.99701 -17.31225,13.52216 -59.31627,40.85246 -79.1722,51.51408 l -16.49351,8.85621 z M 550.59337,484.26429 682.67829,352.1688 658.60591,328.03848 634.5335,303.90814 526.03744,412.39146 417.54139,520.87477 l -49.17515,-49.14678 -49.17515,-49.14678 -24.12434,24.06643 -24.12435,24.06643 72.80394,72.82284 c 40.04217,40.05257 73.24452,72.82286 73.78302,72.82286 0.53849,0 60.41731,-59.44297 133.06401,-132.09548 z"
-   id="path852"
-   inkscape:connector-curvature="0" /></g>
-</g>
-<g
-   id="g10">
-</g>
-<g
-   id="g12">
-</g>
-<g
-   id="g14">
-</g>
-<g
-   id="g16">
-</g>
-<g
-   id="g18">
-</g>
-<g
-   id="g20">
-</g>
-<g
-   id="g22">
-</g>
-<g
-   id="g24">
-</g>
-<g
-   id="g26">
-</g>
-<g
-   id="g28">
-</g>
-<g
-   id="g30">
-</g>
-<g
-   id="g32">
-</g>
-<g
-   id="g34">
-</g>
-<g
-   id="g36">
-</g>
-<g
-   id="g38">
-</g>
-</svg>
\ No newline at end of file
diff --git a/icons/action/shield/icon16-default.png b/icons/action/shield/icon16-default.png
deleted file mode 100644
index cb3a324c..00000000
Binary files a/icons/action/shield/icon16-default.png and /dev/null differ
diff --git a/icons/action/shield/icon16-disabled.png b/icons/action/shield/icon16-disabled.png
deleted file mode 100644
index 65d4ce4c..00000000
Binary files a/icons/action/shield/icon16-disabled.png and /dev/null differ
diff --git a/icons/action/shield/icon18-default.png b/icons/action/shield/icon18-default.png
deleted file mode 100644
index beaa7d94..00000000
Binary files a/icons/action/shield/icon18-default.png and /dev/null differ
diff --git a/icons/action/shield/icon18-disabled.png b/icons/action/shield/icon18-disabled.png
deleted file mode 100644
index b1a65981..00000000
Binary files a/icons/action/shield/icon18-disabled.png and /dev/null differ
diff --git a/icons/action/shield/icon19-default.png b/icons/action/shield/icon19-default.png
deleted file mode 100644
index a0769308..00000000
Binary files a/icons/action/shield/icon19-default.png and /dev/null differ
diff --git a/icons/action/shield/icon19-disabled.png b/icons/action/shield/icon19-disabled.png
deleted file mode 100644
index 6f6d3b84..00000000
Binary files a/icons/action/shield/icon19-disabled.png and /dev/null differ
diff --git a/icons/action/shield/icon32-default.png b/icons/action/shield/icon32-default.png
deleted file mode 100644
index 2771acf0..00000000
Binary files a/icons/action/shield/icon32-default.png and /dev/null differ
diff --git a/icons/action/shield/icon32-disabled.png b/icons/action/shield/icon32-disabled.png
deleted file mode 100644
index fc84f58c..00000000
Binary files a/icons/action/shield/icon32-disabled.png and /dev/null differ
diff --git a/icons/action/shield/icon36-default.png b/icons/action/shield/icon36-default.png
deleted file mode 100644
index 3e56833c..00000000
Binary files a/icons/action/shield/icon36-default.png and /dev/null differ
diff --git a/icons/action/shield/icon36-disabled.png b/icons/action/shield/icon36-disabled.png
deleted file mode 100644
index 7219ee0e..00000000
Binary files a/icons/action/shield/icon36-disabled.png and /dev/null differ
diff --git a/icons/action/shield/icon38-default.png b/icons/action/shield/icon38-default.png
deleted file mode 100644
index 8a205067..00000000
Binary files a/icons/action/shield/icon38-default.png and /dev/null differ
diff --git a/icons/action/shield/icon38-disabled.png b/icons/action/shield/icon38-disabled.png
deleted file mode 100644
index ad1dd5f3..00000000
Binary files a/icons/action/shield/icon38-disabled.png and /dev/null differ
diff --git a/icons/action/shield/icon64-default.png b/icons/action/shield/icon64-default.png
deleted file mode 100644
index 4cbdfc47..00000000
Binary files a/icons/action/shield/icon64-default.png and /dev/null differ
diff --git a/icons/action/shield/icon64-disabled.png b/icons/action/shield/icon64-disabled.png
deleted file mode 100644
index e360b584..00000000
Binary files a/icons/action/shield/icon64-disabled.png and /dev/null differ
diff --git a/manifest.json b/manifest.json
index 1178cc5f..b2ce4fb9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -37,13 +37,13 @@
 
   "browser_action": {
     "default_icon": {
-      "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"
+      "16": "icons/action/default/icon16-default.png",
+      "18": "icons/action/default/icon18-default.png",
+      "19": "icons/action/default/icon19-default.png",
+      "32": "icons/action/default/icon32-default.png",
+      "36": "icons/action/default/icon36-default.png",
+      "38": "icons/action/default/icon38-default.png",
+      "64": "icons/action/default/icon64-default.png"
     },
     "default_popup": "pages/popup/popup.html",
     "browser_style": false