diff --git a/_layouts/default.html b/_layouts/default.html
index 9e3f115a..5e0e966b 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -85,15 +85,15 @@
             Provider
             </a>
             <div class="dropdown-menu" aria-labelledby="providerDropdown">
-            <a class="dropdown-item" href="{{prefix}}#ukusa"><i class="fab fa-creative-commons-nc"></i> Avoid all US and UK based services</a>
-            <a class="dropdown-item" href="{{prefix}}#vpn"><i class="far fa-eye-slash"></i> Virtual Private Network (VPN)</a>
-            <a class="dropdown-item" href="{{prefix}}#email"><i class="fas fa-mail-bulk"></i> Privacy Email</a>
-            <a class="dropdown-item" href="{{prefix}}#wc"><i class="fa fa-exclamation-circle"></i> Warrant Canaries</a>
-            <a class="dropdown-item" href="{{prefix}}#cloud"><i class="fas fa-cloud"></i> Encrypted Cloud Storage Services</a>
-            <a class="dropdown-item" href="{{prefix}}#social"><i class="fas fa-expand-arrows-alt"></i> Decentralized Social Networks</a>
-            <a class="dropdown-item" href="{{prefix}}#dns"><i class="fa fa-tasks"></i> Domain Name System (DNS)</a>
-            <a class="dropdown-item" href="{{prefix}}#search"><i class="fab fa-searchengin"></i> Privacy Respecting Search Engines</a>
-            <a class="dropdown-item" href="{{prefix}}#host"><i class="fas fa-database"></i> Secure Hosting Providers</a>
+            <a class="dropdown-item" href="{{prefix}}#ukusa">Avoid all US and UK based services</a>
+            <a class="dropdown-item" href="{{prefix}}#vpn">Virtual Private Network (VPN)</a>
+            <a class="dropdown-item" href="{{prefix}}#email">Privacy Email</a>
+            <a class="dropdown-item" href="{{prefix}}#wc">Warrant Canaries</a>
+            <a class="dropdown-item" href="{{prefix}}#cloud">Encrypted Cloud Storage Services</a>
+            <a class="dropdown-item" href="{{prefix}}#social">Decentralized Social Networks</a>
+            <a class="dropdown-item" href="{{prefix}}#dns">Domain Name System (DNS)</a>
+            <a class="dropdown-item" href="{{prefix}}#search">Privacy Respecting Search Engines</a>
+            <a class="dropdown-item" href="{{prefix}}#host">Secure Hosting Providers</a>
             </div>
         </li>
         <li class="nav-item dropdown">
@@ -101,11 +101,11 @@
                 Browser
             </a>
             <div class="dropdown-menu" aria-labelledby="browserDropdown">
-                <a class="dropdown-item" href="{{prefix}}#browser"><i class="fas fa-check"></i> Recommendation</a>
-                <a class="dropdown-item" href="{{prefix}}#fingerprint"><i class="fas fa-fingerprint"></i> Fingerprint</a>
-                <a class="dropdown-item" href="{{prefix}}#webrtc"><i class="far fa-eye"></i> WebRTC IP Leak</a>
-                <a class="dropdown-item" href="{{prefix}}#addons"><i class="far fa-list-alt"></i> Firefox Privacy Add-ons</a>
-                <a class="dropdown-item" href="{{prefix}}#about_config"><i class="fas fa-wrench"></i> Privacy Related Tweaks</a>
+                <a class="dropdown-item" href="{{prefix}}#browser">Recommendation</a>
+                <a class="dropdown-item" href="{{prefix}}#fingerprint">Fingerprint</a>
+                <a class="dropdown-item" href="{{prefix}}#webrtc">WebRTC IP Leak</a>
+                <a class="dropdown-item" href="{{prefix}}#addons">Firefox Privacy Add-ons</a>
+                <a class="dropdown-item" href="{{prefix}}#about_config">Privacy Related Tweaks</a>
             </div>
         </li>
         <li class="nav-item dropdown">
@@ -113,20 +113,25 @@
                 Software
             </a>
             <div class="dropdown-menu" aria-labelledby="softwareDropdown">
