diff --git a/img/layout/tor.png b/img/layout/tor.png
new file mode 100644
index 00000000..7d51f2e6
Binary files /dev/null and b/img/layout/tor.png differ
diff --git a/img/layout/www.png b/img/layout/www.png
new file mode 100644
index 00000000..da0e7a62
Binary files /dev/null and b/img/layout/www.png differ
diff --git a/index.html b/index.html
index 3e838378..39ae4006 100644
--- a/index.html
+++ b/index.html
@@ -670,7 +670,7 @@
 							<a href="https://www.torproject.org/">
 								<button type="button" class="btn btn-success">Download: torproject.org</button>
 							</a>
-							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expyuzz4wqqyqhjn.onion. Requires specific software to access: torproject.org" href="http://expyuzz4wqqyqhjn.onion"><img src="img/layout/tor.svg" width="35"></img></a>
+							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expyuzz4wqqyqhjn.onion. Requires specific software to access: torproject.org" href="http://expyuzz4wqqyqhjn.onion"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
 						<p>OS: Windows, Mac, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a></p>
 					</div>
@@ -1061,8 +1061,8 @@
 						<img src="img/provider/ProtonMail.ch.gif" width="200" height="70">
 					</td>
 					<td>
-						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.protonmail.ch" href="https://www.protonmail.ch"><img src="img/layout/www.svg" width="35"></img></a>
-						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img src="img/layout/tor.svg" width="35"></img></a>
+						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.protonmail.ch" href="https://www.protonmail.ch"><img src="img/layout/www.png" width="35"></img></a>
+						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonirockerxow.onion. Requires specific software to access: torproject.org" href="https://protonirockerxow.onion"><img src="img/layout/tor.png" width="35"></img></a>
 					</td>
 					<td data-value="2013">2013</td>
 					<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
@@ -1091,7 +1091,7 @@
 						<img src="img/provider/Tutanota.gif" width="200" height="70">
 					</td>
 					<td>
-						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img src="img/layout/www.svg" width="35"></img></a>
+						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.tutanota.com" href="https://www.tutanota.com"><img src="img/layout/www.png" width="35"></img></a>
 					</td>
 					<td data-value="2011">2011</td>
 					<td><span class="flag-icon flag-icon-de"></span> Germany</td>
@@ -1107,7 +1107,7 @@
 						<img src="img/provider/Mailfence.gif" width="200" height="70">
 					</td>
 					<td>
-						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.mailfence.com" href="https://www.mailfence.com"><img src="img/layout/www.svg" width="35"></img></a>
+						<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.mailfence.com" href="https://www.mailfence.com"><img src="img/layout/www.png" width="35"></img></a>
 					</td>
 					<td data-value="2013">2013</td>
 					<td><span class="flag-icon flag-icon-be"></span> Belgium</td>
@@ -1125,7 +1125,7 @@
 
 						</td>
 						<td>
-							<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.mailbox.org" href="https://www.mailbox.org"><img src="img/layout/www.svg" width="35"></img></a>
+							<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.mailbox.org" href="https://www.mailbox.org"><img src="img/layout/www.png" width="35"></img></a>
 						</td>
 						<td data-value="2014">2014</td>
 						<td><span class="flag-icon flag-icon-de"></span> Germany</td>
@@ -1142,7 +1142,7 @@
 								<img src="img/provider/Posteo.gif" width="200" height="70">
 							</td>
 							<td>
-								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.posteo.de" href="https://www.posteo.de"><img src="img/layout/www.svg" width="35"></img></a>
+								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.posteo.de" href="https://www.posteo.de"><img src="img/layout/www.png" width="35"></img></a>
 							</td>
 							<td data-value="2009">2009</td>
 							<td><span class="flag-icon flag-icon-de"></span> Germany</td>
@@ -1159,7 +1159,7 @@
 
 							</td>
 							<td>
-								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img src="img/layout/www.svg" width="35"></img></a>
+								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img src="img/layout/www.png" width="35"></img></a>
 							</td>
 							<td data-value="1999">1999</td>
 							<td><span class="flag-icon flag-icon-no"></span> Norway</td>
@@ -1175,7 +1175,7 @@
 								<img src="img/provider/Neomailbox.gif" width="200" height="70">
 							</td>
 							<td>
-								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img src="img/layout/www.svg" width="35"></img></a>
+								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.neomailbox.com" href="https://www.neomailbox.com"><img src="img/layout/www.png" width="35"></img></a>
 							</td>
 							<td data-value="2003">2003</td>
 							<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
