diff --git a/platform/firefox/img/browsericons/icon16-off.svg b/platform/firefox/img/browsericons/icon16-off.svg
index 4c9a43476..34ce9a835 100644
--- a/platform/firefox/img/browsericons/icon16-off.svg
+++ b/platform/firefox/img/browsericons/icon16-off.svg
@@ -1,137 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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: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.000002"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon16-off.svg"
-   inkscape:export-filename="/home/rhill/permahome/workshop/ublock/src/img/ff_icon_16.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <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"
-     inkscape:cx="-1.2340771"
-     inkscape:cy="7.3728583"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1030"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     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="true"
-     borderlayer="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3059"
-       empspacing="8"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="false"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       originx="3.7593723e-07px"
-       originy="-112px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <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:description>Use gray 50% for the &quot;off&quot; color</dc:description>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="polygon"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline"
-     transform="translate(-17.872548,-17.325349)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3788"
-       d="m 18.122548,21.950349 0,6.750002 4.375001,4.374998 6.750001,0 4.374998,-4.374998 0,-6.750002 -4.374998,-4.375 -6.750001,0 z"
-       style="fill:#808080;fill-opacity:1;stroke:#ffffff;stroke-width:0.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:export-filename="/home/rhill/permahome/workshop/ublock/src/img/ff_icon-off_16.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       transform="scale(0.91012365,1.0987518)"
-       style="font-size:12.42635727px;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.24999997;stroke-miterlimit:4;stroke-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="text3832">
-      <path
-         d="m 31.037043,26.252842 c -0.265101,0.06627 -0.617181,0.13669 -1.05624,0.211248 -0.430785,0.07456 -0.931981,0.111837 -1.503589,0.111838 -0.497058,-1e-6 -0.915411,-0.07042 -1.255062,-0.211249 -0.339656,-0.149116 -0.613036,-0.356221 -0.82014,-0.621317 -0.207107,-0.265095 -0.356223,-0.575754 -0.447349,-0.931977 -0.09113,-0.364505 -0.136691,-0.76629 -0.13669,-1.205357 l 0,-3.628496 1.155651,0 0,3.379969 c -2e-6,0.787005 0.124262,1.350333 0.372791,1.689985 0.248525,0.339654 0.666878,0.509481 1.255062,0.50948 0.12426,1e-6 0.252666,-0.0041 0.385217,-0.01243 0.132544,-0.0083 0.256807,-0.01657 0.372791,-0.02485 0.115975,-0.01657 0.219528,-0.02899 0.310659,-0.03728 0.09941,-0.01657 0.169822,-0.03314 0.211248,-0.0497 l 0,-5.455171 1.155651,0 0,6.27531"
-         style="fill:#ffffff;stroke:#ffffff;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-         id="path2993" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="text"
-     style="display:inline"
-     transform="translate(-17.872548,-17.325349)" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#808080" d="M15.7,4.2c-1.3-1.3-2.6-2.6-3.9-3.9C11.6,0.1,11.3,0,11,0C9,0,7,0,5,0C4.6,0,4.4,0.1,4.2,0.3
+	C2.9,1.6,1.6,2.9,0.3,4.2C0.1,4.4,0,4.6,0,4.9C0,7,0,9,0,11c0,0.3,0.1,0.6,0.3,0.8c1.3,1.3,2.6,2.6,3.8,3.8C4.4,15.9,4.7,16,5,16
+	c1,0,2,0,3,0c1,0,2,0,3,0c0.3,0,0.5,0,0.8-0.3c1.3-1.3,2.6-2.6,3.9-3.9c0.2-0.2,0.3-0.4,0.3-0.7C16,9,16,7,16,4.9
+	C16,4.6,15.9,4.4,15.7,4.2z"/>
+<path fill="#FFFFFF" d="M10.8,8c0,1,0,2,0,3c0,0.4-0.1,0.6-0.5,0.7C9.5,11.8,8.8,12,8.1,12c-1.6,0-2.5-0.7-2.7-2.3
+	C5.1,8,5.3,6.3,5.2,4.7c0-0.3,0.1-0.3,0.4-0.3c1-0.1,1.1-0.1,1.1,1c0,1.1,0,2.2,0,3.3c0,1.5,0.6,1.9,2.1,1.8c0.4,0,0.5-0.2,0.5-0.6
+	c0-1.6,0-3.3,0-4.9c0-0.6,0.2-0.7,0.8-0.7c0.5,0,0.8,0,0.7,0.7C10.7,6,10.8,7,10.8,8z"/>
 </svg>
