diff --git a/doc/img/icon38.png b/doc/img/icon38.png
index a4cca911e..eb4b322c0 100644
Binary files a/doc/img/icon38.png and b/doc/img/icon38.png differ
diff --git a/doc/img/icon38@2x.png b/doc/img/icon38@2x.png
index 006d5ceb5..18c5703f7 100644
Binary files a/doc/img/icon38@2x.png and b/doc/img/icon38@2x.png differ
diff --git a/doc/img/ublock-16.svg b/doc/img/ublock-16.svg
index 1e5198d57..381743023 100644
--- a/doc/img/ublock-16.svg
+++ b/doc/img/ublock-16.svg
@@ -8,86 +8,60 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
    width="16"
    height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="ublock.svg"
-   inkscape:export-filename="/home/rhill/permahome/workshop/ublock/src/img/icon_16.png"
-   inkscape:export-xdpi="11.25"
-   inkscape:export-ydpi="11.25">
+   id="svg2">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
+       id="linearGradient6915">
+      <stop
+         id="stop6917"
+         style="stop-color:#600000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6919"
+         style="stop-color:#700000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6898">
+      <stop
+         id="stop6900"
+         style="stop-color:#90000f;stop-opacity:0.94117647"
+         offset="0" />
+      <stop
+         id="stop6902"
+         style="stop-color:#800000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient3770">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3772" />
+         id="stop3772"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3774" />
+         id="stop3774"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <inkscape:path-effect
-       is_visible="true"
-       id="path-effect3995"
-       effect="spiro" />
+       effect="spiro"
+       id="path-effect3995" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770"
-       id="radialGradient3776"
        cx="82.145424"
        cy="81.055199"
+       r="22.573322"
        fx="82.145424"
        fy="81.055199"
-       r="22.573322"
-       gradientTransform="matrix(1,0,0,1.2584318,0,-20.947238)"
-       gradientUnits="userSpaceOnUse" />
+       id="radialGradient3776"
+       xlink:href="#linearGradient3770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.2584318,0,-20.947238)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#404040"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="96.285877"
-     inkscape:cy="-28.655974"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1712"
-     inkscape:window-height="977"
-     inkscape:window-x="65"
-     inkscape:window-y="78"
-     inkscape:window-maximized="0"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:snap-bbox="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showborder="true"
-     inkscape:showpageshadow="false"
-     borderlayer="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3059"
-       empspacing="8"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="false"
-       originx="5.6216273e-07px"
-       originy="-112px" />
-  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -98,59 +72,68 @@
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
         <dc:description>Use gray 50% for the &quot;off&quot; color</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-nc/3.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-nc/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:prohibits
+           rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="polygon"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline"
-     transform="translate(-17.872547,-17.32535)">
+     transform="translate(0,-112)"
+     id="layer3"
+     style="display:inline">
     <g
