diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index 26b12213..9718d5d4 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -33,8 +33,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://adguard.com/en/privacy/dns.html" href="https://adguard.com/en/privacy/dns.html">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://adguard.com/en/privacy/dns.html">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
@@ -51,8 +53,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/AdguardTeam/AdGuardDNS/" href="https://github.com/AdguardTeam/AdGuardDNS/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/AdguardTeam/AdGuardDNS/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -81,9 +85,13 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"No logs."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;No logs.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </div>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
@@ -108,8 +116,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/ookangzheng/blahdns/" href="https://github.com/ookangzheng/blahdns/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/ookangzheng/blahdns/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -136,8 +146,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.cloudflare.com/privacypolicy/" href="https://www.cloudflare.com/privacypolicy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://www.cloudflare.com/privacypolicy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
@@ -161,8 +173,12 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td><a data-toggle="tooltip" data-placement="bottom" data-original-title='"CZ.NIC is an interest association of legal entities, founded in 1998 by leading providers of Internet services."' href="https://www.nic.cz/page/351/about-association/">Association</a></td>
@@ -186,8 +202,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc" href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/bhanupratapys/dnswarden/blob/master/README.md#privacy-policy-and-tc">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -227,8 +245,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://appliedprivacy.net/privacy-policy" href="https://appliedprivacy.net/privacy-policy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://appliedprivacy.net/privacy-policy">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Non-Profit</td>
@@ -263,8 +283,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://www.nextdns.io/privacy" href="https://www.nextdns.io/privacy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://www.nextdns.io/privacy">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Commercial</td>
@@ -303,8 +325,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://nixnet.xyz/privacy/" href="https://nixnet.xyz/privacy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://nixnet.xyz/privacy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -322,8 +346,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://git.nixnet.xyz/NixNet/dns" href="https://git.nixnet.xyz/NixNet/dns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://git.nixnet.xyz/NixNet/dns">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -344,8 +370,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://powerdns.org/doh/privacy.html" href="https://powerdns.org/doh/privacy.html">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://powerdns.org/doh/privacy.html">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -355,8 +383,10 @@
         <td>No</td>
         <td>No</td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://github.com/PowerDNS/pdns" href="https://github.com/PowerDNS/pdns">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://github.com/PowerDNS/pdns">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
@@ -377,8 +407,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://quad9.net/policy/" href="https://quad9.net/policy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://quad9.net/policy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Non-Profit</td>
@@ -411,8 +443,10 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://securedns.eu/#privacy" href="https://securedns.eu/#privacy">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://securedns.eu/#privacy">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>Hobby Project</td>
@@ -444,12 +478,14 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://snopyta.org/privacy_policy/" href="https://snopyta.org/privacy_policy/">
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
+          <a
+            class="btn-secondary btn-icon"
+            href="https://snopyta.org/privacy_policy/">
+            <span class="fas fa-globe"></span>
           </a>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='Part of LibreHosters, "a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms."' href="https://libreho.st/">
+          <a data-toggle="tooltip" data-placement="bottom" data-original-title="Part of LibreHosters, &quot;a network of cooperation and solidarity that uses free software to encourage decentralisation through federation and distributed platforms.&quot;" href="https://libreho.st/">
             Informal collective
           </a>
         </td>
@@ -491,9 +527,13 @@
           </span>
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title='"Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service."'>
-            <img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35">
-          </a>
+          <div
+            class="btn-secondary btn-icon"
+            title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="fas fa-globe"></span>
+          </div>
         </td>
         <td>Hobby Project</td>
         <td>No</td>
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index 8e35c78e..94ad17e6 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -27,7 +27,11 @@
           <img alt="Disroot" src="/assets/img/provider/disroot.org.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://disroot.org" href="https://disroot.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://disroot.org">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2015">2015</td>
         <td>
@@ -47,7 +51,11 @@
           <img alt="Kolab Now" src="/assets/img/provider/Kolab-Now.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://kolabnow.com" href="https://kolabnow.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://kolabnow.com">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2010">2010</td>
         <td>
@@ -68,7 +76,11 @@
 
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailbox.org" href="https://mailbox.org"><img alt="WWW" src="/assets/img/layout/www.png" width="35 "height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://mailbox.org">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2014">2014</td>
         <td>
@@ -88,7 +100,11 @@
           <img alt="Mailfence" src="/assets/img/provider/Mailfence.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://mailfence.com" href="https://mailfence.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            href="https://mailfence.com"
+            class="btn-secondary btn-icon">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2013">2013</td>
         <td>
@@ -108,7 +124,11 @@
           <img alt="Posteo" src="/assets/img/provider/Posteo.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://posteo.de" href="https://posteo.de"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://posteo.de">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2009">2009</td>
         <td>
@@ -128,8 +148,19 @@
           <img alt="Protonmail" src="/assets/img/provider/ProtonMail.ch.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://protonmail.com" href="https://protonmail.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></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 alt="Tor" src="/assets/img/layout/tor.png" width="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://protonmail.com">
+            <span class="fas fa-globe"></span>
+          </a>
+          <a
+            class="btn-tor btn-icon mt-1"
+            href="https://protonirockerxow.onion"
+            title="Requires specific software to access: torproject.org"
+            data-toggle="tooltip"
+            data-placement="bottom">
+            <span class="ptio-tor"></span>
+          </a>
         </td>
         <td data-value="2013">2013</td>
         <td>