diff --git a/platform/firefox/img/browsericons/icon16.svg b/platform/firefox/img/browsericons/icon16.svg
index 7a8026661..1211a3ea9 100644
--- a/platform/firefox/img/browsericons/icon16.svg
+++ b/platform/firefox/img/browsericons/icon16.svg
@@ -1,137 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<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: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.000002"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="icon16.svg"
-   inkscape:export-filename="/home/rhill/permahome/workshop/ublock/src/img/ff_icon_16.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <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"
-     inkscape:cx="-1.2340771"
-     inkscape:cy="7.3728583"
-     inkscape:document-units="px"
-     inkscape:current-layer="text3832"
-     showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1030"
-     inkscape:window-x="0"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1"
-     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="true"
-     borderlayer="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3059"
-       empspacing="8"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       dotted="false"
-       spacingx="0.5px"
-       spacingy="0.5px"
-       originx="3.7593723e-07px"
-       originy="-112px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <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:description>Use gray 50% for the &quot;off&quot; color</dc:description>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="polygon"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline"
-     transform="translate(-17.872548,-17.325349)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path3788"
-       d="m 18.122548,21.950349 0,6.750002 4.375001,4.374998 6.750001,0 4.374998,-4.374998 0,-6.750002 -4.374998,-4.375 -6.750001,0 z"
-       style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:export-filename="/home/rhill/permahome/workshop/ublock/src/img/ff_icon-off_16.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       transform="scale(0.91012365,1.0987518)"
-       style="font-size:12.42635727px;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.24999997;stroke-miterlimit:4;stroke-opacity:1;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-       id="text3832">
-      <path
-         d="m 31.037043,26.252842 c -0.265101,0.06627 -0.617181,0.13669 -1.05624,0.211248 -0.430785,0.07456 -0.931981,0.111837 -1.503589,0.111838 -0.497058,-1e-6 -0.915411,-0.07042 -1.255062,-0.211249 -0.339656,-0.149116 -0.613036,-0.356221 -0.82014,-0.621317 -0.207107,-0.265095 -0.356223,-0.575754 -0.447349,-0.931977 -0.09113,-0.364505 -0.136691,-0.76629 -0.13669,-1.205357 l 0,-3.628496 1.155651,0 0,3.379969 c -2e-6,0.787005 0.124262,1.350333 0.372791,1.689985 0.248525,0.339654 0.666878,0.509481 1.255062,0.50948 0.12426,1e-6 0.252666,-0.0041 0.385217,-0.01243 0.132544,-0.0083 0.256807,-0.01657 0.372791,-0.02485 0.115975,-0.01657 0.219528,-0.02899 0.310659,-0.03728 0.09941,-0.01657 0.169822,-0.03314 0.211248,-0.0497 l 0,-5.455171 1.155651,0 0,6.27531"
-         style="fill:#ffffff;stroke:#ffffff;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"
-         id="path2993" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="text"
-     style="display:inline"
-     transform="translate(-17.872548,-17.325349)" />
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path fill="#800000" d="M15.7,4.2c-1.3-1.3-2.6-2.6-3.9-3.9C11.6,0.1,11.3,0,11,0C9,0,7,0,5,0C4.6,0,4.4,0.1,4.2,0.3
+	C2.9,1.6,1.6,2.9,0.3,4.2C0.1,4.4,0,4.6,0,4.9C0,7,0,9,0,11c0,0.3,0.1,0.6,0.3,0.8c1.3,1.3,2.6,2.6,3.8,3.8C4.4,15.9,4.7,16,5,16
+	c1,0,2,0,3,0c1,0,2,0,3,0c0.3,0,0.5,0,0.8-0.3c1.3-1.3,2.6-2.6,3.9-3.9c0.2-0.2,0.3-0.4,0.3-0.7C16,9,16,7,16,4.9
+	C16,4.6,15.9,4.4,15.7,4.2z"/>
+<path fill="#FFFFFF" d="M10.8,8c0,1,0,2,0,3c0,0.4-0.1,0.6-0.5,0.7C9.5,11.8,8.8,12,8.1,12c-1.6,0-2.5-0.7-2.7-2.3
+	C5.1,8,5.3,6.3,5.2,4.7c0-0.3,0.1-0.3,0.4-0.3c1-0.1,1.1-0.1,1.1,1c0,1.1,0,2.2,0,3.3c0,1.5,0.6,1.9,2.1,1.8c0.4,0,0.5-0.2,0.5-0.6
+	c0-1.6,0-3.3,0-4.9c0-0.6,0.2-0.7,0.8-0.7c0.5,0,0.8,0,0.7,0.7C10.7,6,10.8,7,10.8,8z"/>
 </svg>