@@ -1191,7 +1191,7 @@
 								<img src="img/provider/StartMail.gif" width="200" height="70">
 							</td>
 							<td>
-								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img src="img/layout/www.svg" width="35"></img></a>
+								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.startmail.com" href="https://www.startmail.com"><img src="img/layout/www.png" width="35"></img></a>
 							</td>
 							<td data-value="2014">2014</td>
 							<td><span class="flag-icon flag-icon-nl"></span> Netherlands</td>
@@ -1207,7 +1207,7 @@
 								<img src="img/provider/Kolab-Now.gif" width="200" height="70">
 							</td>
 							<td>
-								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.kolabnow.com" href="https://www.kolabnow.com"><img src="img/layout/www.svg" width="35"></img></a>
+								<a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.kolabnow.com" href="https://www.kolabnow.com"><img src="img/layout/www.png" width="35"></img></a>
 							</td>
 							<td data-value="2010">2010</td>
 							<td><span class="flag-icon flag-icon-ch"></span> Switzerland</td>
@@ -1217,6 +1217,7 @@
 							<td data-value="0"><span class="label label-primary">No</span></td>
 							<td data-value="1"><span class="label label-success">Yes</span></td>
 						</tr>
+
 			</tbody>
 </table>
 
@@ -1403,7 +1404,7 @@
               <p>
 	              <a href="https://searx.me/"><button type="button" class="btn btn-success">Website: searx.me</button></a>
 	              <a href="https://github.com/asciimoo/searx/wiki/Searx-instances"><button type="button" class="btn btn-success">List of Instances</button></a>
-	              <a data-toggle="tooltip" data-placement="bottom" data-original-title="http://ulrn6sryqaifefld.onion. Requires specific software to access: torproject.org" href="http://ulrn6sryqaifefld.onion"><img src="img/layout/tor.svg" width="35"></img></a>
+	              <a data-toggle="tooltip" data-placement="bottom" data-original-title="http://ulrn6sryqaifefld.onion. Requires specific software to access: torproject.org" href="http://ulrn6sryqaifefld.onion"><img src="img/layout/tor.png" width="35"></img></a>
               </p>
 
             </div>
@@ -2099,7 +2100,7 @@
 							<a href="https://www.torproject.org/">
 								<button type="button" class="btn btn-success">Website: torproject.org</button>
 							</a>
-							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expyuzz4wqqyqhjn.onion. Requires specific software to access: torproject.org" href="http://expyuzz4wqqyqhjn.onion"><img src="img/layout/tor.svg" width="35"></img></a>
+							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://expyuzz4wqqyqhjn.onion. Requires specific software to access: torproject.org" href="http://expyuzz4wqqyqhjn.onion"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
 						<p>OS: Windows, Mac, Linux, <a href="https://mike.tig.as/onionbrowser/">iOS</a>, <a href="https://www.torproject.org/docs/android.html.en">Android</a>, <a href="https://github.com/torbsd/openbsd-ports">OpenBSD.</a></p>
 					</div>
@@ -2472,7 +2473,7 @@
 							<a href="https://www.qubes-os.org/">
 								<button type="button" class="btn btn-success">Website: qubes-os.org</button>
 							</a>
-							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://qubesos4rrrrz6n4.onion. Requires specific software to access: torproject.org" href="http://qubesos4rrrrz6n4.onion"><img src="img/layout/tor.svg" width="35"></img></a>
+							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://qubesos4rrrrz6n4.onion. Requires specific software to access: torproject.org" href="http://qubesos4rrrrz6n4.onion"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
 					</div>
 				</div>
@@ -2490,7 +2491,7 @@
 							<a href="https://www.debian.org/">
 								<button type="button" class="btn btn-info">Website: debian.org</button>
 							</a>
-							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://sejnfjrq6szgca7v.onion. Requires specific software to access: torproject.org" href="http://sejnfjrq6szgca7v.onion"><img src="img/layout/tor.svg" width="35"></img></a>
+							<a data-toggle="tooltip" data-placement="bottom" data-original-title="http://sejnfjrq6szgca7v.onion. Requires specific software to access: torproject.org" href="http://sejnfjrq6szgca7v.onion"><img src="img/layout/tor.png" width="35"></img></a>
 						</p>
 					</div>
 				</div>