@@ -150,7 +181,11 @@
 
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://runbox.com" href="https://runbox.com"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://runbox.com">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="1999">1999</td>
         <td>
@@ -170,7 +205,11 @@
           <img alt="Soverin" src="/assets/img/provider/Soverin.png" width="200" height="70">
         </td>
         <td>
-          <a data-toggle="tooltip" data-placement="bottom" data-original-title="https://soverin.net/" href="https://soverin.net/"><img alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://soverin.net">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2015">2015</td>
         <td>
@@ -190,7 +229,11 @@
           <img alt="StartMail" src="/assets/img/provider/StartMail.png" 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 alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://startmail.com">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2014">2014</td>
         <td>
@@ -210,7 +253,11 @@
           <img alt="Tutanota" src="/assets/img/provider/Tutanota.png" 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 alt="WWW" src="/assets/img/layout/www.png" width="35" height="35"></a>
+          <a
+            class="btn-secondary btn-icon"
+            href="https://tutanota.com">
+            <span class="fas fa-globe"></span>
+          </a>
         </td>
         <td data-value="2011">2011</td>
         <td>
diff --git a/assets/css/style.scss b/assets/css/style.scss
index 8ec6e563..5e82a96d 100644
--- a/assets/css/style.scss
+++ b/assets/css/style.scss
@@ -204,12 +204,19 @@ footer {
 
 
 .btn-icon {
+  display: flex;
+  justify-content: center;
   font-size: 1.5rem;
   padding: 0.5rem;
   border-radius: 0.25rem;
   display: flex;
   height: 2.4rem;
-  color: #ddd;
+  width: 2.4rem;
+  color: #eee;
+}
+.btn-icon:hover {
+  text-decoration: none;
+  color: #fff;
 }
 
 .btn-tor {
diff --git a/assets/img/layout/www.png b/assets/img/layout/www.png
deleted file mode 100644
index ba318b3a..00000000
Binary files a/assets/img/layout/www.png and /dev/null differ
diff --git a/assets/img/layout/www.svg b/assets/img/layout/www.svg
deleted file mode 100644
index 4400f1a2..00000000
--- a/assets/img/layout/www.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 128 128" id="Layer_1" version="1.1" viewBox="0 0 128 128" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><circle cx="64" cy="64" fill="#4B5F83" id="circle" r="64"/><path d="M94,64c0-16.6-13.4-30-30-30S34,47.4,34,64s13.4,30,30,30c7,0,13.5-2.4,18.6-6.5  c0.2,0,0.4-0.1,0.6-0.1c0-0.1-0.1-0.2-0.1-0.3C89.8,81.6,94,73.3,94,64z M89.9,62H74c-0.1-3.6-0.4-7.1-0.8-10.2  c3.3-1.7,6-4.3,7.9-7.4C86.1,48.7,89.4,55,89.9,62z M64,90c-2,0-3.9-4.4-4.9-11.2c1.6-0.5,3.2-0.8,4.9-0.8c1.7,0,3.4,0.3,4.9,0.8  C67.9,85.6,66,90,64,90z M72.4,80.4c2.3,1.4,4.1,3.3,5.5,5.6c-2.6,1.6-5.5,2.8-8.6,3.5C70.5,87.1,71.6,84,72.4,80.4z M58.7,89.5  c-3.1-0.6-6-1.8-8.6-3.5c1.3-2.3,3.2-4.2,5.5-5.6C56.4,84,57.5,87.1,58.7,89.5z M64.4,74c-2,0-4,0.3-5.8,0.9  c-0.3-2.7-0.5-5.7-0.5-8.9h12c-0.1,3.1-0.2,6-0.5,8.7C67.8,74.2,66.2,74,64.4,74z M58,62c0.1-3.1,0.2-6.1,0.5-8.8  c1.7,0.5,3.6,0.8,5.5,0.8c1.9,0,3.7-0.3,5.5-0.8c0.3,2.7,0.5,5.7,0.5,8.8H58z M64,38c2,0,3.8,4.4,4.9,11.1c-1.7,0.6-3.4,0.9-5.3,0.9  c-1.6,0-3.1-0.2-4.6-0.7C60.1,42.5,61.9,38,64,38z M55.6,47.8c-2.3-1.4-4.3-3.3-5.7-5.7c2.7-1.7,5.6-3,8.8-3.6  C57.5,40.9,56.4,44.1,55.6,47.8z M69.3,38.5c3,0.6,5.7,1.7,8.2,3.3c-1.3,2.3-3.1,4.2-5.2,5.6C71.5,43.8,70.5,40.8,69.3,38.5z   M46.9,44.4c1.9,3.1,4.6,5.7,7.9,7.4c-0.5,3.2-0.8,6.6-0.8,10.2H38.1C38.6,55,41.9,48.7,46.9,44.4z M38.1,66H54  c0.1,3.7,0.4,7.2,0.9,10.4c-3.2,1.7-5.8,4.3-7.7,7.4C42.1,79.5,38.6,73.1,38.1,66z M73.2,76c0.5-3.1,0.7-6.5,0.8-10h15.9  c-0.5,6.9-3.7,13-8.6,17.4C79.3,80.2,76.5,77.7,73.2,76z" fill="#FFFFFF" id="globe"/></svg>
\ No newline at end of file