-       id="g2994"
-       transform="matrix(0.125,0,0,0.12500001,15.638479,15.159681)">
-      <path
-         inkscape:export-ydpi="26.719999"
-         inkscape:export-xdpi="26.719999"
-         inkscape:export-filename="/home/rhill/permahome/workshop/ublock/platform/chromium/img/browsericons/icon38-off.png"
-         sodipodi:nodetypes="ccccccccc"
-         style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:3.00001287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         d="m 19.372554,54.107612 0,54.435488 35.282255,35.28224 54.435491,0 35.28224,-35.28224 0,-54.435488 -35.28224,-35.282256 -54.435491,0 z"
-         id="path3788"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 88.872548,109.28932 c -2.33536,0.62477 -5.419966,1.28699 -9.253809,1.9866 -3.833933,0.69963 -8.270034,1.04943 -13.308315,1.04943 -4.38098,0 -8.068352,-0.68061 -11.062127,-2.04184 -2.993817,-1.36123 -5.403228,-3.28785 -7.228237,-5.77986 -1.825036,-2.49202 -3.139211,-5.43065 -3.942523,-8.815917 -0.803333,-3.385234 -1.204993,-7.141079 -1.204984,-11.267545 l 0,-34.094835 10.184711,0 0,31.760793 c -1.8e-5,7.392936 1.095219,12.685208 3.285714,15.876836 2.190452,3.191648 5.878381,4.787468 11.063798,4.787458 1.094091,1e-5 2.225539,-0.0387 3.394347,-0.11582 1.168737,-0.0772 2.263974,-0.174 3.285715,-0.29041 1.02166,-0.1164 1.952557,-0.2334 2.79269,-0.35101 0.840048,-0.11758 1.442818,-0.25358 1.808313,-0.40801 l 0,-51.259838 10.184707,0 z"
-         style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.99999976;stroke-miterlimit:4;stroke-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-         id="path2993"
-         inkscape:connector-curvature="0" />
-      <text
-         xml:space="preserve"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Ubuntu"
-         x="113.37255"
-         y="107.82535"
-         id="text2992"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           id="tspan2994"
-           x="113.37255"
-           y="107.82535" /></text>
-      <path
-         sodipodi:type="arc"
-         style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:3.31231523;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-         id="path2996"
-         sodipodi:cx="98"
-         sodipodi:cy="90"
-         sodipodi:rx="6.0000024"
-         sodipodi:ry="10"
-         d="m 104,90 c 0,5.522847 -2.68629,10 -6,10 -3.31371,0 -6.000002,-4.477153 -6.000002,-10 0,-5.522847 2.686292,-10 6.000002,-10 3.31371,0 6,4.477153 6,10 z"
-         transform="matrix(2.9166656,0,0,2,-185.46068,-90.674651)" />
-    </g>
+       transform="matrix(0.6778654,0,0,0.56141828,-241.07537,-247.27712)"
+       id="g5639"
+       style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:1.62100744;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
   </g>
   <g
-     inkscape:groupmode="layer"
+     transform="translate(-17.872548,-129.32535)"
      id="layer5"
-     inkscape:label="text"
-     style="display:inline"
-     transform="translate(-17.872547,-17.32535)" />
+     style="display:inline">
+    <g
+       transform="matrix(0.125,0,0,0.12562955,15.638479,127.10848)"
+       id="g3824">
+      <g
+         transform="matrix(-0.6945203,0,0,0.56109687,392.90219,-230.10412)"
+         id="g6907"
+         style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline">
+        <path
+           d="m 447.83376,669.09921 c -80.63119,-57.03115 -80.63119,-128.32009 -80.63119,-199.60903 34.55623,0 46.07497,0 80.63119,-28.51558 m 0,228.12461 c 80.6312,-57.03115 80.6312,-128.32009 80.6312,-199.60903 -34.55623,0 -46.07497,0 -80.6312,-28.51558"
+           id="path6909"
+           style="fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <ellipse
+         cx="102.12254"
+         cy="81.325356"
+         rx="11.999999"
+         ry="12"
+         transform="matrix(1.3333335,0,0,1.3333334,-42.290862,-31.108461)"
+         id="path2996-3"
+         style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;stroke:#ffffff;stroke-width:5.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
+      <g
+         transform="scale(1.0018026,0.99820067)"
+         id="text3778"
+         style="font-size:73.20139313px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;font-family:Sans">
+        <path
+           d="m 81.126317,94.996469 c -1.561665,0.390408 -3.635702,0.805216 -6.222119,1.244424 -2.537675,0.439208 -5.490129,0.658812 -8.857368,0.658812 -2.928074,0 -5.392519,-0.414808 -7.393341,-1.244423 -2.00085,-0.878416 -3.611279,-2.098438 -4.831292,-3.66007 -1.220031,-1.561624 -2.098447,-3.391657 -2.63525,-5.490104 -0.536816,-2.14723 -0.805221,-4.514072 -0.805215,-7.100536 l 0,-21.374806 6.807729,0 0,19.910779 c -1.2e-5,4.636101 0.732001,7.954561 2.196042,9.955389 1.464012,2.000844 3.928456,3.001262 7.393341,3.001257 0.731991,5e-6 1.488405,-0.0244 2.269243,-0.0732 0.78079,-0.0488 1.512803,-0.0976 2.196042,-0.146403 0.683186,-0.0976 1.293197,-0.170798 1.830034,-0.219604 0.585583,-0.0976 1.00039,-0.195198 1.244424,-0.292806 l 0,-32.135411 6.80773,0 0,36.966703"
+           id="path3783"
+           style="font-variant:normal;font-stretch:normal;fill:#ffffff;stroke:#ffffff;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
+      </g>
+    </g>
+  </g>
 </svg>
