diff --git a/README.md b/README.md
index efcb4e63..1845c023 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ original. It is however still fully compatible to the original ZeroBin 0.19
 data storage scheme. Therefore such installations can be upgraded to this fork
 without loosing any data.
 
-![PrivateBin Logo](https://raw.githubusercontent.com/PrivateBin/PrivateBin/master/android-chrome-192x192.png)
+<img src="img/icon.svg" alt="PrivateBin Logo" style="height: 200px;">
 
 ## What PrivateBin provides
 
@@ -110,5 +110,5 @@ file](https://github.com/PrivateBin/PrivateBin/wiki/Configuration):
 
 * [Developer guide](https://github.com/PrivateBin/PrivateBin/wiki/Development)
 
-Run into any issues? Have ideas for further developments? Please 
+Run into any issues? Have ideas for further developments? Please
 [report](https://github.com/PrivateBin/PrivateBin/issues) them!
diff --git a/img/icon.svg b/img/icon.svg
index ef3fd81b..a7696840 100644
--- a/img/icon.svg
+++ b/img/icon.svg
@@ -1,254 +1 @@
-<?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="https://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"
-   version="1.1"
-   width="500"
-   height="500"
-   viewBox="0 0 500 500"
-   id="svg2">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient7636">
-      <stop
-         id="stop7664"
-         style="stop-color:#ffab00;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4188"
-         style="stop-color:#ffa500;stop-opacity:1"
-         offset="0.20623536" />
-      <stop
-         id="stop4190"
-         style="stop-color:#ffab00;stop-opacity:1"
-         offset="0.2469174" />
-      <stop
-         id="stop7666"
-         style="stop-color:#ff8800;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7620">
-      <stop
-         id="stop7622"
-         style="stop-color:#fcff00;stop-opacity:1"
-         offset="0" />
-    </linearGradient>
-    <radialGradient
-       cx="250"
-       cy="250.00003"
-       r="229.85291"
-       fx="250"
-       fy="250.00003"
-       id="radialGradient7642"
-       xlink:href="#linearGradient7636"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3983125,1.4831815e-7,-1.507182e-7,1.4209396,-99.578086,-105.23497)"
-       spreadMethod="pad" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter9316">
-      <feGaussianBlur
-         id="feGaussianBlur9318"
-         stdDeviation="3"
-         result="result1" />
-      <feBlend
-         in2="result1"
-         mode="multiply"
-         in="result1"
-         result="result5"
-         id="feBlend9320" />
-      <feGaussianBlur
-         id="feGaussianBlur9322"
-         stdDeviation="1"
-         result="result6"
-         in="result5" />
-      <feComposite
-         in2="result5"
-         operator="xor"
-         in="result6"
-         result="result8"
-         id="feComposite9324" />
-      <feComposite
-         in2="result8"
-         operator="xor"
-         in="result6"
-         result="fbSourceGraphic"
-         id="feComposite9326" />
-      <feSpecularLighting
-         id="feSpecularLighting9328"
-         specularExponent="55"
-         specularConstant="2.20000005"
-         surfaceScale="2"
-         lighting-color="#ffffff"
-         result="result1"
-         in="fbSourceGraphic">
-        <fePointLight
-           id="fePointLight9330"
-           z="20000"
-           y="-10000"
-           x="-5000" />
-      </feSpecularLighting>
-      <feComposite
-         in2="fbSourceGraphic"
-         operator="in"
-         in="result1"
-         result="result2"
-         id="feComposite9332" />
-      <feComposite
-         in2="result2"
-         operator="arithmetic"
-         k1="0"
-         k2="2"
-         k3="1"
-         k4="0"
-         in="fbSourceGraphic"
-         result="result4"
-         id="feComposite9334" />
-      <feComposite
-         in2="result4"
-         operator="in"
-         in="result4"
-         result="result91"
-         id="feComposite9336" />
-      <feBlend
-         in2="result91"
-         mode="darken"
-         id="feBlend9338" />
-    </filter>
-    <pattern
-       id="pattern9832"
-       patternTransform="translate(-105.5802,590.28444)"
-       height="75.64963"
-       width="150.00683"
-       patternUnits="userSpaceOnUse">
-      <rect
-         style="opacity:1;fill:#ebee00;fill-opacity:0.69724767;fill-rule:nonzero;stroke:#000000;stroke-width:5.46199989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect9830"
-         width="144.54483"
-         height="70.18763"
-         x="2.7309999"
-         y="2.7309999" />
-    </pattern>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter9316-8">
-      <feGaussianBlur
-         result="result1"
-         stdDeviation="3"
-         id="feGaussianBlur9318-0" />
-      <feBlend
-         in2="result1"
-         mode="multiply"
-         in="result1"
-         result="result5"
-         id="feBlend9320-6" />
-      <feGaussianBlur
-         in="result5"
-         result="result6"
-         stdDeviation="1"
-         id="feGaussianBlur9322-8" />
-      <feComposite
-         in2="result5"
-         operator="xor"
-         in="result6"
-         result="result8"
-         id="feComposite9324-0" />
-      <feComposite
-         in2="result8"
-         operator="xor"
-         in="result6"
-         result="fbSourceGraphic"
-         id="feComposite9326-9" />
-      <feSpecularLighting
-         in="fbSourceGraphic"
-         result="result1"
-         lighting-color="#ffffff"
-         surfaceScale="2"
-         specularConstant="2.20000005"
-         specularExponent="55"
-         id="feSpecularLighting9328-2">
-        <fePointLight
-           x="-5000"
-           y="-10000"
-           z="20000"
-           id="fePointLight9330-6" />
-      </feSpecularLighting>
-      <feComposite
-         in2="fbSourceGraphic"
-         operator="in"
-         in="result1"
-         result="result2"
-         id="feComposite9332-7" />
-      <feComposite
-         in2="result2"
-         operator="arithmetic"
-         k1="0"
-         k2="2"
-         k3="1"
-         k4="0"
-         in="fbSourceGraphic"
-         result="result4"
-         id="feComposite9334-8" />
-      <feComposite
-         in2="result4"
-         operator="in"
-         in="result4"
-         result="result91"
-         id="feComposite9336-2" />
-      <feBlend
-         in2="result91"
-         mode="darken"
-         id="feBlend9338-7" />
-    </filter>
-    <pattern
-       patternUnits="userSpaceOnUse"
-       width="150.00683"
-       height="75.64963"
-       patternTransform="translate(-105.5802,590.28444)"
-       id="pattern9832-3">
-      <rect
-         y="2.7309999"
-         x="2.7309999"
-         height="70.18763"
-         width="144.54483"
-         id="rect9830-3"
-         style="opacity:1;fill:#ebee00;fill-opacity:0.69724767;fill-rule:nonzero;stroke:#000000;stroke-width:5.46199989;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </pattern>
-  </defs>
-  <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:license
-           rdf:resource="https://creativecommons.org/licenses/by/4.0/" />
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>rugk</dc:title>
-          </cc:Agent>
-        </dc:rights>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(0,-552.36219)"
-     id="layer1">
-    <path
-       d="M 250.41797,3.1582031 23.300781,126.23828 22.880859,373.07812 249.58203,496.8418 476.69922,373.76172 477.11914,126.92188 z m -0.71094,97.8652369 0,0.006 c 3.78018,0 7.60386,0.29655 11.45703,0.875 41.10089,6.16576 72.18274,40.63955 66.38414,70.45619 -5.7986,29.81664 -33.27979,55.97822 -40.0849,61.67271 -6.80511,5.69448 37.09529,164.94336 37.09529,164.94336 l -74.07421,0 -1.06836,0 -73.97657,0 c 0,0 46.18084,-156.80132 36.48594,-164.94336 -9.69491,-8.14204 -41.19767,-36.87188 -36.38828,-68.93554 4.80939,-32.06366 37.62649,-63.97482 74.16992,-64.07422 z"
-       transform="matrix(0.95665359,0,0,0.95665359,10.836603,563.19879)"
-       id="path4140"
-       style="fill:url(#radialGradient7642);fill-opacity:1;stroke:#000000;stroke-width:15.67965698;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;filter:url(#filter9316)" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="500" width="500" viewBox="0 0 500 500"><defs><radialGradient id="b" r="40%"><stop stop-color="#ffab00" offset="0"/><stop stop-color="orange" offset=".206"/><stop stop-color="#ffab00" offset=".247"/><stop stop-color="#f80" offset="1"/></radialGradient><filter id="a" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="3" result="result1"/><feBlend in="result1" result="result5" in2="result1" mode="multiply"/><feGaussianBlur stdDeviation="1" result="result6" in="result5"/><feComposite operator="xor" result="result8" in2="result5" in="result6"/><feComposite operator="xor" result="fbSourceGraphic" in2="result8" in="result6"/><feSpecularLighting lighting-color="#FFF" specularConstant="2.2" result="result1" specularExponent="55" in="fbSourceGraphic" surfaceScale="2"><fePointLight y="-10000" x="-5000" z="20000"/></feSpecularLighting><feComposite operator="in" result="result2" in2="fbSourceGraphic" in="result1"/><feComposite in2="result2" k3="1" k2="2" result="result4" in="fbSourceGraphic" operator="arithmetic"/><feComposite operator="in" result="result91" in2="result4" in="result4"/><feBlend mode="darken" in2="result91"/></filter></defs><path stroke-linejoin="round" d="M250 3.16l-227 123-.1 247 227 124 227-123v-247zm-.711 97.9v.006c3.78 0 7.6.297 11.5.875 41.1 6.17 72.2 40.6 66.4 70.5-5.8 29.8-33.3 56-40.1 61.7-6.81 5.69 37.1 165 37.1 165h-149.17s46.2-157 36.5-165c-9.69-8.14-41.2-36.9-36.4-68.9 4.81-32.1 37.6-64 74.2-64.1z" transform="matrix(.957 0 0 .957 10.8 11)" filter="url(#a)" stroke="#000" stroke-linecap="round" stroke-width="15.7" fill="url(#b)"/></svg>
diff --git a/tpl/bootstrap-compact.php b/tpl/bootstrap-compact.php
index 084971e2..e39652e0 100644
--- a/tpl/bootstrap-compact.php
+++ b/tpl/bootstrap-compact.php
@@ -51,7 +51,7 @@ endif; ?>
 						<span class="icon-bar"></span>
 					</button>
 					<a class="reloadlink navbar-brand" href="/">
-						<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="favicon-32x32.png" width="20" />
+						<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="img/icon.svg" width="20" />
 					</a>
 				</div>
 				<div id="navbar" class="navbar-collapse collapse">
diff --git a/tpl/bootstrap-dark-page.php b/tpl/bootstrap-dark-page.php
index 25150082..8f264cda 100644
--- a/tpl/bootstrap-dark-page.php
+++ b/tpl/bootstrap-dark-page.php
@@ -50,7 +50,7 @@ endif; ?>
 					<span class="icon-bar"></span>
 				</button>
 				<a class="reloadlink navbar-brand" href="/">
-					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="favicon-32x32.png" width="20" />
+					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="img/icon.svg" width="20" />
 				</a>
 			</div>
 			<div id="navbar" class="navbar-collapse collapse">
diff --git a/tpl/bootstrap-dark.php b/tpl/bootstrap-dark.php
index b3732968..321d16bd 100644
--- a/tpl/bootstrap-dark.php
+++ b/tpl/bootstrap-dark.php
@@ -50,7 +50,7 @@ endif; ?>
 					<span class="icon-bar"></span>
 				</button>
 				<a class="reloadlink navbar-brand" href="/">
-					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="favicon-32x32.png" width="20" />
+					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="img/icon.svg" width="20" />
 				</a>
 			</div>
 			<div id="navbar" class="navbar-collapse collapse">
diff --git a/tpl/bootstrap-page.php b/tpl/bootstrap-page.php
index 1118076e..8cda8643 100644
--- a/tpl/bootstrap-page.php
+++ b/tpl/bootstrap-page.php
@@ -50,7 +50,7 @@ endif; ?>
 					<span class="icon-bar"></span>
 				</button>
 				<a class="reloadlink navbar-brand" href="/">
-					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="favicon-32x32.png" width="20" />
+					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="img/icon.svg" width="20" />
 				</a>
 			</div>
 			<div id="navbar" class="navbar-collapse collapse">
diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php
index 7d093da2..4057b784 100644
--- a/tpl/bootstrap.php
+++ b/tpl/bootstrap.php
@@ -50,7 +50,7 @@ endif; ?>
 					<span class="icon-bar"></span>
 				</button>
 				<a class="reloadlink navbar-brand" href="/">
-					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="favicon-32x32.png" width="20" />
+					<img alt="<?php echo i18n::_('PrivateBin'); ?>" src="img/icon.svg" width="20" />
 				</a>
 			</div>
 			<div id="navbar" class="navbar-collapse collapse">