µBlock logo refinement and browser icon organization

This includes a new, refined µBlock logo, rendered more coherently
and consistently for different sizes and display pixel densities.
The Safari build script has been modified to bundle appropriate
resolutions. The Firefox build script was slightly changed to
adhere to the naming convention. The Chrome manifest was
modified/ammended slightly to take advantage of new renderings.
README's beginning has been modified to be nicer and more
minimal.
Other than the logo's slightly refined look and having better
resolution on different browsers and setups, this should have
no effect on the user experience or further development.

28 files changed, 64 insertions, 144 deletions

diff --git a/README.md b/README.md
index 993dfe0..721c078 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# <sub>![logo](https://raw.githubusercontent.com/gorhill/uBlock/master/src/img/browsericons/icon38.png)</sub> µBlock
-<sub>pronounce _you-block_ as in "you decide what enters your browser" / see the "µ" as a stylish "u", to emphasize small resource footprint<br></sub><sup>sorry for the dubious name, we are coders, not marketers</sup>
+<div align="center"><img src="https://raw.githubusercontent.com/gorhill/uBlock/master/src/img/browsericons/icon38@2x.png" width=38>
+</div>
 
-**An efficient blocker add-on for various browsers. Fast, potent, and lean.**
+**µBlock** *(you-block)*: an efficient blocker extension for Chrome, Firefox, and Safari. *Fast, potent, and lean.*
 
 * [Purpose & General Info](#philosophy)
 * [Performance and Efficiency](#performance)
@@ -16,7 +16,7 @@
 * [Release History](#release-history)
 * [Wiki](https://github.com/gorhill/uBlock/wiki)
 
-# ![Build](https://travis-ci.org/gorhill/uBlock.svg?branch=master)
+![Build](https://travis-ci.org/gorhill/uBlock.svg?branch=master)
 
 ## Philosophy
 
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
index ca795f8..cc6f3a7 100644
--- a/platform/chromium/manifest.json
+++ b/platform/chromium/manifest.json
@@ -7,8 +7,10 @@
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",
     "icons": {
-        "16": "img/icon_16.png",
-        "128": "img/icon_128.png"
+        "16": "img/browsericons/icon16.png",
+        "48": "img/browsericons/icon48.png",
+        "64": "img/browsericons/icon64.png",
+        "128": "img/browsericons/icon128.png"
     },
 
     "browser_action": {
diff --git a/platform/safari/Info.plist b/platform/safari/Info.plist
index 8e4cfb1..10c7c83 100644
--- a/platform/safari/Info.plist
+++ b/platform/safari/Info.plist
@@ -37,7 +37,7 @@
                 <key>Identifier</key>
                 <string>toolbarItem</string>
                 <key>Image</key>
-                <string>img/browsericons/icon16.png</string>
+                <string>img/browsericons/icon16nofill.png</string>
                 <key>Label</key>
                 <string>{name}</string>
                 <key>Palette Label</key>
diff --git a/src/img/browsericons/icon128.png b/src/img/browsericons/icon128.png
new file mode 100644
index 0000000..9ec94d7
--- /dev/null
+++ b/src/img/browsericons/icon128.png
diff --git a/src/img/browsericons/icon128@2x.png b/src/img/browsericons/icon128@2x.png
new file mode 100644
index 0000000..10eca83
--- /dev/null
+++ b/src/img/browsericons/icon128@2x.png
diff --git a/src/img/browsericons/icon16-off.svg b/src/img/browsericons/icon16-off.svg
index 58ebf40..863d318 100644
--- a/src/img/browsericons/icon16-off.svg
+++ b/src/img/browsericons/icon16-off.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 603 603">
-  <g transform="translate(-2.9000336,4.3318037)">
-    <g transform="matrix(4.4946163,0,0,4.4784113,-1996.8254,-3025.1919)">
-      <g>
-        <path d="m 450.58474,716.40132 0,51.00389 35.87406,36.2877 51.05503,0 35.91927,-36.3334 0,-51.68942 -35.03824,-35.44222 -52.20713,0 z" style="fill: #7c7c7c; stroke:#ffffff; stroke-width: 2" />
-      </g>
-    </g>
-  </g>
-  <g transform="translate(-2.9000336,4.3318037)">
-    <g transform="matrix(0.97521805,0,0,1.0217146,0,0.07624875)" style="fill:#ffffff">
-      <path
-         d="m 218.83305,472.64625 61.97723,0 0,-53.96657 -3.79453,-37.94524 c 3.59241,3.70669 7.58016,6.20123 11.96329,7.48364 4.38293,1.28241 9.10851,1.8797 14.17677,1.79186 9.372,-0.0176 18.03265,-2.61752 25.98195,-7.79986 7.94903,-5.18233 14.60701,-12.84164 19.97396,-22.97795 l 1.68646,0 4.63775,29.09136 50.59366,0 0,-209.12047 -61.97724,0 0,138.28934 c -5.93788,8.16005 -11.7702,14.08021 -17.49698,17.76048 -5.72704,3.68038 -12.40259,5.48981 -20.02665,5.42828 -8.81887,0.21964 -15.31875,-2.64382 -19.49965,-8.59038 -4.18109,-5.94645 -6.25402,-16.29355 -6.21879,-31.04132 l 0,-121.8464 -61.97723,0 z"/>
-    </g>
-  </g>
-</svg>
+<?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="svg2" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/" inkscape:export-filename="/home/rhill/permahome/workshop/ublock/private/badge-1400x560.png" inkscape:export-xdpi="83.459267" inkscape:export-ydpi="83.459267" inkscape:version="0.48.4 r9939" sodipodi:docname="ublock.svg"

+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="-148.3 3.6 553 553"

+	 enable-background="new -148.3 3.6 553 553" xml:space="preserve">

+<path id="path3788" inkscape:connector-curvature="0" fill="#999999" d="M-148.3,195.1v169.3c0,19,7.5,37.2,20.9,50.6L-8,535.3

+	c13.5,13.6,31.9,21.3,51.1,21.3H213c19.2,0,37.6-7.7,51.1-21.3l119.7-120.5c13.4-13.5,20.9-31.7,20.9-50.6V191.9

+	c0-19-7.5-37.2-20.9-50.6L268.1,24.8C254.5,11.2,236.1,3.6,217,3.6H42c-19.2,0-37.7,7.7-51.2,21.4l-118.3,119.6

+	C-140.9,158-148.3,176.2-148.3,195.1z"/>

+<g>

+	<path fill="#FFFFFF" d="M174,375.3l-2.4-30.4h-0.8c-12.3,22.7-30.4,34-54.4,34c-16.3,0-28.1-6.1-35.6-18.4H80v94H42.8V180.9H86

+		v108.4c0,36.3,12.9,54.4,38.8,54.4c5.6,0,11-1.2,16.2-3.6c5.2-2.4,9.7-5.5,13.6-9.4c3.9-3.9,6.9-8.1,9.2-12.8

+		c2.3-4.7,3.4-9.3,3.4-13.8V180.9h43.2v138.4c0,9.3,0.1,18.7,0.4,28c0.3,9.3,0.7,18.7,1.2,28H174z"/>

+</g>

+</svg>

diff --git a/src/img/browsericons/icon16.png b/src/img/browsericons/icon16.png
index 292855b..0aab15d 100644
--- a/src/img/browsericons/icon16.png
+++ b/src/img/browsericons/icon16.png
diff --git a/src/img/browsericons/icon16.svg b/src/img/browsericons/icon16.svg
index 4f6ce99..5d5b851 100644
--- a/src/img/browsericons/icon16.svg
+++ b/src/img/browsericons/icon16.svg
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 603 603">
-  <g transform="translate(-2.9000336,4.3318037)">
-    <g transform="matrix(4.4946163,0,0,4.4784113,-1996.8254,-3025.1919)">
-      <g>
-        <path d="m 450.58474,716.40132 0,51.00389 35.87406,36.2877 51.05503,0 35.91927,-36.3334 0,-51.68942 -35.03824,-35.44222 -52.20713,0 z" style="fill: #800000; stroke: #ffffff; stroke-width: 2" />
-      </g>
-    </g>
-  </g>
-  <g transform="translate(-2.9000336,4.3318037)">
-    <g transform="matrix(0.97521805,0,0,1.0217146,0,0.07624875)" style="fill:#ffffff">
-      <path
-         d="m 218.83305,472.64625 61.97723,0 0,-53.96657 -3.79453,-37.94524 c 3.59241,3.70669 7.58016,6.20123 11.96329,7.48364 4.38293,1.28241 9.10851,1.8797 14.17677,1.79186 9.372,-0.0176 18.03265,-2.61752 25.98195,-7.79986 7.94903,-5.18233 14.60701,-12.84164 19.97396,-22.97795 l 1.68646,0 4.63775,29.09136 50.59366,0 0,-209.12047 -61.97724,0 0,138.28934 c -5.93788,8.16005 -11.7702,14.08021 -17.49698,17.76048 -5.72704,3.68038 -12.40259,5.48981 -20.02665,5.42828 -8.81887,0.21964 -15.31875,-2.64382 -19.49965,-8.59038 -4.18109,-5.94645 -6.25402,-16.29355 -6.21879,-31.04132 l 0,-121.8464 -61.97723,0 z"/>
-    </g>
-  </g>
-</svg>
+<?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="svg2" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/" inkscape:export-filename="/home/rhill/permahome/workshop/ublock/private/badge-1400x560.png" inkscape:export-xdpi="83.459267" inkscape:export-ydpi="83.459267" inkscape:version="0.48.4 r9939" sodipodi:docname="ublock.svg"

+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px" viewBox="-148.3 3.6 553 553"

+	 enable-background="new -148.3 3.6 553 553" xml:space="preserve">

+<path id="path3788" inkscape:connector-curvature="0" fill="#BC2300" d="M-148.3,195.1v169.3c0,19,7.5,37.2,20.9,50.6L-8,535.3

+	c13.5,13.6,31.9,21.3,51.1,21.3H213c19.2,0,37.6-7.7,51.1-21.3l119.7-120.5c13.4-13.5,20.9-31.7,20.9-50.6V191.9

+	c0-19-7.5-37.2-20.9-50.6L268.1,24.8C254.5,11.2,236.1,3.6,217,3.6H42c-19.2,0-37.7,7.7-51.2,21.4l-118.3,119.6

+	C-140.9,158-148.3,176.2-148.3,195.1z"/>

+<g>

+	<path fill="#FFFFFF" d="M174,375.3l-2.4-30.4h-0.8c-12.3,22.7-30.4,34-54.4,34c-16.3,0-28.1-6.1-35.6-18.4H80v94H42.8V180.9H86

+		v108.4c0,36.3,12.9,54.4,38.8,54.4c5.6,0,11-1.2,16.2-3.6c5.2-2.4,9.7-5.5,13.6-9.4c3.9-3.9,6.9-8.1,9.2-12.8

+		c2.3-4.7,3.4-9.3,3.4-13.8V180.9h43.2v138.4c0,9.3,0.1,18.7,0.4,28c0.3,9.3,0.7,18.7,1.2,28H174z"/>

+</g>

+</svg>

diff --git a/src/img/browsericons/icon16@2x.png b/src/img/browsericons/icon16@2x.png
index 1a92000..d41a325 100644
--- a/src/img/browsericons/icon16@2x.png
+++ b/src/img/browsericons/icon16@2x.png
diff --git a/src/img/browsericons/icon16nofill.png b/src/img/browsericons/icon16nofill.png
new file mode 100644
index 0000000..cde6a9d
--- /dev/null
+++ b/src/img/browsericons/icon16nofill.png
diff --git a/src/img/browsericons/icon16nofill@2x.png b/src/img/browsericons/icon16nofill@2x.png
new file mode 100644
index 0000000..0251719
--- /dev/null
+++ b/src/img/browsericons/icon16nofill@2x.png
diff --git a/src/img/browsericons/icon19-off.png b/src/img/browsericons/icon19-off.png
index f978164..b10b069 100644
--- a/src/img/browsericons/icon19-off.png
+++ b/src/img/browsericons/icon19-off.png
diff --git a/src/img/browsericons/icon19-off@2x.png b/src/img/browsericons/icon19-off@2x.png
new file mode 100644
index 0000000..0481e31
--- /dev/null
+++ b/src/img/browsericons/icon19-off@2x.png
diff --git a/src/img/browsericons/icon19.png b/src/img/browsericons/icon19.png
index 53a7250..9f74de9 100644
--- a/src/img/browsericons/icon19.png
+++ b/src/img/browsericons/icon19.png
diff --git a/src/img/browsericons/icon19@2x.png b/src/img/browsericons/icon19@2x.png
new file mode 100644
index 0000000..0c217d8
--- /dev/null
+++ b/src/img/browsericons/icon19@2x.png
diff --git a/src/img/browsericons/icon38-off.png b/src/img/browsericons/icon38-off.png
index 8932c9c..0481e31 100644
--- a/src/img/browsericons/icon38-off.png
+++ b/src/img/browsericons/icon38-off.png
diff --git a/src/img/browsericons/icon38-off@2x.png b/src/img/browsericons/icon38-off@2x.png
new file mode 100644
index 0000000..8b6d0b2
--- /dev/null
+++ b/src/img/browsericons/icon38-off@2x.png
diff --git a/src/img/browsericons/icon38.png b/src/img/browsericons/icon38.png
index ebbe79d..0c217d8 100644
--- a/src/img/browsericons/icon38.png
+++ b/src/img/browsericons/icon38.png
diff --git a/src/img/browsericons/icon38@2x.png b/src/img/browsericons/icon38@2x.png
new file mode 100644
index 0000000..ec013d1
--- /dev/null
+++ b/src/img/browsericons/icon38@2x.png
diff --git a/src/img/browsericons/icon48.png b/src/img/browsericons/icon48.png
new file mode 100644
index 0000000..068e87f
--- /dev/null
+++ b/src/img/browsericons/icon48.png
diff --git a/src/img/browsericons/icon48@2x.png b/src/img/browsericons/icon48@2x.png
new file mode 100644
index 0000000..7fbe68d
--- /dev/null
+++ b/src/img/browsericons/icon48@2x.png
diff --git a/src/img/browsericons/icon64.png b/src/img/browsericons/icon64.png
new file mode 100644
index 0000000..cc78034
--- /dev/null
+++ b/src/img/browsericons/icon64.png
diff --git a/src/img/browsericons/ublock.svg b/src/img/browsericons/ublock.svg
new file mode 100644
index 0000000..e62627f
--- /dev/null
+++ b/src/img/browsericons/ublock.svg
@@ -0,0 +1,16 @@
+<?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="svg2" xmlns:cc="http://creativecommons.org/ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns:dc="http://purl.org/dc/elements/1.1/" inkscape:export-filename="/home/rhill/permahome/workshop/ublock/private/badge-1400x560.png" inkscape:export-xdpi="83.459267" inkscape:export-ydpi="83.459267" inkscape:version="0.48.4 r9939" sodipodi:docname="ublock.svg"

+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="-148.3 3.6 553 553"

+	 enable-background="new -148.3 3.6 553 553" xml:space="preserve">

+<path id="path3788" inkscape:connector-curvature="0" fill="#BC2300" d="M-148.3,195.1v169.3c0,19,7.5,37.2,20.9,50.6L-8,535.3

+	c13.5,13.6,31.9,21.3,51.1,21.3H213c19.2,0,37.6-7.7,51.1-21.3l119.7-120.5c13.4-13.5,20.9-31.7,20.9-50.6V191.9

+	c0-19-7.5-37.2-20.9-50.6L268.1,24.8C254.5,11.2,236.1,3.6,217,3.6H42c-19.2,0-37.7,7.7-51.2,21.4l-118.3,119.6

+	C-140.9,158-148.3,176.2-148.3,195.1z"/>

+<g>

+	<path fill="#FFFFFF" d="M174,375.3l-2.4-30.4h-0.8c-12.3,22.7-30.4,34-54.4,34c-16.3,0-28.1-6.1-35.6-18.4H80v94H42.8V180.9H86

+		v108.4c0,36.3,12.9,54.4,38.8,54.4c5.6,0,11-1.2,16.2-3.6c5.2-2.4,9.7-5.5,13.6-9.4c3.9-3.9,6.9-8.1,9.2-12.8

+		c2.3-4.7,3.4-9.3,3.4-13.8V180.9h43.2v138.4c0,9.3,0.1,18.7,0.4,28c0.3,9.3,0.7,18.7,1.2,28H174z"/>

+</g>

+</svg>

diff --git a/src/img/icon_128.png b/src/img/icon_128.png
deleted file mode 100644
index 165e37d..0000000
--- a/src/img/icon_128.png
+++ /dev/null
diff --git a/src/img/icon_16.png b/src/img/icon_16.png
deleted file mode 100644
index 8ab836f..0000000
--- a/src/img/icon_16.png
+++ /dev/null
diff --git a/src/img/ublock.svg b/src/img/ublock.svg
deleted file mode 100644
index 963b3cd..0000000
--- a/src/img/ublock.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="603.11639"
-   height="603.88739"
-   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="83.459267"
-   inkscape:export-ydpi="83.459267">
-  <defs
-     id="defs4">
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect3995"
-       effect="spiro" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#404040"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.9899495"
-     inkscape:cx="373.81573"
-     inkscape:cy="359.14259"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer5"
-     showgrid="false"
-     inkscape:window-width="1375"
-     inkscape:window-height="967"
-     inkscape:window-x="249"
-     inkscape:window-y="69"
-     inkscape:window-maximized="0"
-     fit-margin-top="20"
-     fit-margin-left="20"
-     fit-margin-right="20"
-     fit-margin-bottom="20" />
-  <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:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="polygon"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline"
-     transform="translate(-2.9000336,4.3318037)">
-    <g
-       id="g3003"
-       transform="matrix(4.4946163,0,0,4.4784113,-1996.8254,-3025.1919)"
-       inkscape:export-xdpi="20.430607"
-       inkscape:export-ydpi="20.430607">
-      <g
-         style="display:inline"
-         inkscape:label="polygon"
-         id="layer2">
-        <path
-           inkscape:connector-curvature="0"
-           id="path3788"
-           d="m 450.58474,716.40132 0,51.00389 35.87406,36.2877 51.05503,0 35.91927,-36.3334 0,-51.68942 -35.03824,-35.44222 -52.20713,0 z"
-           style="fill:#800000;fill-opacity:1;stroke:#ffffff;stroke-width:2.44291782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="text"
-     style="display:inline"
-     transform="translate(-2.9000336,4.3318037)">
-    <g
-       transform="matrix(0.97521805,0,0,1.0217146,0,0.07624875)"
-       style="font-size:421.6192627px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Source Sans Pro;-inkscape-font-specification:Sans Bold"
-       id="text3053"
-       inkscape:export-xdpi="20.430607"
-       inkscape:export-ydpi="20.430607">
-      <path
-         d="m 218.83305,472.64625 61.97723,0 0,-53.96657 -3.79453,-37.94524 c 3.59241,3.70669 7.58016,6.20123 11.96329,7.48364 4.38293,1.28241 9.10851,1.8797 14.17677,1.79186 9.372,-0.0176 18.03265,-2.61752 25.98195,-7.79986 7.94903,-5.18233 14.60701,-12.84164 19.97396,-22.97795 l 1.68646,0 4.63775,29.09136 50.59366,0 0,-209.12047 -61.97724,0 0,138.28934 c -5.93788,8.16005 -11.7702,14.08021 -17.49698,17.76048 -5.72704,3.68038 -12.40259,5.48981 -20.02665,5.42828 -8.81887,0.21964 -15.31875,-2.64382 -19.49965,-8.59038 -4.18109,-5.94645 -6.25402,-16.29355 -6.21879,-31.04132 l 0,-121.8464 -61.97723,0 z"
-         id="path3058"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index d52a3a8..b1f1f89 100755
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@@ -16,7 +16,7 @@ cp -R src/js $DES/
 cp -R src/lib $DES/
 cp -R src/_locales $DES/
 cp src/*.html $DES/
-mv $DES/img/icon_128.png $DES/icon.png
+mv $DES/img/browsericons/icon128.png $DES/icon.png
 cp platform/firefox/vapi-*.js $DES/js/
 cp platform/firefox/bootstrap.js $DES/
 cp platform/firefox/frame*.js $DES/
diff --git a/tools/make-safari.sh b/tools/make-safari.sh
index 5d774be..d73fcfb 100755
--- a/tools/make-safari.sh
+++ b/tools/make-safari.sh
@@ -16,7 +16,12 @@ cp -R src/js $DES/
 cp -R src/lib $DES/
 cp -R src/_locales $DES/
 cp src/*.html $DES/
-mv $DES/img/icon_128.png $DES/Icon.png
+cp $DES/img/browsericons/icon16@2x.png $DES/Icon-32.png
+cp $DES/img/browsericons/icon48.png $DES/Icon-48.png
+cp $DES/img/browsericons/icon64.png $DES/Icon-64.png
+cp $DES/img/browsericons/icon48@2x.png $DES/Icon-96.png
+cp $DES/img/browsericons/icon128.png $DES/Icon-128.png
+cp $DES/img/browsericons/icon128@2x.png $DES/Icon-256.png
 cp platform/safari/*.js $DES/js/
 cp platform/safari/Info.plist $DES/
 cp platform/safari/Settings.plist $DES/