diff --git a/doc/img/ublock.svg b/doc/img/ublock.svg
index 8423856ba..e0e6fc50d 100644
--- a/doc/img/ublock.svg
+++ b/doc/img/ublock.svg
@@ -15,10 +15,10 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon16-off.svg"
-   inkscape:export-filename="/home/rhill/permahome/workshop/ublock/doc/img/icon38@2x.png"
-   inkscape:export-xdpi="53.439999"
-   inkscape:export-ydpi="53.439999">
+   sodipodi:docname="ublock.svg"
+   inkscape:export-filename="/home/rhill/permahome/workshop/ublock/src/img/icon_16.png"
+   inkscape:export-xdpi="11.25"
+   inkscape:export-ydpi="11.25">
   <defs
      id="defs4">
     <linearGradient
@@ -78,17 +78,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="83.636866"
-     inkscape:cy="62.16209"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="63.198898"
+     inkscape:cy="63.503298"
      inkscape:document-units="px"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1030"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
+     inkscape:window-width="1206"
+     inkscape:window-height="969"
+     inkscape:window-x="399"
+     inkscape:window-y="40"
+     inkscape:window-maximized="0"
      fit-margin-top="5"
      fit-margin-left="5"
      fit-margin-right="5"
@@ -119,7 +119,24 @@
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
         <dc:description>Use gray 50% for the &quot;off&quot; color</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-nc/3.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-nc/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:prohibits
+           rdf:resource="http://creativecommons.org/ns#CommercialUse" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
@@ -139,8 +156,8 @@
        transform="matrix(-0.6945203,0,0,0.56109687,375.02964,-247.42947)"
        id="g6907">
       <path
-         style="fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.60191178000000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="M 447.83376,669.09921 C 367.20257,612.06806 367.20257,540.77912 367.9225,468.82184 c 33.8363,0.66834 45.35504,0.66834 79.91126,-27.84724 m 0,228.12461 c 80.6312,-57.03115 81.35113,-128.98843 81.35113,-200.27737 -35.27616,0.66834 -46.7949,0.66834 -81.35113,-27.84724"
+         style="fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 447.83376,669.09921 c -80.63119,-57.03115 -80.63119,-128.32009 -80.63119,-199.60903 34.55623,0 46.07497,0 80.63119,-28.51558 m 0,228.12461 c 80.6312,-57.03115 80.6312,-128.32009 80.6312,-199.60903 -34.55623,0 -46.07497,0 -80.6312,-28.51558"
          id="path6909"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccccc" />
@@ -152,15 +169,9 @@
      inkscape:label="text"
      style="display:inline"
      transform="translate(-17.872548,-17.32535)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path2993-3"
