diff --git a/index.html b/index.html
index 18383925..b30d6188 100644
--- a/index.html
+++ b/index.html
@@ -50,29 +50,6 @@ layout: default
 </ul>
 <!-- end quote by Glenn Greenwald located below the header -->
 
-<!--
-<div class="page-header text-center">
-<h1>Privacy-Respecting Search Engine</h1>
-</div>
-<p>
-<img src="img/layout/privatesearch.png" class="center-block img-responsive" alt="privatesearch.io">
-</p>
-<p class="text-center">
-</p><form method="POST" action="https://www.privatesearch.io/" id="search_form" role="search">
-<div class="input-group col-md-8 col-md-offset-2">
-<input type="search" name="q" class="form-control input-lg" id="q" placeholder="Search for..." autocomplete="off" value="">
-<span class="input-group-btn">
-<button type="submit" formtarget="_blank" class="btn btn-default input-lg"><span class="hide_if_nojs"><span class="glyphicon glyphicon-search"></span></span><span class="hidden active_if_nojs">start search</span></button>
-</span>
-</div>
-</form>
-<p></p>
-<p class="text-center text-muted">example search: <a href="https://www.privatesearch.io/?q=Edward%20Snowden">Edward Snowden</a></p>
-<p class="text-center"><a href="https://www.privatesearch.io/"><strong>privatesearch.io</strong></a> is our new privacy-respecting and highly customizable search engine with excellent results. it's open source and doesn't have ads, logs or tracking.</p>
-<hr>
-<br />
--->
-
 <!-- Global Mass Surveillance - The Fourteen Eyes -->
 
 <h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> Global Mass Surveillance - The Fourteen Eyes</h1>
@@ -409,7 +386,7 @@ layout: default
                             <br>More: <a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services.</a></li>
                         <li>OpenVPN software support.</li>
                         <li>Accepts Bitcoin, cash, debit cards or cash cards as a payment method.</li>
-                        <li>No personal information is required to create an account. Only username, password and <a href="#email"><span class="glyphicon glyphicon-link"></span> Email.</a></li>
+                        <li>No personal information is required to create an account. Only username, password and <a href="#email"><i class="fas fa-link"></i> Email.</a></li>
                     </ul>
                     <p>We're not affiliated with any of the above listed VPN providers. This way can give you honest recommendations.</p>
 
@@ -484,7 +461,7 @@ layout: default
     url="https://www.firefox.com/"
     footer="OS: Windows, macOS, Linux, Android, iOS, BSD."
     description='Firefox is fast, reliable, open source and respects your privacy. Don\'t forget to adjust the settings according to our
-                recommendations: <a href="#webrtc"><span class="glyphicon glyphicon-link"></span> WebRTC</a> and <a href="#about_config"><span class="glyphicon glyphicon-link"></span> about:config</a> and get the <a href="#addons"><span class="glyphicon glyphicon-link"></span> privacy add-ons</a>.'
+                recommendations: <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> and <a href="#about_config"><i class="fas fa-link"></i> about:config</a> and get the <a href="#addons"><i class="fas fa-link"></i> privacy add-ons</a>.'
     %}
 
     {% include card.html color="warning"
@@ -540,7 +517,7 @@ layout: default
     look as common as everyone else. Disabling JavaScript, using Linux, or even the TBB, will make your browser stick out from the masses.</p>
 
 <!-- third paragraph -->
-<p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><span class="glyphicon glyphicon-link"></span> free software plugins</a> like Privacy Badger, uBlock Origin and Disconnect.
+<p>Modern web browsers have not been architected to assure personal web privacy. Rather than worrying about being fingerprinted, it seems more practical to use <a href="#addons"><i class="fas fa-link"></i> free software plugins</a> like Privacy Badger, uBlock Origin and Disconnect.
     They not only respect your freedom, but your privacy also. You can get much further with these than trying to manipulate your browser's fingerprint.</p>
 
 <!-- related information links -->
@@ -548,7 +525,7 @@ layout: default
 <ul>
     <li><a href="https://panopticlick.eff.org/static/browser-uniqueness.pdf">How Unique Is Your Web Browser? Peter Eckersley, EFF.</a></li>
     <li><a href="https://www.reddit.com/r/privacytoolsIO/comments/35pqyl/new_section_browser_fingerprint_is_your_browser/">Join our discussion on reddit.com about browser fingerprinting.</a></li>
-    <li><a href="#addons"><span class="glyphicon glyphicon-link"></span> Our Firefox privacy add-ons section.</a></li>
+    <li><a href="#addons"><i class="fas fa-link"></i> Our Firefox privacy add-ons section.</a></li>
     <li><a href="https://www.browserleaks.com/">BrowserLeaks.com</a> - Web browser security testing tools, that tell you what exactly personal identity data may be leaked without any permissions when you surf the Internet.</li>
 </ul>
 
@@ -605,7 +582,7 @@ layout: default
 <p>WebRTC cannot be fully disabled in Chrome, however it is possible to change its routing settings (and prevent leaks) using an extension. Two open source solutions include <a href="https://chrome.google.com/webstore/detail/webrtc-leak-prevent/eiadekoaikejlgdbkbdfeijglgfdalml">WebRTC Leak Prevent</a> (options may need to be changed depending on the scenario), and <a href="https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm">uBlock Origin</a> (select "Prevent WebRTC from leaking local IP addresses" in Settings).</p>
 
 <h3>What about other browsers?</h3>
-<p>Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser"><span class="glyphicon glyphicon-link"></span> But we recommend using Firefox on all devices.</a></p>
+<p>Chrome on iOS, Internet Explorer and Safari does not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>
 
 
 <!-- Firefox add-ons -->
@@ -1270,7 +1247,7 @@ layout: default
     image="img/tools/Ricochet.png"
     url="https://ricochet.im/"
     footer="OS: Windows, macOS, Linux."
-    description='Ricochet uses the <a href="#browser"><span class="glyphicon glyphicon-link"></span> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with
+    description='Ricochet uses the <a href="#browser"><i class="fas fa-link"></i> Tor network</a> to reach your contacts without relying on messaging servers. It creates a hidden service, which is used to rendezvous with
                 your contacts without revealing your location or IP address. Instead of a username, you get a unique address that looks like <em>ricochet:rs7ce36jsj24ogfw</em>. Other Ricochet users can use this address to send a contact request - asking to be
                 added to your contacts list.'
     %}
@@ -1968,7 +1945,7 @@ layout: default
 
 <h3>Warning</h3>
 <ul>
-    <li><a href="#win10"><span class="glyphicon glyphicon-link"></span> Don't use Windows 10 - It's a privacy nightmare</a></li>
+    <li><a href="#win10"><i class="fas fa-link"></i> Don't use Windows 10 - It's a privacy nightmare</a></li>
 </ul>
 
 <h3>Worth Mentioning</h3>