diff --git a/platform/safari/img/browsericons/safari-icon16.svg b/platform/safari/img/browsericons/safari-icon16.svg
index aa4e3e65d..b948eeb1d 100644
--- a/platform/safari/img/browsericons/safari-icon16.svg
+++ b/platform/safari/img/browsericons/safari-icon16.svg
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="-128 122 256 256" enable-background="new -128 122 256 256" xml:space="preserve">
-<path d="M-0.1,378c-16,0-32.2-0.3-48.2,0c-5.2,0-9.2-1.3-12.8-5.2c-20.2-20.7-40.6-41.2-61.3-61.6c-3.7-3.4-5.5-7.1-5.5-12.6
-	c0.3-32.5,0.3-65,0-97.6c0-5,1.6-8.4,5-11.8c21-20.7,41.7-41.4,62.1-62.2c3.7-3.4,7.1-5,12.1-5c32.5,0.3,65,0.3,97.5,0
-	c5,0,8.4,1.3,12.1,4.7c20.7,21,41.4,41.7,62.1,62.2c3.4,3.4,5.2,6.8,5.2,11.8c-0.3,32.8-0.3,65.6,0,98.6c0,4.7-1.6,7.9-4.7,11
-	c-21,21-42.2,42-62.9,63c-3.7,3.7-7.3,4.7-12.1,4.5C32.1,377.7,16.1,378-0.1,378z M44.2,249.7c0-16-0.5-32.3,0.3-48.3
-	c0.5-9.7-3.4-10.5-11.5-10.5s-12.6,0.8-12.1,11c0.8,26.2,0,52.5,0.5,78.7c0,6.6-1.6,8.9-8.6,9.4c-24.4,1.6-32.8-5.2-33.3-29.6
-	c-0.5-17.8-0.3-35.7-0.3-53.5c0-17.3-0.5-17.6-17.3-15.7c-3.7,0.3-5.8,1.3-5.8,5.5c0.5,26.8-2.9,53.8,1.6,80.5
-	c3.9,24.7,18.6,35.9,43.5,36.2c11.5,0,22.8-1.8,34.3-3.9c7.3-1.3,8.6-4.7,8.6-11.3C43.6,282,44.2,266,44.2,249.7z"/>
+	 width="16px" height="16px" viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<path d="M8,16c-1,0-2,0-3,0c-0.3,0-0.6-0.1-0.8-0.3c-1.3-1.3-2.5-2.6-3.8-3.9C0.1,11.6,0,11.4,0,11C0,9,0,7,0,4.9
+	c0-0.3,0.1-0.5,0.3-0.7c1.3-1.3,2.6-2.6,3.9-3.9C4.4,0.1,4.6,0,4.9,0C7,0,9,0,11,0c0.3,0,0.5,0.1,0.8,0.3c1.3,1.3,2.6,2.6,3.9,3.9
+	C15.9,4.4,16,4.6,16,4.9c0,2.1,0,4.1,0,6.2c0,0.3-0.1,0.5-0.3,0.7c-1.3,1.3-2.6,2.6-3.9,3.9C11.5,15.9,11.3,16,11,16
+	C10,16,9,16,8,16z M10.8,8c0-1,0-2,0-3c0-0.6-0.2-0.7-0.7-0.7S9.3,4.4,9.3,5c0.1,1.6,0,3.3,0,4.9c0,0.4-0.1,0.6-0.5,0.6
+	c-1.5,0.1-2.1-0.3-2.1-1.9c0-1.1,0-2.2,0-3.3c0-1.1,0-1.1-1.1-1c-0.2,0-0.4,0.1-0.4,0.3c0,1.7-0.2,3.4,0.1,5
+	c0.2,1.5,1.2,2.2,2.7,2.3c0.7,0,1.4-0.1,2.1-0.2c0.5-0.1,0.5-0.3,0.5-0.7C10.7,10,10.8,9,10.8,8z"/>
 </svg>