-       style="font-size:100.21945952999999463px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;stroke-linejoin:miter"
-       d="m 84.872548,101.68104 c -1.726136,0.54418 -4.006062,1.12095 -6.839774,1.73029 -2.833776,0.60935 -6.112632,0.91402 -9.836581,0.91402 -3.238118,0 -5.963564,-0.59279 -8.176356,-1.77839 -2.212821,-1.1856 -3.99369,-2.863606 -5.342612,-5.034065 -1.348939,-2.170471 -2.320284,-4.729921 -2.914038,-7.678379 -0.593768,-2.948431 -0.890649,-6.219648 -0.890641,-9.81367 l 0,-29.695495 7.527831,0 0,27.662624 c 0,6.439008 0.809508,11.048406 2.42857,13.82821 1.61903,2.779823 4.344892,4.16973 8.177594,4.169722 0.808675,8e-6 1.644962,-0.03369 2.508865,-0.100879 0.863849,-0.06722 1.673373,-0.151548 2.428573,-0.252937 0.755139,-0.101397 1.443194,-0.203286 2.064161,-0.305721 0.620903,-0.102413 1.066432,-0.22086 1.336581,-0.355362 l 0,-44.645658 7.527827,0 z"
-       sodipodi:nodetypes="cssssssccssccsccccc" />
     <ellipse
        id="path2996-3"
-       style="font-size:100.21945952999999463px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:6.30270819;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+       style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;stroke:#ffffff;stroke-width:5.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
        inkscape:export-filename="/home/rhill/permahome/workshop/ublock/platform/chromium/img/browsericons/path2996.png"
        inkscape:export-xdpi="26.719999"
        inkscape:export-ydpi="26.719999"
@@ -173,6 +184,15 @@
        sodipodi:cy="81.325356"
        sodipodi:rx="11.999999"
        sodipodi:ry="12"
-       transform="matrix(1.2083335,0,0,1.3333334,-28.025543,-23.108461)" />
+       transform="matrix(1.3333335,0,0,1.3333334,-42.290862,-31.108461)" />
+    <g
+       transform="scale(1.0018026,0.99820067)"
+       style="font-size:73.20139313px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;font-family:Sans"
+       id="text3778">
+      <path
+         d="m 81.126317,94.996469 c -1.561665,0.390408 -3.635702,0.805216 -6.222119,1.244424 -2.537675,0.439208 -5.490129,0.658812 -8.857368,0.658812 -2.928074,0 -5.392519,-0.414808 -7.393341,-1.244423 -2.00085,-0.878416 -3.611279,-2.098438 -4.831292,-3.66007 -1.220031,-1.561624 -2.098447,-3.391657 -2.63525,-5.490104 -0.536816,-2.14723 -0.805221,-4.514072 -0.805215,-7.100536 l 0,-21.374806 6.807729,0 0,19.910779 c -1.2e-5,4.636101 0.732001,7.954561 2.196042,9.955389 1.464012,2.000844 3.928456,3.001262 7.393341,3.001257 0.731991,5e-6 1.488405,-0.0244 2.269243,-0.0732 0.78079,-0.0488 1.512803,-0.0976 2.196042,-0.146403 0.683186,-0.0976 1.293197,-0.170798 1.830034,-0.219604 0.585583,-0.0976 1.00039,-0.195198 1.244424,-0.292806 l 0,-32.135411 6.80773,0 0,36.966703"
+         style="font-variant:normal;font-stretch:normal;fill:#ffffff;stroke:#ffffff;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         id="path3783" />
+    </g>
   </g>
 </svg>