-                <a class="dropdown-item" href="{{prefix}}#clients"><i class="fas fa-envelope"></i> Email Clients</a>
-                <a class="dropdown-item" href="{{prefix}}#messaging"><i class="fas fa-random"></i> Email Alternatives</a>
-                <a class="dropdown-item" href="{{prefix}}#im"><i class="fab fa-telegram-plane"></i> Instant Messenger</a>
-                <a class="dropdown-item" href="{{prefix}}#voip"><i class="fas fa-phone"></i> Video & Voice Messenger</a>
-                <a class="dropdown-item" href="{{prefix}}#filesharing"><i class="fas fa-file-export"></i> File Sharing</a>
-                <a class="dropdown-item" href="{{prefix}}#mycloud"><i class="fas fa-hdd"></i> Self-Hosted Cloud Server</a>
-                <a class="dropdown-item" href="{{prefix}}#sync"><i class="fas fa-copy"></i> Secure File Sync</a>
-                <a class="dropdown-item" href="{{prefix}}#pw"><i class="fas fa-user-lock"></i> Password Manager</a>
-                <a class="dropdown-item" href="{{prefix}}#calendar_contacts"><i class="far fa-calendar-alt"></i> Calendar and Contacts Sync</a>
-                <a class="dropdown-item" href="{{prefix}}#encrypt"><i class="fas fa-lock"></i> File Encryption</a>
-                <a class="dropdown-item" href="{{prefix}}#darknets"><i class="fas fa-user-secret"></i> Self-contained Networks</a>
-                <a class="dropdown-item" href="{{prefix}}#notebook"><i class="far fa-sticky-note"></i> Digital Notebook</a>
-                <a class="dropdown-item" href="{{prefix}}#paste"><i class="fas fa-paste"></i> Paste Services</a>
-                <a class="dropdown-item" href="{{prefix}}#productivity"><i class="fas fa-briefcase"></i> Productivity Tools</a>
+                <a class="dropdown-item" href="{{prefix}}#clients">Email Clients</a>
+                <a class="dropdown-item" href="{{prefix}}#messaging">Email Alternatives</a>
+                <a class="dropdown-item" href="{{prefix}}#search">Search Engines</a>
+                <a class="dropdown-item" href="{{prefix}}#im">Instant Messenger</a>
+                <a class="dropdown-item" href="{{prefix}}#voip">Video & Voice Messenger</a>
+                <a class="dropdown-item" href="{{prefix}}#filesharing">File Sharing</a>
+                <a class="dropdown-item" href="{{prefix}}#cloud">Encrypted Cloud Storage</a>
+                <a class="dropdown-item" href="{{prefix}}#mycloud">Self-Hosted Cloud Server</a>
+                <a class="dropdown-item" href="{{prefix}}#sync">Secure File Sync</a>
+                <a class="dropdown-item" href="{{prefix}}#pw">Password Manager</a>
+                <a class="dropdown-item" href="{{prefix}}#calendar_contacts">Calendar and Contacts Sync</a>
+                <a class="dropdown-item" href="{{prefix}}#encrypt">File Encryption</a>
+                <a class="dropdown-item" href="{{prefix}}#darknets">Self-contained Networks</a>
+                <a class="dropdown-item" href="{{prefix}}#social">Social Networks</a>
+                <a class="dropdown-item" href="{{prefix}}#dns">DNS</a>
+                <a class="dropdown-item" href="{{prefix}}#notebook">Digital Notebook</a>
+                <a class="dropdown-item" href="{{prefix}}#paste">Paste Services</a>
+                <a class="dropdown-item" href="{{prefix}}#productivity">Productivity Tools</a>
+                <a class="dropdown-item" href="{{prefix}}#win10">Don't use Windows 10</a>
             </div>
         </li>
         <li class="nav-item dropdown">
@@ -134,18 +139,16 @@
                 OS
             </a>
             <div class="dropdown-menu" aria-labelledby="osDropdown">
-                <a class="dropdown-item" href="{{prefix}}#os"><i class="fas fa-th-large"></i> PC OS</a>
-                <a class="dropdown-item" href="{{prefix}}#live_os"><i class="fas fa-compact-disc"></i> Live CD OS</a>
-                <a class="dropdown-item" href="{{prefix}}#mobile_os"><i class="fas fa-mobile-alt"></i> Mobile OS</a>
-                <a class="dropdown-item" href="{{prefix}}#aaddons"><i class="fas fa-th"></i> Android Privacy Add-ons</a>
-                <a class="dropdown-item" href="{{prefix}}#firmware"><i class="fas fa-signal"></i> Router Firmware</a>
-								<a class="dropdown-item" href="{{prefix}}#win10"><i class="far fa-thumbs-down"></i> Don't use Windows 10</a>
+                <a class="dropdown-item" href="{{prefix}}#os">PC OS</a>
+                <a class="dropdown-item" href="{{prefix}}#live_os">Live CD OS</a>
+                <a class="dropdown-item" href="{{prefix}}#mobile_os">Mobile OS</a>
+                <a class="dropdown-item" href="{{prefix}}#aaddons">Android Privacy Add-ons</a>
+                <a class="dropdown-item" href="{{prefix}}#firmware">Router Firmware</a>
             </div>
         </li>
         <li class="nav-item">
             <a class="nav-link" href="#participate">Participate</a>
         </li>
-				<!--
         <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="shareDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Share
@@ -164,9 +167,7 @@
         <li class="nav-item">
             <a class="nav-link" href="https://twitter.com/privacytoolsIO">Twitter</a>
         </li>
-
-			-->
-			</ul>
+        </ul>
         <ul class="navbar-nav">
         {% if page.active_page == "donate" %}
             <li class="nav-item active">