diff --git a/platform/chromium/img/browsericons/icon19-off.png b/platform/chromium/img/browsericons/icon19-off.png
index c37f059b3..6f30cb4a5 100644
Binary files a/platform/chromium/img/browsericons/icon19-off.png and b/platform/chromium/img/browsericons/icon19-off.png differ
diff --git a/platform/chromium/img/browsericons/icon19.png b/platform/chromium/img/browsericons/icon19.png
index 0876ec75c..b524ea37c 100644
Binary files a/platform/chromium/img/browsericons/icon19.png and b/platform/chromium/img/browsericons/icon19.png differ
diff --git a/platform/chromium/img/browsericons/icon38-off.png b/platform/chromium/img/browsericons/icon38-off.png
index 478b2b8a4..ceed90dc6 100644
Binary files a/platform/chromium/img/browsericons/icon38-off.png and b/platform/chromium/img/browsericons/icon38-off.png differ
diff --git a/platform/chromium/img/browsericons/icon38.png b/platform/chromium/img/browsericons/icon38.png
index a4cca911e..eb4b322c0 100644
Binary files a/platform/chromium/img/browsericons/icon38.png and b/platform/chromium/img/browsericons/icon38.png differ
diff --git a/platform/firefox/img/browsericons/icon16-off.svg b/platform/firefox/img/browsericons/icon16-off.svg
index 5b2d02616..d15a3bc8c 100644
--- a/platform/firefox/img/browsericons/icon16-off.svg
+++ b/platform/firefox/img/browsericons/icon16-off.svg
@@ -7,12 +7,61 @@
    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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="16"
    height="16"
    id="svg2">
   <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       id="linearGradient6915">
+      <stop
+         id="stop6917"
+         style="stop-color:#600000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6919"
+         style="stop-color:#700000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6898">
+      <stop
+         id="stop6900"
+         style="stop-color:#90000f;stop-opacity:0.94117647"
+         offset="0" />
+      <stop
+         id="stop6902"
+         style="stop-color:#800000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3770">
+      <stop
+         id="stop3772"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3774"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect3995" />
+    <radialGradient
+       cx="82.145424"
+       cy="81.055199"
+       r="22.573322"
+       fx="82.145424"
+       fy="81.055199"
+       id="radialGradient3776"
+       xlink:href="#linearGradient3770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.2584318,0,-20.947238)" />
+  </defs>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -22,12 +71,12 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
-        <dc:description>Use gray 40% for the &quot;off&quot; color</dc:description>
+        <dc:description>Use gray 50% for the &quot;off&quot; color</dc:description>
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-nc-sa/3.0/" />
+           rdf:resource="http://creativecommons.org/licenses/by-nc/3.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-nc-sa/3.0/">
+         rdf:about="http://creativecommons.org/licenses/by-nc/3.0/">
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
@@ -40,8 +89,6 @@
            rdf:resource="http://creativecommons.org/ns#CommercialUse" />
         <cc:permits
            rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
       </cc:License>
     </rdf:RDF>
   </metadata>
@@ -59,25 +106,30 @@
      id="layer5"
      style="display:inline">
     <g
-       transform="matrix(-0.08681534,0,0,0.07049035,64.808725,98.200603)"
+       transform="matrix(-0.08681504,0,0,0.07049035,64.751253,98.200603)"
        id="g6907"
        style="fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline">
       <path
-         d="M 447.83376,669.09921 C 367.20257,612.06806 367.20257,540.77912 367.9225,468.82184 c 33.8363,0.66834 45.35504,0.66834 79.91126,-27.84724 m 0,228.12461 c 80.6312,-57.03115 81.35113,-128.98843 81.35113,-200.27737 -35.27616,0.66834 -46.7949,0.66834 -81.35113,-27.84724"
+         d="m 447.83376,669.09921 c -80.63119,-57.03115 -80.63119,-128.32009 -80.63119,-199.60903 34.55623,0 46.07497,0 80.63119,-28.51558 m 0,228.12461 c 80.6312,-57.03115 80.6312,-128.32009 80.6312,-199.60903 -34.55623,0 -46.07497,0 -80.6312,-28.51558"
          id="path6909"
          style="fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
-    <path
-       d="m 26.304887,139.88262 c -0.215768,0.0684 -0.500759,0.14083 -0.854975,0.21738 -0.354223,0.0765 -0.764081,0.11483 -1.229577,0.11483 -0.404766,0 -0.745448,-0.0745 -1.022048,-0.22342 -0.276603,-0.14895 -0.499213,-0.35976 -0.667828,-0.63243 -0.168618,-0.27267 -0.290037,-0.59422 -0.364256,-0.96463 -0.07422,-0.37041 -0.111332,-0.78137 -0.111331,-1.23289 l 0,-3.73063 0.940982,0 0,3.47524 c 0,0.80893 0.101189,1.38801 0.303573,1.73724 0.202379,0.34922 0.543113,0.52384 1.022202,0.52384 0.101085,0 0.205621,-0.004 0.31361,-0.0127 0.107981,-0.008 0.209172,-0.019 0.303572,-0.0318 0.09439,-0.0127 0.1804,-0.0255 0.258021,-0.0384 0.07761,-0.0129 0.133305,-0.0277 0.167073,-0.0447 l 0,-5.60881 0.940982,0 z"
-       id="path2993-3"
-       style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.25062919;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
     <ellipse
        cx="102.12254"
        cy="81.325356"
        rx="11.999999"
        ry="12"
-       transform="matrix(0.15104221,0,0,0.16750608,12.192577,124.20537)"
+       transform="matrix(0.16666669,0,0,0.16750608,10.352121,123.20034)"
        id="path2996-3"
-       style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#999999;fill-opacity:1;stroke:#ffffff;stroke-width:6.30270815;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
+       style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#999999;stroke:#ffffff;stroke-width:5.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
+    <g
+       transform="matrix(0.12522533,0,0,0.1254035,15.638479,127.10848)"
+       id="text3778"
+       style="font-size:73.20139313px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;font-family:Sans">
+      <path
+         d="m 81.126317,94.996469 c -1.561665,0.390408 -3.635702,0.805216 -6.222119,1.244424 -2.537675,0.439208 -5.490129,0.658812 -8.857368,0.658812 -2.928074,0 -5.392519,-0.414808 -7.393341,-1.244423 -2.00085,-0.878416 -3.611279,-2.098438 -4.831292,-3.66007 -1.220031,-1.561624 -2.098447,-3.391657 -2.63525,-5.490104 -0.536816,-2.14723 -0.805221,-4.514072 -0.805215,-7.100536 l 0,-21.374806 6.807729,0 0,19.910779 c -1.2e-5,4.636101 0.732001,7.954561 2.196042,9.955389 1.464012,2.000844 3.928456,3.001262 7.393341,3.001257 0.731991,5e-6 1.488405,-0.0244 2.269243,-0.0732 0.78079,-0.0488 1.512803,-0.0976 2.196042,-0.146403 0.683186,-0.0976 1.293197,-0.170798 1.830034,-0.219604 0.585583,-0.0976 1.00039,-0.195198 1.244424,-0.292806 l 0,-32.135411 6.80773,0 0,36.966703"
+         id="path3783"
+         style="font-variant:normal;font-stretch:normal;fill:#ffffff;stroke:#ffffff;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
+    </g>
   </g>
 </svg>
diff --git a/platform/firefox/img/browsericons/icon16.svg b/platform/firefox/img/browsericons/icon16.svg
index deb2558f1..4c9bf71b8 100644
--- a/platform/firefox/img/browsericons/icon16.svg
+++ b/platform/firefox/img/browsericons/icon16.svg
@@ -7,12 +7,108 @@
    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"
-   version="1.1"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
    height="16"
-   id="svg2">
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ublock.svg"
+   inkscape:export-filename="/home/rhill/permahome/workshop/ublock/private/badge-1400x560.png"
+   inkscape:export-xdpi="295.31"
+   inkscape:export-ydpi="295.31">
   <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       id="linearGradient6915">
+      <stop
+         id="stop6917"
+         offset="0"
+         style="stop-color:#600000;stop-opacity:1;" />
+      <stop
+         id="stop6919"
+         offset="1"
+         style="stop-color:#700000;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6898">
+      <stop
+         style="stop-color:#90000f;stop-opacity:0.94117647;"
+         offset="0"
+         id="stop6900" />
+      <stop
+         style="stop-color:#800000;stop-opacity:1;"
+         offset="1"
+         id="stop6902" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3770">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3772" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3774" />
+    </linearGradient>
+    <inkscape:path-effect
+       is_visible="true"
+       id="path-effect3995"
+       effect="spiro" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3770"
+       id="radialGradient3776"
+       cx="82.145424"
+       cy="81.055199"
+       fx="82.145424"
+       fy="81.055199"
+       r="22.573322"
+       gradientTransform="matrix(1,0,0,1.2584318,0,-20.947238)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#404040"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="32.34375"
+     inkscape:cx="9.2193542"
+     inkscape:cy="8.5350898"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer5"
+     showgrid="true"
+     inkscape:window-width="1206"
+     inkscape:window-height="969"
+     inkscape:window-x="330"
+     inkscape:window-y="52"
+     inkscape:window-maximized="0"
+     fit-margin-top="5"
+     fit-margin-left="5"
+     fit-margin-right="5"
+     fit-margin-bottom="5"
+     inkscape:snap-bbox="true"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     showborder="true"
+     inkscape:showpageshadow="false"
+     borderlayer="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3059"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       dotted="false" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -44,42 +140,65 @@
     </rdf:RDF>
   </metadata>
   <g
-     transform="translate(0,-112)"
+     inkscape:groupmode="layer"
      id="layer3"
-     style="display:inline">
+     inkscape:label="polygon 1"
+     style="display:inline"
+     transform="translate(0,-112)">
     <g
-       transform="matrix(0.6778654,0,0,0.56141828,-241.07537,-247.27712)"
        id="g5639"
-       style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:1.62100744;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+       transform="matrix(0.6778654,0,0,0.56141828,-241.07537,-247.27712)"
+       style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:1.62100744;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       inkscape:export-filename="/home/rhill/permahome/workshop/ublock/platform/chromium/img/browsericons/icon19-off.png"
+       inkscape:export-xdpi="26.719999"
+       inkscape:export-ydpi="26.719999" />
   </g>
   <g
-     transform="translate(-17.872548,-129.32535)"
+     inkscape:groupmode="layer"
      id="layer5"
-     style="display:inline">
+     inkscape:label="text"
+     style="display:inline"
+     transform="translate(-17.872548,-129.32535)">
     <g
-       transform="matrix(0.12500043,0,0,0.12562955,15.695782,127.10848)"
-       id="g3046">
+       id="g3824"
+       transform="matrix(0.125,0,0,0.12562955,15.638479,127.10848)">
       <g
-         transform="matrix(-0.6945203,0,0,0.56109687,392.90219,-230.10412)"
          id="g6907"
+         transform="matrix(-0.6945203,0,0,0.56109687,392.90219,-230.10412)"
          style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline">
         <path
-           d="M 447.83376,669.09921 C 367.20257,612.06806 367.20257,540.77912 367.9225,468.82184 c 33.8363,0.66834 45.35504,0.66834 79.91126,-27.84724 m 0,228.12461 c 80.6312,-57.03115 81.35113,-128.98843 81.35113,-200.27737 -35.27616,0.66834 -46.7949,0.66834 -81.35113,-27.84724"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0"
            id="path6909"
+           d="m 447.83376,669.09921 c -80.63119,-57.03115 -80.63119,-128.32009 -80.63119,-199.60903 34.55623,0 46.07497,0 80.63119,-28.51558 m 0,228.12461 c 80.6312,-57.03115 80.6312,-128.32009 80.6312,-199.60903 -34.55623,0 -46.07497,0 -80.6312,-28.51558"
            style="fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.60191178;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
-      <path
-         d="m 84.872548,101.68104 c -1.726136,0.54418 -4.006062,1.12095 -6.839774,1.73029 -2.833776,0.60935 -6.112632,0.91402 -9.836581,0.91402 -3.238118,0 -5.963564,-0.59279 -8.176356,-1.77839 -2.212821,-1.1856 -3.99369,-2.863606 -5.342612,-5.034065 -1.348939,-2.170471 -2.320284,-4.729921 -2.914038,-7.678379 -0.593768,-2.948431 -0.890649,-6.219648 -0.890641,-9.81367 l 0,-29.695495 7.527831,0 0,27.662624 c 0,6.439008 0.809508,11.048406 2.42857,13.82821 1.61903,2.779823 4.344892,4.16973 8.177594,4.169722 0.808675,8e-6 1.644962,-0.03369 2.508865,-0.100879 0.863849,-0.06722 1.673373,-0.151548 2.428573,-0.252937 0.755139,-0.101397 1.443194,-0.203286 2.064161,-0.305721 0.620903,-0.102413 1.066432,-0.22086 1.336581,-0.355362 l 0,-44.645658 7.527827,0 z"
-         id="path2993-3"
-         style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
       <ellipse
-         cx="102.12254"
-         cy="81.325356"
-         rx="11.999999"
+         transform="matrix(1.3333335,0,0,1.3333334,-42.290862,-31.108461)"
+         sodipodi:ry="12"
+         sodipodi:rx="11.999999"
+         sodipodi:cy="81.325356"
+         sodipodi:cx="102.12254"
+         d="m 114.12254,81.325356 c 0,6.627417 -5.37258,12 -12,12 -6.627413,0 -11.999996,-5.372583 -11.999996,-12 0,-6.627417 5.372583,-12 11.999996,-12 6.62742,0 12,5.372583 12,12 z"
          ry="12"
-         transform="matrix(1.2083335,0,0,1.3333334,-28.025543,-23.108461)"
-         id="path2996-3"
-         style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:6.30270815;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" />
+         rx="11.999999"
+         cy="81.325356"
+         cx="102.12254"
+         inkscape:export-ydpi="26.719999"
+         inkscape:export-xdpi="26.719999"
+         inkscape:export-filename="/home/rhill/permahome/workshop/ublock/platform/chromium/img/browsericons/path2996.png"
+         style="font-size:100.21945953px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:none;stroke:#ffffff;stroke-width:5.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+         id="path2996-3" />
+      <g
+         id="text3778"
+         style="font-size:73.20139313px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;font-family:Sans"
+         transform="scale(1.0018026,0.99820067)">
+        <path
+           id="path3783"
+           style="font-variant:normal;font-stretch:normal;fill:#ffffff;stroke:#ffffff;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
+           d="m 81.126317,94.996469 c -1.561665,0.390408 -3.635702,0.805216 -6.222119,1.244424 -2.537675,0.439208 -5.490129,0.658812 -8.857368,0.658812 -2.928074,0 -5.392519,-0.414808 -7.393341,-1.244423 -2.00085,-0.878416 -3.611279,-2.098438 -4.831292,-3.66007 -1.220031,-1.561624 -2.098447,-3.391657 -2.63525,-5.490104 -0.536816,-2.14723 -0.805221,-4.514072 -0.805215,-7.100536 l 0,-21.374806 6.807729,0 0,19.910779 c -1.2e-5,4.636101 0.732001,7.954561 2.196042,9.955389 1.464012,2.000844 3.928456,3.001262 7.393341,3.001257 0.731991,5e-6 1.488405,-0.0244 2.269243,-0.0732 0.78079,-0.0488 1.512803,-0.0976 2.196042,-0.146403 0.683186,-0.0976 1.293197,-0.170798 1.830034,-0.219604 0.585583,-0.0976 1.00039,-0.195198 1.244424,-0.292806 l 0,-32.135411 6.80773,0 0,36.966703"
+           inkscape:connector-curvature="0" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/img/icon_128.png b/src/img/icon_128.png
index 38645af44..a2a9055a3 100644
Binary files a/src/img/icon_128.png and b/src/img/icon_128.png differ
diff --git a/src/img/icon_16.png b/src/img/icon_16.png
index 9d80660a2..7af3aa490 100644
Binary files a/src/img/icon_16.png and b/src/img/icon_16.png differ