diff --git a/404.html b/404.html
index bf23a26f..6e8e7276 100644
--- a/404.html
+++ b/404.html
@@ -11,13 +11,13 @@ active_page: 404
     <div class="col-md-6 offset-md-3">
       <div class="card card-list">
         <ul class="list-group list-group-flush">
-          <li class="list-group-item"><a href="/"><em class="fas fa-home"></em> Back to our Homepage</a></li>
-          <li class="list-group-item"><a href="/providers/"><em class="fas fa-server"></em> Privacy Focused Service Providers</a></li>
-          <li class="list-group-item"><a href="/browsers/"><em class="fas fa-compass"></em> Privacy Protecting Web Browsers</a></li>
-          <li class="list-group-item"><a href="/software/"><em class="fas fa-window-restore"></em> Privacy-Centric Software</a></li>
+          <li class="list-group-item"><a href="/"><i class="fas fa-home"></i> Back to our Homepage</a></li>
+          <li class="list-group-item"><a href="/providers/"><i class="fas fa-server"></i> Privacy Focused Service Providers</a></li>
+          <li class="list-group-item"><a href="/browsers/"><i class="fas fa-compass"></i> Privacy Protecting Web Browsers</a></li>
+          <li class="list-group-item"><a href="/software/"><i class="fas fa-window-restore"></i> Privacy-Centric Software</a></li>
         </ul>
       </div>
     </div>
   </div>
-  <p class="text-danger text-center"><em class="fas fa-exclamation-circle"></em> If you believe you reached this page in error, please <a href="/contact/">contact us</a>!</p>
+  <p class="text-danger text-center"><i class="fas fa-exclamation-circle"></i> If you believe you reached this page in error, please <a href="/contact/">contact us</a>!</p>
 </div>
diff --git a/_includes/badge.html b/_includes/badge.html
index 2a2738de..f069d819 100644
--- a/_includes/badge.html
+++ b/_includes/badge.html
@@ -3,8 +3,8 @@
   href="{{ include.link }}" class="badge badge-{{ include.color | default: "info" }}"
   {% if include.tooltip %}
   data-toggle="tooltip"
-  data-original-title="{{ include.tooltip }}"><em class="{{ include.icon | default: "far fa-question-circle"}}"></em> {{ include.text }}
-{% else %}><em class="{{ include.icon | default: "fas fa-external-link-alt"}}"></em> {{ include.text }}{% endif %}
+  data-original-title="{{ include.tooltip }}"><i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{ include.text }}
+{% else %}><i class="{{ include.icon | default: "fas fa-external-link-alt"}}"></i> {{ include.text }}{% endif %}
 </a>
 {% else %}
 <span
@@ -12,9 +12,9 @@
   {% if include.tooltip %}
     data-toggle="tooltip"
     data-original-title="{{ include.tooltip }}"
-    > <em class="{{ include.icon | default: "far fa-question-circle"}}"></em> {{include.text}}
+    > <i class="{{ include.icon | default: "far fa-question-circle"}}"></i> {{include.text}}
   {% else %}
-    > {% if include.icon %}<em class="{{ include.icon }}"></em>{% endif %} {{include.text}}
+    > {% if include.icon %}<i class="{{ include.icon }}"></i>{% endif %} {{include.text}}
   {% endif %}
 </span>
 {% endif %}
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs.html
index 01f198db..b744bb53 100644
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs.html
@@ -2,7 +2,7 @@
   {% assign crumbs = page.url | remove:'/index.html' | split: '/' %}
   <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">
     <li class="breadcrumb-item">
-      <a href="/"><em class="fas fa-home" aria-hidden="true"></em> <span>Home</span></a>
+      <a href="/"><i class="fas fa-home" aria-hidden="true"></i> <span>Home</span></a>
     </li>
     {% for crumb in crumbs offset: 1 %}
     {% if forloop.last %}
diff --git a/_includes/card.html b/_includes/card.html
index 4dbc1303..9a294a60 100644
--- a/_includes/card.html
+++ b/_includes/card.html
@@ -16,7 +16,7 @@
                     {% assign color = label_data[0] %}
                     {% assign text = label_data[1] %}
                     {% assign tooltip = label_data[2] | default: "" %}
-                    {% assign help_icon = '<em class="far fa-question-circle"></em>' %}
+                    {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
                     <span class="badge badge-{{color}}" {% if tooltip %} data-toggle="tooltip" data-original-title="{{ tooltip }}">{{text}} {{ help_icon
                         }}
                         {% else %}
@@ -30,7 +30,7 @@
               {% if include.image %}
               <img src="{{include.image}}" width="120" height="120" alt="{{include.title}}" class="panel-item">
               {% elsif include.icon %}
-              <em class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></em>
+              <i class="{{ include.icon }} panel-icon{% if include.iconcolor %} text-{{include.iconcolor}}{% endif %}"></i>
               {% elsif include.font %}
               <span class="{{ include.font }} panel-item panel-font" alt="{{ include.title }}"></span>
               {% endif %}
diff --git a/_includes/cardv2.html b/_includes/cardv2.html
index 1a52770c..8982b84b 100644
--- a/_includes/cardv2.html
+++ b/_includes/cardv2.html
@@ -9,7 +9,7 @@
           {% assign color = badge_data[0] %}
           {% assign text = badge_data[1] %}
           {% assign tooltip = badge_data[2] | default: false %}
-          {% assign help_icon = '<em class="far fa-question-circle"></em>' %}
+          {% assign help_icon = '<i class="far fa-question-circle"></i>' %}
           <span
             class="badge badge-{{color}}"
             {% if tooltip %}
@@ -78,7 +78,7 @@
           href="{{include.website}}"
           rel="noopener"
           class="btn btn-primary mt-1 mr-1">
-          <em class="fas fa-external-link-alt fa-fw"></em>
+          <i class="fas fa-external-link-alt fa-fw"></i>
           Website
         </a>
         {% if include.privacy-policy %}
@@ -86,7 +86,7 @@
           href="{{include.privacy-policy}}"
           rel="noopener"
           class="btn btn-warning mt-1 mr-1">
-          <em class="fas fa-book fa-fw"></em>
+          <i class="fas fa-book fa-fw"></i>
           Privacy Policy
         </a>
         {% endif %}
@@ -95,7 +95,7 @@
             href="{{include.forum}}"
             rel="noopener"
             class="btn btn-success mt-1 mr-1">
-            <em class="fab fa-discourse fa-fw"></em>
+            <i class="fab fa-discourse fa-fw"></i>
             Forum
           </a>
         {% endif %}
@@ -127,170 +127,170 @@
           {% if include.windows %}
             {% if include.windows != "" %}
               <a href="{{ include.windows }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-windows fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-windows fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-windows fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.mac %}
             {% if include.mac != "" %}
               <a href="{{ include.mac }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-macos fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-macos fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-macos fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.linux %}
             {% if include.linux != "" %}
               <a href="{{ include.linux }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-linux fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-linux fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-linux fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.freebsd %}
             {% if include.freebsd != "" %}
               <a href="{{ include.freebsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-freebsd fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.openbsd %}
             {% if include.openbsd != "" %}
               <a href="{{ include.openbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-openbsd fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.netbsd %}
             {% if include.netbsd != "" %}
               <a href="{{ include.netbsd }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-netbsd fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.firefox %}
             {% if include.firefox != "" %}
               <a href="{{ include.firefox }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-firefox fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.chrome %}
             {% if include.chrome != "" %}
               <a href="{{ include.chrome }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-chrome fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.safari %}
             {% if include.safari != "" %}
               <a href="{{ include.safari }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-safari fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-safari fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-safari fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.opera %}
             {% if include.opera != "" %}
               <a href="{{ include.opera }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-opera fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-opera fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-opera fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.edge %}
             {% if include.edge != "" %}
               <a href="{{ include.edge }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-edge fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-edge fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-edge fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.fdroid %}
             {% if include.fdroid != "" %}
               <a href="{{ include.fdroid }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-f-droid fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.googleplay %}
             {% if include.googleplay != "" %}
               <a href="{{ include.googleplay }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-google-play fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.android %}
             {% if include.android != "" %}
               <a href="{{ include.android }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fab fa-android fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fab fa-android fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fab fa-android fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.ios %}
             {% if include.ios != "" %}
               <a href="{{ include.ios }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-ios fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-ios fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-ios fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.sailfish %}
             {% if include.sailfish != "" %}
               <a href="{{ include.sailfish }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></em>
+                <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></em>
+              <i class="ptio-sailfish-os fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
           {% if include.web %}
             {% if include.web != "" %}
               <a href="{{ include.web }}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-                <em class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></em>
+                <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
               </a>
             {% else %}
-              <em class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></em>
+              <i class="fas fa-globe-americas fa-2x fa-fw d-inline pr-1"></i>
             {% endif %}
           {% endif %}
 
@@ -300,25 +300,25 @@
 
           {% if include.github %}
             <a href="{{include.github}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-              <em class="fab fa-github fa-2x fa-fw d-inline"></em>
+              <i class="fab fa-github fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.gitlab %}
             <a href="{{include.gitlab}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-              <em class="fab fa-gitlab fa-2x fa-fw d-inline"></em>
+              <i class="fab fa-gitlab fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.git %}
             <a href="{{include.git}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-              <em class="fab fa-git-square fa-2x fa-fw d-inline"></em>
+              <i class="fab fa-git-square fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
           {% if include.source %}
             <a href="{{include.source}}" rel="noopener" class="text-decoration-none hover-text-decoration-none">
-              <em class="fas fa-code-branch fa-2x fa-fw d-inline"></em>
+              <i class="fas fa-code-branch fa-2x fa-fw d-inline"></i>
             </a>
           {% endif %}
 
diff --git a/_includes/footer.html b/_includes/footer.html
index 4f1481f1..38ea9d03 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -7,36 +7,36 @@
   <div class="row mb-4">
     <div class="col-12 col-md-6 d-flex justify-content-between">
       <a href="mailto:?subject=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&body={{ site.production_url }}/" class="share-btn email" title="Email">
-        <em class="fas fa-envelope"></em>
+        <i class="fas fa-envelope"></i>
       </a>
 
       <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.production_url }}" class="share-btn facebook" title="Facebook">
-        <em class="fab fa-facebook-f"></em>
+        <i class="fab fa-facebook-f"></i>
       </a>
 
       <a href="https://twitter.com/share?text=Knowledge%20and%20tools%20to%20protect%20your%20privacy%20against%20global%20mass%20surveillance%20&amp;url={{ site.production_url }}/&amp;via=privacytoolsIO" class="share-btn twitter" title="Twitter">
-        <em class="fab fa-twitter"></em>
+        <i class="fab fa-twitter"></i>
       </a>
 
       <a href="https://sharetomastodon.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn mastodon" title="Mastodon">
-        <em class="fab fa-mastodon"></em>
+        <i class="fab fa-mastodon"></i>
       </a>
     </div>
     <div class="col-12 col-md-6 d-flex justify-content-between">
       <a href="https://reddit.com/submit?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn reddit" title="reddit">
-        <em class="fab fa-reddit-alien"></em>
+        <i class="fab fa-reddit-alien"></i>
       </a>
 
       <a href="https://www.linkedin.com/shareArticle?url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn linkedin" title="LinkedIn">
-        <em class="fab fa-linkedin-in"></em>
+        <i class="fab fa-linkedin-in"></i>
       </a>
 
       <a href="https://mix.com/mixit?su=submit&url={{ site.production_url }}&title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance" class="share-btn mix" title="Mix">
-        <em class="ptio-mix"></em>
+        <i class="ptio-mix"></i>
       </a>
 
       <a href="https://sharetodiaspora.github.io/?title=privacytools.io%20-%20encryption%20against%20global%20mass%20surveillance&url={{ site.production_url }}" class="share-btn diaspora" title="Diaspora*">
-        <em class="fas fa-asterisk"></em>
+        <i class="fas fa-asterisk"></i>
       </a>
     </div>
   </div>
diff --git a/_includes/sections/android-addons.html b/_includes/sections/android-addons.html
index 35ef8c35..9220156f 100644
--- a/_includes/sections/android-addons.html
+++ b/_includes/sections/android-addons.html
@@ -1,4 +1,4 @@
-<h1 id="aaddons" class="anchor"><a href="#aaddons"><em class="fas fa-link anchor-icon"></em></a> Android Privacy Add-ons</h1>
+<h1 id="aaddons" class="anchor"><a href="#aaddons"><i class="fas fa-link anchor-icon"></i></a> Android Privacy Add-ons</h1>
 
 <div class="container-fluid">
 
diff --git a/_includes/sections/android-operating-systems.html b/_includes/sections/android-operating-systems.html
index 22a1a14e..6825a1bf 100644
--- a/_includes/sections/android-operating-systems.html
+++ b/_includes/sections/android-operating-systems.html
@@ -1,6 +1,6 @@
-<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><em class="fas fa-link anchor-icon"></em></a> Mobile Operating Systems</h1>
+<h1 id="mobile_os" class="anchor"><a href="#mobile_os"><i class="fas fa-link anchor-icon"></i></a> Mobile Operating Systems</h1>
 
-<h2 id="aosp_os" class="anchor"><a href="#aosp_os"><em class="fas fa-link anchor-icon"></em></a> Android-based Operating Systems</h1>
+<h2 id="aosp_os" class="anchor"><a href="#aosp_os"><i class="fas fa-link anchor-icon"></i></a> Android-based Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>Even though the source code of the following operating systems is provided, installing Google Apps may compromise your setup.</strong>
diff --git a/_includes/sections/browser-addons.html b/_includes/sections/browser-addons.html
index ba21f96f..beebabc2 100644
--- a/_includes/sections/browser-addons.html
+++ b/_includes/sections/browser-addons.html
@@ -1,4 +1,4 @@
-<h1 id="addons" class="anchor"><a href="#addons"><em class="fas fa-link anchor-icon"></em></a> Recommended Browser Add-ons</h1>
+<h1 id="addons" class="anchor"><a href="#addons"><i class="fas fa-link anchor-icon"></i></a> Recommended Browser Add-ons</h1>
 
 <div class="alert alert-secondary" role="alert">
   Not all of these add-ons are necessary, and many provide redundant functionality. Choose the ones you need, and <a class="alert-link" href="https://blog.privacytools.io/firefox-privacy-an-introduction-to-safe/">learn more with our guide to Firefox Privacy</a>.
@@ -97,7 +97,7 @@
 {% include cardv2.html
   title="Snowflake"
   image="/assets/img/svg/3rd-party/snowflake.svg"
-  description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <strong>Note:</strong> This add-on does not work with WebRTC disabled."
+  description="<strong>Snowflake</strong> is a new <a href=https://2019.www.torproject.org/docs/pluggable-transports.html.en>pluggable transport</a> from the Tor Project. If you have an uncensored connection, running this extension volunteers your connection to be used as a Snowflake proxy to help users unable to connect to the Tor network. Your IP will not be visible to the sites users visit using your proxy, as this extension will not make you an exit node. If your access to the Tor network is blocked, this extension will not assist you, and you should use the <a href=https://www.torproject.org>Tor Browser</a> instead. <b>Note:</b> This add-on does not work with WebRTC disabled."
   website="https://snowflake.torproject.org"
   forum="https://forum.privacytools.io/t/discussion-snowflake/1146"
   git="https://gitweb.torproject.org/pluggable-transports/snowflake.git"
diff --git a/_includes/sections/browser-fingerprint.html b/_includes/sections/browser-fingerprint.html
index bc551547..787075cb 100644
--- a/_includes/sections/browser-fingerprint.html
+++ b/_includes/sections/browser-fingerprint.html
@@ -1,4 +1,4 @@
-<h1 id="fingerprint" class="anchor"><a href="#fingerprint"><em class="fas fa-link anchor-icon"></em></a> Browser Fingerprint - Is your browser configuration unique?</h1>
+<h1 id="fingerprint" class="anchor"><a href="#fingerprint"><i class="fas fa-link anchor-icon"></i></a> Browser Fingerprint - Is your browser configuration unique?</h1>
 
 <div class="alert alert-warning" role="alert">
   Your Browser sends information that makes you unique amongst millions of users and therefore easy to identify.
@@ -14,12 +14,12 @@
 
 <p>You need to find what <strong>most browsers</strong> are reporting, and then use those variables to bring your browser in the same population. This means having the same fonts, plugins, and extensions installed as the large installed base. You should have a <a href="https://addons.mozilla.org/firefox/addon/uaswitcher/">spoofed user-agent string</a> to match what the large userbase has. You need to have the same settings enabled and disabled, such as DNT and WebGL. You need your browser to look as common as everyone else. Disabling JavaScript, using Linux, or even using the Tor Browser Bundle, will make your browser stick out from the masses.</p>
 
-<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"><em class="fas fa-link"></em> free software plugins</a> to regain control. 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>
+<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> to regain control. 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>
 
 <h3>Related Information</h3>
 
 <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="#addons"><em class="fas fa-link"></em> 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>
diff --git a/_includes/sections/browser-recommendation.html b/_includes/sections/browser-recommendation.html
index 4ae279d6..406d493e 100644
--- a/_includes/sections/browser-recommendation.html
+++ b/_includes/sections/browser-recommendation.html
@@ -7,7 +7,7 @@
   title="Firefox"
   image="/assets/img/svg/3rd-party/firefox_browser.svg"
   description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
-  recommendations: <a href="#addons"><em class="fas fa-link"></em> Privacy Add-ons</a> <a href="#webrtc"><em class="fas fa-link"></em> WebRTC</a> <a href="#about_config"><em class="fas fa-link"></em> about:config tweaks</a>.'
+  recommendations: <a href="#addons"><i class="fas fa-link"></i> Privacy Add-ons</a> <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> <a href="#about_config"><i class="fas fa-link"></i> about:config tweaks</a>.'
   website="https://firefox.com"
   privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
   forum="https://forum.privacytools.io/t/discussion-firefox/279"
@@ -43,7 +43,7 @@
   title="Firefox"
   image="/assets/img/svg/3rd-party/firefox_browser.svg"
   description='Firefox is fast, reliable, open-source, and respects your privacy. Don\'t forget to adjust the settings according to our
-  recommendations: <a href="#addons"><em class="fas fa-link"></em> Privacy Add-ons</a> <a href="#webrtc"><em class="fas fa-link"></em> WebRTC</a> <a href="#about_config"><em class="fas fa-link"></em> about:config tweaks</a>.'
+  recommendations: <a href="#addons"><i class="fas fa-link"></i> Privacy Add-ons</a> <a href="#webrtc"><i class="fas fa-link"></i> WebRTC</a> <a href="#about_config"><i class="fas fa-link"></i> about:config tweaks</a>.'
   website="https://www.mozilla.org/en-US/firefox/mobile/"
   privacy-policy="https://www.mozilla.org/en-US/privacy/firefox/"
   forum="https://forum.privacytools.io/t/discussion-firefox/279"
@@ -95,7 +95,7 @@
 </ul>
 
 
-<h1 id="browser-ios" class="anchor"><a href="#browser-ios"><em class="fas fa-link anchor-icon"></em></a> Browser Recommendations For iOS</h1>
+<h1 id="browser-ios" class="anchor"><a href="#browser-ios"><i class="fas fa-link anchor-icon"></i></a> Browser Recommendations For iOS</h1>
 
 {% include cardv2.html
   title="Firefox"
diff --git a/_includes/sections/browser-tweaks.html b/_includes/sections/browser-tweaks.html
index f664abe0..9b69d737 100644
--- a/_includes/sections/browser-tweaks.html
+++ b/_includes/sections/browser-tweaks.html
@@ -1,4 +1,4 @@
-<h1 id="about_config" class="anchor"><a href="#about_config"><em class="fas fa-link anchor-icon"></em></a> Firefox: Privacy Related "about:config" Tweaks</h1>
+<h1 id="about_config" class="anchor"><a href="#about_config"><i class="fas fa-link anchor-icon"></i></a> Firefox: Privacy Related "about:config" Tweaks</h1>
 
 <div class="alert alert-success" role="alert">This is a collection of privacy-related <strong>about:config</strong> tweaks. We'll show you how to enhance the privacy of your Firefox browser.</div>
 
diff --git a/_includes/sections/browser-webrtc.html b/_includes/sections/browser-webrtc.html
index fecf30dc..3b2fc636 100644
--- a/_includes/sections/browser-webrtc.html
+++ b/_includes/sections/browser-webrtc.html
@@ -1,10 +1,10 @@
-<h1 id="webrtc" class="anchor"><a href="#webrtc"><em class="fas fa-link anchor-icon"></em></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
+<h1 id="webrtc" class="anchor"><a href="#webrtc"><i class="fas fa-link anchor-icon"></i></a> WebRTC IP Leak Test - Is your IP address leaking?</h1>
 
 <div class="alert alert-danger" role="alert">
   WebRTC is a new communication protocol that relies on JavaScript that can leak your actual IP address from behind your VPN.
 </div>
 
-<p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. <strong>Note:</strong> This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.</p>
+<p>While software like NoScript prevents this, it's probably a good idea to block this protocol directly as well, just to be safe. <b>Note:</b> This disables browser-based call functionality that is used for webapps like Discord, Hangouts, Jitsi, etc.</p>
 
 <p>
 <a class="btn btn-warning" target="_blank" rel="noopener noreferrer" href="https://ipleak.net">Test your Browser now</a>
@@ -55,4 +55,4 @@
 
 <h3>What about other browsers?</h3>
 
-<p>Chrome on macOS and Internet Explorer do not implement WebRTC yet. <a href="#browser"><em class="fas fa-link"></em> But we recommend using Firefox on all devices.</a></p>
+<p>Chrome on macOS and Internet Explorer do not implement WebRTC yet. <a href="#browser"><i class="fas fa-link"></i> But we recommend using Firefox on all devices.</a></p>
diff --git a/_includes/sections/calendar-contacts-sync.html b/_includes/sections/calendar-contacts-sync.html
index 786bde3b..71940410 100644
--- a/_includes/sections/calendar-contacts-sync.html
+++ b/_includes/sections/calendar-contacts-sync.html
@@ -1,4 +1,4 @@
-<h1 id="calendar_contacts" class="anchor"><a href="#calendar_contacts"><em class="fas fa-link anchor-icon"></em></a> Calendar and Contacts Sync</h1>
+<h1 id="calendar_contacts" class="anchor"><a href="#calendar_contacts"><i class="fas fa-link anchor-icon"></i></a> Calendar and Contacts Sync</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using a calendar and or contacts synchronization service like Google Sync or iCloud, you should pick an alternative here.</strong>
diff --git a/_includes/sections/cloud-storage.html b/_includes/sections/cloud-storage.html
index d876fd42..3a8881a1 100644
--- a/_includes/sections/cloud-storage.html
+++ b/_includes/sections/cloud-storage.html
@@ -1,4 +1,4 @@
-<h1 id="cloud" class="anchor"><a href="#cloud"><em class="fas fa-link anchor-icon"></em></a> Encrypted Cloud Storage Services</h1>
+<h1 id="cloud" class="anchor"><a href="#cloud"><i class="fas fa-link anchor-icon"></i></a> Encrypted Cloud Storage Services</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should pick an alternative here.</strong>
diff --git a/_includes/sections/decentralized-video.html b/_includes/sections/decentralized-video.html
index db2a1ab0..6893b395 100644
--- a/_includes/sections/decentralized-video.html
+++ b/_includes/sections/decentralized-video.html
@@ -1,4 +1,4 @@
-<h1 id="video" class="anchor"><a href="#video"><em class="fas fa-link anchor-icon"></em></a> Decentralized Video Platforms</h1>
+<h1 id="video" class="anchor"><a href="#video"><i class="fas fa-link anchor-icon"></i></a> Decentralized Video Platforms</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong> If you are currently using a platform like YouTube or Vimeo, you should pick an alternative here.</strong>
diff --git a/_includes/sections/dns.html b/_includes/sections/dns.html
index ba4c7ec9..b0488348 100644
--- a/_includes/sections/dns.html
+++ b/_includes/sections/dns.html
@@ -1,9 +1,9 @@
 <h1 id="dns" class="anchor">
-  <a href="#dns"><em class="fas fa-link anchor-icon"></em></a> Encrypted DNS Resolvers
+  <a href="#dns"><i class="fas fa-link anchor-icon"></i></a> Encrypted DNS Resolvers
 </h1>
 
 <div class="alert alert-warning" role="alert">
-  DNS-over-HTTPS, DNS-over-TLS, and DNSCrypt resolvers will not make you anonymous. Using Anonymized DNSCrypt hides <em>only</em> your DNS traffic from your Internet Service Provider. However, using any of these protocols will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here. See the <a href="#dns-definitions">definitions</a> below.
+  DNS-over-HTTPS, DNS-over-TLS, and DNSCrypt resolvers will not make you anonymous. Using Anonymized DNSCrypt hides <i>only</i> your DNS traffic from your Internet Service Provider. However, using any of these protocols will prevent DNS hijacking, and make your DNS requests harder for third parties to eavesdrop on and tamper with. If you are currently using Google's DNS resolver, you should pick an alternative here. See the <a href="#dns-definitions">definitions</a> below.
 </div>
 
 <div id="dns-table" class="table-responsive">
@@ -533,7 +533,7 @@ We also log how many times this or that tracker has been blocked. We need this i
 
 <h1 id="dns-desktop-clients" class="anchor">
   <a href="#dns-desktop-clients">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a> Encrypted DNS Client Recommendations for Desktop
 </h1>
 
@@ -580,7 +580,7 @@ We also log how many times this or that tracker has been blocked. We need this i
 
 <h1 id="dns-android-clients" class="anchor">
   <a href="#dns-android-clients">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a> Encrypted DNS Client Recommendations for Android
 </h1>
 
@@ -609,7 +609,7 @@ We also log how many times this or that tracker has been blocked. We need this i
 
 <h1 id="dns-ios-clients" class="anchor">
   <a href="#dns-ios-clients">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a> Encrypted DNS Client Recommendations for iOS
 </h1>
 
@@ -627,7 +627,7 @@ We also log how many times this or that tracker has been blocked. We need this i
 
 <h2 id="appledns" class="anchor">
   <a href="#appledns">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a>Apple's native support
 </h2>
 
@@ -643,7 +643,7 @@ We also log how many times this or that tracker has been blocked. We need this i
 
 <h2 id="dns-definitions" class="anchor">
   <a href="#dns-definitions">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a> Definitions
 </h2>
 
diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html
index b13f8c2d..3b79f346 100644
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@@ -1,4 +1,4 @@
-<h1 id="desktopclients" class="anchor"><a href="#desktopclients"><em class="fas fa-link anchor-icon"></em></a> Desktop Email Clients</h1>
+<h1 id="desktopclients" class="anchor"><a href="#desktopclients"><i class="fas fa-link anchor-icon"></i></a> Desktop Email Clients</h1>
 
 {% include cardv2.html
   title="Thunderbird"
@@ -49,9 +49,9 @@
 
 
 
-<h1 id="mobileclients" class="anchor"><a href="#mobileclients"><em class="fas fa-link anchor-icon"></em></a> Mobile Email Clients</h1>
+<h1 id="mobileclients" class="anchor"><a href="#mobileclients"><i class="fas fa-link anchor-icon"></i></a> Mobile Email Clients</h1>
 
-<h2 id="adroidclients" class="anchor"><a href="#adroidclients"><em class="fas fa-link anchor-icon"></em></a> Android Email Clients</h1>
+<h2 id="adroidclients" class="anchor"><a href="#adroidclients"><i class="fas fa-link anchor-icon"></i></a> Android Email Clients</h1>
 
 {% include cardv2.html
   title="FairEmail"
@@ -77,7 +77,7 @@
   googleplay="https://play.google.com/store/apps/details?id=com.fsck.k9"
 %}
 
-<h2 id="iosclients" class="anchor"><a href="#iosclients"><em class="fas fa-link anchor-icon"></em></a> iOS Email Clients</h1>
+<h2 id="iosclients" class="anchor"><a href="#iosclients"><i class="fas fa-link anchor-icon"></i></a> iOS Email Clients</h1>
 
 {% include cardv2.html
   title="Canary Mail"
diff --git a/_includes/sections/email-providers.html b/_includes/sections/email-providers.html
index a352f550..ae636377 100644
--- a/_includes/sections/email-providers.html
+++ b/_includes/sections/email-providers.html
@@ -1,4 +1,4 @@
-<h1 id="email" class="anchor"><a href="#email"><em class="fas fa-link anchor-icon"></em></a> Recommended Email Services</h1>
+<h1 id="email" class="anchor"><a href="#email"><i class="fas fa-link anchor-icon"></i></a> Recommended Email Services</h1>
 
 <div class="alert alert-success" role="alert">
   <strong>Our recommended providers operate outside of the US, adopt modern email technology, and meet <a href="/providers/email/#criteria">our other criteria</a> for listing.</strong> We also have a <a href="https://wiki.privacytools.io/view/Comparison_of_email_providers#Provider_comparison">detailed comparison table</a> of the below providers on the wiki.
@@ -16,9 +16,7 @@
         alt="ProtonMail">
     </div>
     <div class="col">
-    <h2 id="protonmail" class="anchor"><a href="#protonmail"><em class="fas fa-link anchor-icon"></em></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
-    <p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
-    <h2 id="protonmail" class="anchor"><a href="#protonmail"><em class="fas fa-link anchor-icon"></em></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
+    <h2 id="protonmail" class="anchor"><a href="#protonmail"><i class="fas fa-link anchor-icon"></i></a> ProtonMail {% include badge.html color="info" text="Free" %}</h2>
     <p><strong><a href="https://protonmail.com">ProtonMail.com</a></strong> is an email service with a focus on privacy, encryption, security, and ease of use. They have been in operation since <strong>2013</strong>. ProtonMail is based in Genève, <span class="flag-icon flag-icon-ch"></span> Switzerland. Accounts start with 500 MB storage with their free plan.</p>
 
     <p>Free accounts have some limitations and do not allow the use of the <a href="https://protonmail.com/bridge">ProtonMail Bridge</a>, which is required to use a <a href="/software/email">recommended email client</a> (e.g. Thunderbird) or to search email by body text. Paid accounts are available starting at <strong>€48/y</strong> which include features like ProtonMail Bridge, additional storage, custom domain support, and more. The webmail and mobile apps can only search <code>To:</code>, <code>From:</code>, <code>Date:</code> and <code>Subject:</code> (this is likely to change when <a href="https://reddit.com/comments/cqwk2a/comment/ex21b4e">v4.0</a> of ProtonMail is released).</p>
@@ -56,9 +54,7 @@
         alt="Mailbox">
     </div>
     <div class="col">
-    <h2 id="mailbox" class="anchor"><a href="#mailbox"><em class="fas fa-link anchor-icon"></em></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
-    <p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
-    <h2 id="mailbox" class="anchor"><a href="#mailbox"><em class="fas fa-link anchor-icon"></em></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
+    <h2 id="mailbox" class="anchor"><a href="#mailbox"><i class="fas fa-link anchor-icon"></i></a> Mailbox.org {% include badge.html color="info" text="€12/y" %}</h2>
     <p><strong><a href="https://mailbox.org">Mailbox.org</a></strong> is an email service with a focus on being secure, ad-free, and privately powered by 100% eco-friendly energy. They have been in operation since <strong>2014</strong>. Mailbox.org is based in Berlin, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 2 GB of storage, which can be upgraded as needed.</p>
 
     <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
@@ -95,9 +91,7 @@
         alt="Posteo">
     </div>
     <div class="col">
-    <h2 id="posteo" class="anchor"><a href="#posteo"><em class="fas fa-link anchor-icon"></em></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
-    <p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
-    <h2 id="posteo" class="anchor"><a href="#posteo"><em class="fas fa-link anchor-icon"></em></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
+    <h2 id="posteo" class="anchor"><a href="#posteo"><i class="fas fa-link anchor-icon"></i></a> Posteo {% include badge.html color="info" text="€12/y" %}</h2>
     <p><strong><a href="https://posteo.de">Posteo.de</a></strong> is an email provider that focuses on anonymous, secure, and private email. Their servers are powered by 100% sustainable energy. They have been in operation since <strong>2009</strong>. Posteo is based in <span class="flag-icon flag-icon-de"></span> Germany and has a free 14-day trial. Posteo comes with 2 GB for the monthly cost and an extra gigabyte can be purchased for €0.25 per month.</p>
 
     <h5>{% include badge.html color="warning" text="Domains and Aliases" %}</h5>
@@ -134,9 +128,7 @@
         alt="Disroot">
     </div>
     <div class="col">
-    <h2 id="disroot" class="anchor"><a href="#disroot"><em class="fas fa-link anchor-icon"></em></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
-    <p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
-    <h2 id="disroot" class="anchor"><a href="#disroot"><em class="fas fa-link anchor-icon"></em></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
+    <h2 id="disroot" class="anchor"><a href="#disroot"><i class="fas fa-link anchor-icon"></i></a> Disroot {% include badge.html color="info" text="Free" %}</h2>
     <p><strong><a href="https://disroot.org/en/services/email">Disroot</a></strong> offers email amongst <a href="https://disroot.org/en/#services">other services</a>. The service is maintained by volunteers and its community. They have been in operation since <strong>2015</strong>. Disroot is based in <span class="flag-icon flag-icon-nl"></span> Amsterdam. Disroot is free and uses open source software such as Rainloop to provide service. Users support the service through donations and buying extra storage. The mailbox limit is 1 GB, but extra storage can be purchased 0.15€ per GB per month paid yearly.</p>
 
     <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
@@ -173,9 +165,7 @@
         alt="Tutanota">
     </div>
     <div class="col">
-    <h2 id="tutanota" class="anchor"><a href="#tutanota"><em class="fas fa-link anchor-icon"></em></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
-    <p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
-    <h2 id="tutanota" class="anchor"><a href="#tutanota"><em class="fas fa-link anchor-icon"></em></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
+    <h2 id="tutanota" class="anchor"><a href="#tutanota"><i class="fas fa-link anchor-icon"></i></a> Tutanota {% include badge.html color="info" text="Free" %}</h2>
     <p><strong><a href="https://tutanota.com">Tutanota.com</a></strong> is an email service with a focus on security and privacy through the use of encryption. Tutanota has been in operation since <strong>2011</strong> and is based in Hanover, <span class="flag-icon flag-icon-de"></span> Germany. Accounts start with 1GB storage with their free plan.</p>
     <p>Tutanota <a href="https://tutanota.com/faq/#imap">doesn't allow</a> the use of third-party <a href="/software/email/">email clients</a>. There are plans to allow Tutanota pull email from <a href="https://github.com/tutao/tutanota/issues/544">external email accounts</a> using the <a href="https://en.wikipedia.org/wiki/Internet_Message_Access_Protocol">IMAP</a> protocol. <a href="https://github.com/tutao/tutanota/issues/630">Email import</a> is currently not possible.</p>
     <p>Emails can be exported <a href="https://tutanota.com/howto#generalMail">individually or by bulk selection</a>. Tutanota does not allow for <a href="https://github.com/tutao/tutanota/issues/927">subfolders</a> as you might expect with other email providers.</p>
@@ -217,7 +207,7 @@
         alt="StartMail">
     </div>
     <div class="col">
-    <h2 id="startmail" class="anchor"><a href="#startmail"><em class="fas fa-link anchor-icon"></em></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
+    <h2 id="startmail" class="anchor"><a href="#startmail"><i class="fas fa-link anchor-icon"></i></a> StartMail {% include badge.html color="info" text="Personal USD $59.95/y" %}</h2>
     <p><strong><a href="https://startmail.com">StartMail.com</a></strong> is an email service with a focus on security and privacy through the use of standard OpenPGP encryption. StartMail has been in operation since <strong>2014</strong> and is based in Boulevard 11, Zeist <span class="flag-icon flag-icon-nl"></span> Netherlands. Accounts start with 10GB. They offer a 30-day trial.</p>
 
     <h5>{% include badge.html color="success" text="Domains and Aliases" %}</h5>
diff --git a/_includes/sections/email-warning.html b/_includes/sections/email-warning.html
index cdc1e56c..ac524a13 100644
--- a/_includes/sections/email-warning.html
+++ b/_includes/sections/email-warning.html
@@ -1,6 +1,6 @@
 
 <div class="card border-danger">
-  <div class="card-header text-danger"><em class="fas fa-exclamation-circle fa-fw"></em> Warning</div>
+  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
     <div class="card-body">
       <p class="card-text text-danger">When using end-to-end encryption (E2EE) technology like <a href="https://en.wikipedia.org/wiki/Pretty_Good_Privacy">OpenPGP</a>, email will still have some metadata that is not encrypted in the header of the email. <a href="/providers/email/#metadata">Read more about email metadata.</a></p>
       <p class="card-text text-danger">OpenPGP also does not support <a href="https://en.wikipedia.org/wiki/Forward_secrecy">Forward secrecy</a>, which means if either your or the recipient's private key is ever stolen, <strong>all</strong> previous messages encrypted with it will be exposed. <a href="/providers/email/#email-encryption">How do I protect my private keys?</a></p>
diff --git a/_includes/sections/file-encryption.html b/_includes/sections/file-encryption.html
index 3c79a65a..3f8b10cc 100644
--- a/_includes/sections/file-encryption.html
+++ b/_includes/sections/file-encryption.html
@@ -1,4 +1,4 @@
-<h1 id="encrypt" class="anchor"><a href="#encrypt"><em class="fas fa-link anchor-icon"></em></a> File Encryption Software</h1>
+<h1 id="encrypt" class="anchor"><a href="#encrypt"><i class="fas fa-link anchor-icon"></i></a> File Encryption Software</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently not using encryption software for your hard disk, emails, or file archives, you should pick one here.</strong>
diff --git a/_includes/sections/file-sharing.html b/_includes/sections/file-sharing.html
index ad523129..68336e02 100644
--- a/_includes/sections/file-sharing.html
+++ b/_includes/sections/file-sharing.html
@@ -1,4 +1,4 @@
-<h1 id="filesharing" class="anchor"><a href="#filesharing"><em class="fas fa-link anchor-icon"></em></a> File Sharing</h1>
+<h1 id="filesharing" class="anchor"><a href="#filesharing"><i class="fas fa-link anchor-icon"></i></a> File Sharing</h1>
 
 {% include cardv2.html
   title="OnionShare"
diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html
index 44a000fc..bdf50f45 100644
--- a/_includes/sections/file-sync.html
+++ b/_includes/sections/file-sync.html
@@ -1,6 +1,6 @@
 <h1 id="sync" class="anchor">
   <a href="#sync">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a>
   File Sync
 </h1>
diff --git a/_includes/sections/fourteen-eyes.html b/_includes/sections/fourteen-eyes.html
index 00aced59..5b4c6e67 100644
--- a/_includes/sections/fourteen-eyes.html
+++ b/_includes/sections/fourteen-eyes.html
@@ -1,4 +1,4 @@
-<h1 id="ukusa" class="anchor"><a href="#ukusa"><em class="fas fa-link anchor-icon"></em></a> Global Mass Surveillance - The Fourteen Eyes</h1>
+<h1 id="ukusa" class="anchor"><a href="#ukusa"><i class="fas fa-link anchor-icon"></i></a> Global Mass Surveillance - The Fourteen Eyes</h1>
 
 <img src="/assets/img/svg/layout/ukusa.svg" width="260" height="115" class="img-fluid float-right ml-2" alt="UKUSA Agreement">
 
diff --git a/_includes/sections/header.html b/_includes/sections/header.html
index 82894cf5..06f6fec5 100644
--- a/_includes/sections/header.html
+++ b/_includes/sections/header.html
@@ -14,7 +14,7 @@
 <div class="input-group col-12 col-md-8 offset-md-2">
 <input type="search" name="q" class="form-control input-lg" id="q" placeholder="Try {{ site.name }} Search, a Privacy-Respecting Search Engine" autocomplete="off" value="">
 <span class="input-group-btn">
-<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><em class="fas fa-search"></em> </span><span class="hidden active_if_nojs">start search</span></button>
+<button type="submit" class="btn btn-primary input-lg"><span class="hide_if_nojs"><i class="fas fa-search"></i> </span><span class="hidden active_if_nojs">start search</span></button>
 </span>
 </div>
 </form>
diff --git a/_includes/sections/hosting-provider.html b/_includes/sections/hosting-provider.html
index 18fb029d..21bba185 100644
--- a/_includes/sections/hosting-provider.html
+++ b/_includes/sections/hosting-provider.html
@@ -1,4 +1,4 @@
-<h1 id="host" class="anchor"><a href="#host"><em class="fas fa-link anchor-icon"></em></a> Secure Hosting Provider</h1>
+<h1 id="host" class="anchor"><a href="#host"><i class="fas fa-link anchor-icon"></i></a> Secure Hosting Provider</h1>
 
 {% include cardv2.html
   title="Data Center: Bahnhof"
diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 8fd05c55..c0cc44d3 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -1,5 +1,5 @@
 <h1 id="im" class="anchor">
-  <a href="#im"><em class="fas fa-link anchor-icon"></em></a>
+  <a href="#im"><i class="fas fa-link anchor-icon"></i></a>
   Encrypted Instant Messengers
 </h1>
 
@@ -13,7 +13,7 @@
 <p>We have described the three main types of messaging programs that exist: Centralized, Federated and Peer-to-Peer (P2P), with the advantages and disadvantages of each.</p>
 
 <h2 id="centralized" class="anchor">
-  <a href="#centralized"><em class="fas fa-link anchor-icon"></em></a>
+  <a href="#centralized"><i class="fas fa-link anchor-icon"></i></a>
   Centralized
 </h2>
 
@@ -63,7 +63,7 @@
 
 <div>
   <h2 id="federated" class="anchor">
-    <a href="#federated"><em class="fas fa-link anchor-icon"></em></a>
+    <a href="#federated"><i class="fas fa-link anchor-icon"></i></a>
     Federated
   </h2>
 
@@ -121,7 +121,7 @@
   </ul>
 
   <h2 id="peer-to-peer" class="anchor">
-    <a href="#peer-to-peer"><em class="fas fa-link anchor-icon"></em></a>
+    <a href="#peer-to-peer"><i class="fas fa-link anchor-icon"></i></a>
     Peer to Peer (P2P)
   </h2>
 
diff --git a/_includes/sections/ios-addons.html b/_includes/sections/ios-addons.html
index a374bf60..6e9da956 100644
--- a/_includes/sections/ios-addons.html
+++ b/_includes/sections/ios-addons.html
@@ -1,4 +1,4 @@
-<h1 id="iaddons" class="anchor"><a href="#iaddons"><em class="fas fa-link anchor-icon"></em></a> iOS Privacy Add-ons</h1>
+<h1 id="iaddons" class="anchor"><a href="#iaddons"><i class="fas fa-link anchor-icon"></i></a> iOS Privacy Add-ons</h1>
 
 <div class="container-fluid">
 
diff --git a/_includes/sections/key-disclosure-law.html b/_includes/sections/key-disclosure-law.html
index 06397ca5..c51e857f 100644
--- a/_includes/sections/key-disclosure-law.html
+++ b/_includes/sections/key-disclosure-law.html
@@ -1,4 +1,4 @@
-<h1 id="kdl" class="anchor"><a href="#kdl"><em class="fas fa-link anchor-icon"></em></a> Key Disclosure Law</h1>
+<h1 id="kdl" class="anchor"><a href="#kdl"><i class="fas fa-link anchor-icon"></i></a> Key Disclosure Law</h1>
 
 <h3>Who is required to hand over the encryption keys to authorities?</h3>
 
diff --git a/_includes/sections/notebooks.html b/_includes/sections/notebooks.html
index f3defe32..09fbafee 100644
--- a/_includes/sections/notebooks.html
+++ b/_includes/sections/notebooks.html
@@ -1,4 +1,4 @@
-<h1 id="notebook" class="anchor"><a href="#notebook"><em class="fas fa-link anchor-icon"></em></a> Digital Notebook</h1>
+<h1 id="notebook" class="anchor"><a href="#notebook"><i class="fas fa-link anchor-icon"></i></a> Digital Notebook</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using an application like Evernote, Google Keep, or Microsoft OneNote, you should pick an alternative here.</strong>
diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html
index a9358f02..c3b1879d 100644
--- a/_includes/sections/operating-systems.html
+++ b/_includes/sections/operating-systems.html
@@ -1,4 +1,4 @@
-<h1 id="os" class="anchor"><a href="#os"><em class="fas fa-link anchor-icon"></em></a> Introductory Operating Systems</h1>
+<h1 id="os" class="anchor"><a href="#os"><i class="fas fa-link anchor-icon"></i></a> Introductory Operating Systems</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using an operating system that collects data like Windows 10, you should pick an alternative here.</strong>
@@ -24,7 +24,7 @@
   git="https://launchpad.net/ubuntu"
 %}
 
-<h1 id="advanced_os" class="anchor"><a href="#advanced_os"><em class="fas fa-link anchor-icon"></em></a> Advanced Operating Systems</h1>
+<h1 id="advanced_os" class="anchor"><a href="#advanced_os"><i class="fas fa-link anchor-icon"></i></a> Advanced Operating Systems</h1>
 
 <div class="alert alert-info" role="alert">
   <strong>These options have advanced features and are unique in some way. These options will likely require the user to read technical background documentation.</strong>
diff --git a/_includes/sections/other-mobile-operating-systems.html b/_includes/sections/other-mobile-operating-systems.html
index 855cca3a..f1cb488d 100644
--- a/_includes/sections/other-mobile-operating-systems.html
+++ b/_includes/sections/other-mobile-operating-systems.html
@@ -1,4 +1,4 @@
-<h2 id="other_os" class="anchor"><a href="#other_os"><em class="fas fa-link anchor-icon"></em></a> Other Mobile Operating Systems</h1>
+<h2 id="other_os" class="anchor"><a href="#other_os"><i class="fas fa-link anchor-icon"></i></a> Other Mobile Operating Systems</h1>
 
 {% include cardv2.html
   title="Ubuntu Touch"
diff --git a/_includes/sections/participate.html b/_includes/sections/participate.html
index 6b3c7704..674557a7 100644
--- a/_includes/sections/participate.html
+++ b/_includes/sections/participate.html
@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1 id="participate" class="anchor"><a href="#participate"><em class="fas fa-link anchor-icon"></em></a> Participate with suggestions and constructive criticism</h1>
+  <h1 id="participate" class="anchor"><a href="#participate"><i class="fas fa-link anchor-icon"></i></a> Participate with suggestions and constructive criticism</h1>
 </div>
 
 <p>It's important for a website like {{ site.name }} to stay up-to-date. Keep an eye on software updates for the applications listed on our site. Follow recent news about providers that we recommend. We try our best to keep up, but we're not perfect and the internet is changing fast. If you find an error, or you think a provider should not be listed here, or a qualified service provider is missing, or a browser plugin is not the best choice anymore, or anything else... <strong>Talk to us please.</strong> You can also find us on <a href="/services/chat/">several Matrix rooms</a>, primarily <code class="highlighter-rouge">#general:privacytools.io</code>. XMPP users can join there via <a href="https://conversations.im/j/%23general%23privacytools.io@matrix.org">#general#privacytools.io@matrix.org</a>. When using our services, users should follow our <a href="https://wiki.privacytools.io/view/PrivacyTools:Code_of_Conduct">Code of Conduct</a>.</p>
diff --git a/_includes/sections/password-managers.html b/_includes/sections/password-managers.html
index e18914d7..a529e1f3 100644
--- a/_includes/sections/password-managers.html
+++ b/_includes/sections/password-managers.html
@@ -1,4 +1,4 @@
-<h1 id="pw" class="anchor"><a href="#pw"><em class="fas fa-link anchor-icon"></em></a> Password Manager Software</h1>
+<h1 id="pw" class="anchor"><a href="#pw"><i class="fas fa-link anchor-icon"></i></a> Password Manager Software</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using a password manager software like 1Password, LastPass, Roboform, or iCloud Keychain, you should pick an alternative here.</strong>
diff --git a/_includes/sections/paste-services.html b/_includes/sections/paste-services.html
index 9cff97f1..5fa5c1ef 100644
--- a/_includes/sections/paste-services.html
+++ b/_includes/sections/paste-services.html
@@ -1,4 +1,4 @@
-<h1 id="paste" class="anchor"><a href="#paste"><em class="fas fa-link anchor-icon"></em></a> Pastebin Services</h1>
+<h1 id="paste" class="anchor"><a href="#paste"><i class="fas fa-link anchor-icon"></i></a> Pastebin Services</h1>
 
 {% include cardv2.html
 title="PrivateBin"
diff --git a/_includes/sections/privacy-resources.html b/_includes/sections/privacy-resources.html
index f4cb0e68..3f80dc94 100644
--- a/_includes/sections/privacy-resources.html
+++ b/_includes/sections/privacy-resources.html
@@ -1,4 +1,4 @@
-<h1 id="resources" class="anchor"><a href="#resources"><em class="fas fa-link anchor-icon"></em></a> More Privacy Resources</h1>
+<h1 id="resources" class="anchor"><a href="#resources"><i class="fas fa-link anchor-icon"></i></a> More Privacy Resources</h1>
 
 <h3>Guides</h3>
 
diff --git a/_includes/sections/productivity-tools.html b/_includes/sections/productivity-tools.html
index c039ef2e..41c4feb3 100644
--- a/_includes/sections/productivity-tools.html
+++ b/_includes/sections/productivity-tools.html
@@ -1,4 +1,4 @@
-<h1 id="productivity" class="anchor"><a href="#productivity"><em class="fas fa-link anchor-icon"></em></a> Productivity Tools</h1>
+<h1 id="productivity" class="anchor"><a href="#productivity"><i class="fas fa-link anchor-icon"></i></a> Productivity Tools</h1>
 
 {%
   include cardv2.html
@@ -63,7 +63,7 @@
 
 <h1 id="metadata-removal-tools" class="anchor">
   <a href="#metadata-removal-tools"
-    ><em class="fas fa-link anchor-icon"></em>
+    ><i class="fas fa-link anchor-icon"></i>
   </a> Metadata Removal Tools
 </h1>
 
diff --git a/_includes/sections/quotes.html b/_includes/sections/quotes.html
index 66d8f24d..49f8bcb5 100644
--- a/_includes/sections/quotes.html
+++ b/_includes/sections/quotes.html
@@ -32,7 +32,7 @@
   <li><a href="https://papers.ssrn.com/sol3/papers.cfm?abstract_id=998565">'I've Got Nothing to Hide' and Other Misunderstandings of Privacy (Daniel J. Solove - San Diego Law Review)</a></li>
 </ul>
 
-<h1 id="quotes" class="anchor"><a href="#quotes"><em class="fas fa-link anchor-icon"></em></a> Quotes</h1>
+<h1 id="quotes" class="anchor"><a href="#quotes"><i class="fas fa-link anchor-icon"></i></a> Quotes</h1>
 
 <blockquote class="blockquote">
   <p>Ultimately, saying that you don't care about privacy because you have nothing to hide is no different from saying you don't care about freedom of speech because you have nothing to say.  Or that you don't care about freedom of the press because you don't like to read. Or that you don't care about freedom of religion because you don't believe in God. Or that you don't care about the freedom to peacably assemble because you're a lazy, antisocial agoraphobe. </p>
diff --git a/_includes/sections/resources.html b/_includes/sections/resources.html
index 734886f1..66e6c395 100644
--- a/_includes/sections/resources.html
+++ b/_includes/sections/resources.html
@@ -1,6 +1,6 @@
 <h1 id="os" class="anchor">Privacy Tools</h1>
 
-<p><a href="/classic/"><em class="fas fa-info-circle"></em> Prefer the classic site? View a single-page layout.</a></p>
+<p><a href="/classic/"><i class="fas fa-info-circle"></i> Prefer the classic site? View a single-page layout.</a></p>
 
 <div class="row">
 
diff --git a/_includes/sections/router-firmware.html b/_includes/sections/router-firmware.html
index 79bd024a..c9d36cf6 100644
--- a/_includes/sections/router-firmware.html
+++ b/_includes/sections/router-firmware.html
@@ -1,4 +1,4 @@
-<h1 id="firmware" class="anchor"><a href="#firmware"><em class="fas fa-link anchor-icon"></em></a> Open Source Router Firmware</h1>
+<h1 id="firmware" class="anchor"><a href="#firmware"><i class="fas fa-link anchor-icon"></i></a> Open Source Router Firmware</h1>
 
 {% include cardv2.html
   title="OpenWrt"
diff --git a/_includes/sections/search-engines.html b/_includes/sections/search-engines.html
index a21592dd..dc2d5c4b 100644
--- a/_includes/sections/search-engines.html
+++ b/_includes/sections/search-engines.html
@@ -1,4 +1,4 @@
-<h1 id="search" class="anchor"><a href="#search"><em class="fas fa-link anchor-icon"></em></a> Privacy Respecting Search Engines</h1>
+<h1 id="search" class="anchor"><a href="#search"><i class="fas fa-link anchor-icon"></i></a> Privacy Respecting Search Engines</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using search engines like Google, Bing, or Yahoo, you should pick an alternative here.</strong>
diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html
index 5c3a1dd3..a467ab96 100644
--- a/_includes/sections/self-contained-networks.html
+++ b/_includes/sections/self-contained-networks.html
@@ -1,4 +1,4 @@
-<h1 id="darknets" class="anchor"><a href="#darknets"><em class="fas fa-link anchor-icon"></em></a> Self-contained Networks</h1>
+<h1 id="darknets" class="anchor"><a href="#darknets"><i class="fas fa-link anchor-icon"></i></a> Self-contained Networks</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently browsing <a href="https://en.wikipedia.org/wiki/Surface_Web">clearnet</a> and want to access the <a href="https://en.wikipedia.org/wiki/Dark_web">dark web</a>, this section is for you.</strong>
diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html
index 4251da5b..ff6899c5 100644
--- a/_includes/sections/selfhosted-cloud.html
+++ b/_includes/sections/selfhosted-cloud.html
@@ -1,4 +1,4 @@
-<h1 id="mycloud" class="anchor"><a href="#mycloud"><em class="fas fa-link anchor-icon"></em></a> Self-Hosted Cloud Server Software</h1>
+<h1 id="mycloud" class="anchor"><a href="#mycloud"><i class="fas fa-link anchor-icon"></i></a> Self-Hosted Cloud Server Software</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own.</strong>
diff --git a/_includes/sections/social-networks.html b/_includes/sections/social-networks.html
index fec7c543..25a498d2 100644
--- a/_includes/sections/social-networks.html
+++ b/_includes/sections/social-networks.html
@@ -1,4 +1,4 @@
-<h1 id="social" class="anchor"><a href="#social"><em class="fas fa-link anchor-icon"></em></a> Decentralized Social Networks</h1>
+<h1 id="social" class="anchor"><a href="#social"><i class="fas fa-link anchor-icon"></i></a> Decentralized Social Networks</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong> If you are currently using Social Networks like Facebook or Twitter, you should pick an alternative here.</strong>
diff --git a/_includes/sections/social-news-aggregator.html b/_includes/sections/social-news-aggregator.html
index 90c6ab48..70805e56 100644
--- a/_includes/sections/social-news-aggregator.html
+++ b/_includes/sections/social-news-aggregator.html
@@ -1,4 +1,4 @@
-<h1 id="obb" class="anchor"><a href="#social-news-aggregator"><em class="fas fa-link anchor-icon"></em></a> Social News Aggregators</h1>
+<h1 id="obb" class="anchor"><a href="#social-news-aggregator"><i class="fas fa-link anchor-icon"></i></a> Social News Aggregators</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using a online bulletin board like Reddit, you should pick an alternative here.</strong>
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
index 7de3ef27..6a86d563 100644
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@@ -1,6 +1,6 @@
 <h1 id="teamchat" class="anchor">
   <a href="#teamchat">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
   </a> Team Chat Platforms
 </h1>
 
diff --git a/_includes/sections/tor-operating-systems.html b/_includes/sections/tor-operating-systems.html
index c7fd21f4..835df24f 100644
--- a/_includes/sections/tor-operating-systems.html
+++ b/_includes/sections/tor-operating-systems.html
@@ -1,4 +1,4 @@
-<h1 id="tor_os" class="anchor"><a href="#tor_os"><em class="fas fa-link anchor-icon"></em></a> Tor-Focused Distributions</h1>
+<h1 id="tor_os" class="anchor"><a href="#tor_os"><i class="fas fa-link anchor-icon"></i></a> Tor-Focused Distributions</h1>
 
 <div class="alert alert-info" role="alert">
   <strong>These Linux distributions are developed with the purpose of directing all network traffic through Tor.</strong>
diff --git a/_includes/sections/video-frontends.html b/_includes/sections/video-frontends.html
index eec3a61c..c2d94c45 100644
--- a/_includes/sections/video-frontends.html
+++ b/_includes/sections/video-frontends.html
@@ -1,4 +1,4 @@
-<h1 id="proxies" class="anchor"><a href="#proxies"><em class="fas fa-link anchor-icon"></em></a> Frontends and Proxies</h1>
+<h1 id="proxies" class="anchor"><a href="#proxies"><i class="fas fa-link anchor-icon"></i></a> Frontends and Proxies</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong> If you are currently using a platform like YouTube, you can keep watching videos without sharing your IP.</strong>
diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html
index 938af934..f3e39871 100644
--- a/_includes/sections/voice-video-messenger.html
+++ b/_includes/sections/voice-video-messenger.html
@@ -1,4 +1,4 @@
-<h1 id="voip" class="anchor"><a href="#voip"><em class="fas fa-link anchor-icon"></em></a> Video/Voice Calling</h1>
+<h1 id="voip" class="anchor"><a href="#voip"><i class="fas fa-link anchor-icon"></i></a> Video/Voice Calling</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>If you are currently using a Video/Voice Calling app like Google Hangouts, Skype, Viber or <a href="https://blog.privacytools.io/protecting-your-privacy-while-using-zoom-at-home/">Zoom</a>, you should pick an alternative here.</strong> Please note that many of the above instant messengers also support {% include badge.html color="info" text="VoIP" %}. The software listed below are <em>primarily</em> Voice/Video focused.
diff --git a/_includes/sections/vpn.html b/_includes/sections/vpn.html
index a4f223c1..dea6080d 100644
--- a/_includes/sections/vpn.html
+++ b/_includes/sections/vpn.html
@@ -1,4 +1,4 @@
-<h1 id="vpn" class="anchor"><a href="#vpn"><em class="fas fa-link anchor-icon"></em></a> Recommended VPN Services</h1>
+<h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> Recommended VPN Services</h1>
 
 <div class="alert alert-success" role="alert">
   <strong>Our recommended providers are outside the US, use encryption, accept Bitcoin, support OpenVPN, and have a no logging policy. <a href="/providers/vpn/#criteria">Read our full list of criteria for more information</a>.</strong>
@@ -18,7 +18,7 @@
     </div>
     <div class="col">
     <h2 id="mullvad" class="anchor">
-      <a href="#mullvad"><em class="fas fa-link anchor-icon"></em></a> Mullvad
+      <a href="#mullvad"><i class="fas fa-link anchor-icon"></i></a> Mullvad
       {% include badge.html color="info" text="EUR €60/y" %}
     </h2>
     <p><strong><a href="https://mullvad.net/">Mullvad.net</a> </strong> is a fast and inexpensive VPN with a serious focus on transparency and security. They have been in operation since <strong>2009</strong>. Mullvad is based in <span class="flag-icon flag-icon-se"></span> Sweden and does not have a free trial.</p>
@@ -53,7 +53,7 @@
     </div>
     <div class="col">
     <h2 id="protonvpn" class="anchor">
-      <a href="#protonvpn"><em class="fas fa-link anchor-icon"></em></a> ProtonVPN
+      <a href="#protonvpn"><i class="fas fa-link anchor-icon"></i></a> ProtonVPN
       {% include badge.html color="info" text="Free" %}
       {% include badge.html color="info" text="Basic USD $48/y" %}
       {% include badge.html color="secondary" text="Plus USD $96/y" %}
@@ -82,7 +82,7 @@
     </div>
     <div class="col">
     <h2 id="ivpn" class="anchor">
-      <a href="#ivpn"><em class="fas fa-link anchor-icon"></em></a> IVPN
+      <a href="#ivpn"><i class="fas fa-link anchor-icon"></i></a> IVPN
       {% include badge.html color="info" text="Standard USD $60/y" %}
       {% include badge.html color="secondary" text="Pro USD $100/y" %}
     </h2>
diff --git a/_includes/sections/warrant-canary.html b/_includes/sections/warrant-canary.html
index a3bdce1e..34f54b4d 100644
--- a/_includes/sections/warrant-canary.html
+++ b/_includes/sections/warrant-canary.html
@@ -1,4 +1,4 @@
-<h1 id="wc" class="anchor"><a href="#wc"><em class="fas fa-link anchor-icon"></em></a> What is a warrant canary?</h1>
+<h1 id="wc" class="anchor"><a href="#wc"><i class="fas fa-link anchor-icon"></i></a> What is a warrant canary?</h1>
 
 <img src="/assets/img/svg/layout/warrant_canary_example.svg" width="450px" class="img-fluid float-right ml-3" alt="Warrant Canary Example">
 
diff --git a/_includes/sections/windows10.html b/_includes/sections/windows10.html
index b4b3a003..5717ded8 100644
--- a/_includes/sections/windows10.html
+++ b/_includes/sections/windows10.html
@@ -1,4 +1,4 @@
-<h1 id="win10" class="anchor"><a href="#win10"><em class="fas fa-link anchor-icon"></em></a> Don't use Windows 10 - It's a privacy nightmare</h1>
+<h1 id="win10" class="anchor"><a href="#win10"><i class="fas fa-link anchor-icon"></i></a> Don't use Windows 10 - It's a privacy nightmare</h1>
 
 <div class="alert alert-warning" role="alert">
   <strong>Microsoft introduced a lot of new features in Windows 10 such as Cortana. However, most of them are violating your privacy.</strong>
diff --git a/_includes/team.html b/_includes/team.html
index e23ae1e4..ad387ede 100644
--- a/_includes/team.html
+++ b/_includes/team.html
@@ -12,36 +12,36 @@
       {% endif %}
 
       <h6 class="card-subtitle mb-2 text-muted" itemprop="jobTitle">{% if include.role %}{{ include.role }}{% elsif include.emeritus %}Former Contributor{% else %}Contributor{% endif %}</h6>
-      {% if include.bio %}<p class="card-text" itemprop="description">{{ include.bio | default: "<em>Hmm, this user hasn't written a bio quite yet :(</em>" }}</p>{% endif %}
+      {% if include.bio %}<p class="card-text" itemprop="description">{{ include.bio | default: "<i>Hmm, this user hasn't written a bio quite yet :(</i>" }}</p>{% endif %}
       <div class="mx-n2">
         {% if include.email %}
         <a href="{{ include.email }}" aria-label="Email" class="mx-2 text-decoration-none" itemprop="email">
-          <em class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></em>
+          <i class="fas fa-envelope" aria-hidden="true" title="{{ include.email }}"></i>
         </a>
         {% endif %}
         {% if include.website %}
         <a href="{{ include.website }}" aria-label="Website" class="mx-2 text-decoration-none" itemprop="url">
-          <em class="fas fa-link" aria-hidden="true" title="Website"></em>
+          <i class="fas fa-link" aria-hidden="true" title="Website"></i>
         </a>
         {% endif %}
         {% if include.keys %}
         <a href="{{ include.keys }}" aria-label="Keys" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <em class="fas fa-key" aria-hidden="true" title="Keys"></em>
+          <i class="fas fa-key" aria-hidden="true" title="Keys"></i>
         </a>
         {% endif %}
         {% if include.mastodon %}
         <a href="{{ include.mastodon }}" aria-label="Mastodon" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <em class="fab fa-mastodon" aria-hidden="true" title="Mastodon Profile"></em>
+          <i class="fab fa-mastodon" aria-hidden="true" title="Mastodon Profile"></i>
         </a>
         {% endif %}
         {% if include.twitter %}
         <a href="https://twitter.com/{{ include.twitter }}" aria-label="Twitter" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <em class="fab fa-twitter" aria-hidden="true" title="Twitter Profile"></em>
+          <i class="fab fa-twitter" aria-hidden="true" title="Twitter Profile"></i>
         </a>
         {% endif %}
         {% if include.blog %}
         <a href="https://blog.privacytools.io/author/{{ include.blog }}" aria-label="Blog" class="mx-2 text-decoration-none" itemprop="sameAs">
-          <em class="fas fa-pen-nib" aria-hidden="true" title="PrivacyTools Blog Author"></em>
+          <i class="fas fa-pen-nib" aria-hidden="true" title="PrivacyTools Blog Author"></i>
         </a>
         {% endif %}
       </div>
diff --git a/index.html b/index.html
index 41123438..10ad264b 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@ layout: default
 {% include sections/header.html %}
 {% include sections/resources.html %}
 
-<h1 id="sponsors" class="anchor"><a href="#sponsors"><em class="fas fa-link anchor-icon"></em></a> Sponsors</h1>
+<h1 id="sponsors" class="anchor"><a href="#sponsors"><i class="fas fa-link anchor-icon"></i></a> Sponsors</h1>
 <div class="mx-4">
   {% include sponsors/gold.html %}
 </div>
diff --git a/pages/about/about.html b/pages/about/about.html
index c3e0e939..54d84c96 100644
--- a/pages/about/about.html
+++ b/pages/about/about.html
@@ -83,7 +83,7 @@ mastodon="https://ioc.exchange/@lynn_stephenson"
 avatar="trai_dep.png"
 name="trai_dep"
 role="Subreddit Mod"
-bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – <em>irony alert</em> – an (ethical) digital marketer."
+bio="I'm the moderator at r/Privacy and r/privacytoolsIO. Day to day, I am also – <i>irony alert</i> – an (ethical) digital marketer."
 email="mailto:trai_dep@privacytools.io"
 website="https://www.reddit.com/user/trai_dep"
 %}
@@ -94,8 +94,8 @@ website="https://www.reddit.com/user/trai_dep"
     <div class="card">
       <div class="card-body">
         <p class="card-text">Of course, we couldn't do any of this without our very generous <a href="https://opencollective.com/privacytools/">financial contributors</a>, <a href="https://github.com/privacytools/privacytools.io/graphs/contributors">website contributors</a>, and the countless community members that help share new ideas and spread the word! Thank you.</p>
-        <a href="/#participate" class="btn btn-primary"><em class="fas fa-hands-helping"></em> Get involved!</a>
-        <a href="/donate/" class="btn btn-outline-danger"><em class="fas fa-heart"></em> Donate</a>
+        <a href="/#participate" class="btn btn-primary"><i class="fas fa-hands-helping"></i> Get involved!</a>
+        <a href="/donate/" class="btn btn-outline-danger"><i class="fas fa-heart"></i> Donate</a>
       </div>
     </div>
   </div>
@@ -157,9 +157,9 @@ emeritus=true
   <div class="col">
     <h2>Contact Us</h2>
     <p>It's very important to us to stay up-to-date on the latest changes in the privacy space. If you have a software recommendation for us, or want to request a change on this website, please don't hesitate to reach out in one of the following ways.</p>
-    <p><a href="https://forum.privacytools.io/"><em class="fab fa-discourse fa-lg fa-fw"></em> Start a discussion in our Discourse forum</a></p>
-    <p><a href="https://github.com/privacytools/privacytools.io/issues"><em class="fab fa-github fa-lg fa-fw"></em> Open an issue on GitHub</a></p>
-    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><em class="fab fa-reddit fa-lg fa-fw"></em> Suggest something new on our subreddit</a></p>
+    <p><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Start a discussion in our Discourse forum</a></p>
+    <p><a href="https://github.com/privacytools/privacytools.io/issues"><i class="fab fa-github fa-lg fa-fw"></i> Open an issue on GitHub</a></p>
+    <p><a href="https://www.reddit.com/r/privacytoolsIO/"><i class="fab fa-reddit fa-lg fa-fw"></i> Suggest something new on our subreddit</a></p>
     <p>For complete transparency, software and providers will only be considered for this website after discussions take place on our GitHub issue tracker. We of course don't make any changes in secret.</p>
     <p>Join our Matrix rooms at <code>#lounge:privacytools.io</code> to chat with us and other members, and <code>#privacy:privacytools.io</code> for privacy discussions in general! If you need a Matrix account, you can sign up with our own homeserver (<code>https://chat.privacytools.io</code>) using <a href="https://element.privacytools.io">Element</a>.</p>
     <p>You can also email the team at <a itemprop="email" href="mailto:support@privacytools.io">support@privacytools.io</a> and find us on <a itemprop="sameAs" href="https://twitter.com/privacytoolsIO">Twitter</a> and <a itemprop="sameAs" href="https://social.privacytools.io/@privacytools">Mastodon</a>.</p>
diff --git a/pages/donate.html b/pages/donate.html
index 7bb2f5c4..9ffe5f28 100644
--- a/pages/donate.html
+++ b/pages/donate.html
@@ -13,7 +13,7 @@ permalink: /donate/
       </div>
 
       <div class="card border-success mt-5 mb-5">
-        <div class="card-header text-success"><em class="fas fa-donate fa-fw"></em> Donate via OpenCollective</div>
+        <div class="card-header text-success"><i class="fas fa-donate fa-fw"></i> Donate via OpenCollective</div>
         <div class="card-body text-success">
           <p class="card-text">If you are able, please consider contributing to our development and outreach programs. <strong>Contributions via OpenCollective to {{ site.name }} are tax deductible for US taxpayers.</strong> These funds are transparently and primarily used to cover server costs.</p>
           <a href="https://opencollective.com/privacytools#section-contribute" class="btn btn-success">Contribute</a>
@@ -32,49 +32,49 @@ permalink: /donate/
     <div class="col-md-12 col-lg-8 offset-lg-2 text-right">
 
       <div class="form-group row">
-        <label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/svg/qr/btc.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="BTC" class="col-sm-4 col-form-label"><strong>Bitcoin (BTC)</strong> <a href="/assets/img/svg/qr/btc.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="BTC" type="text" value="1C3MVvvJwfEiS5KQmZzJkiVq7obYi2zRqb" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
-        <label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/svg/qr/bch.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="BCH" class="col-sm-4 col-form-label"><strong>Bitcoin Cash (BCH)</strong> <a href="/assets/img/svg/qr/bch.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="BCH" type="text" value="bitcoincash:qzs5eh484cc7gq2frw4y0ygdg33uv6ucrq48ewgqqf" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
-        <label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/svg/qr/eth.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="ETH" class="col-sm-4 col-form-label"><strong>Ethereum (ETH)</strong> <a href="/assets/img/svg/qr/eth.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="ETH" type="text" value="0x1DdD9c188aaf9198b664CeBce9a9cD03E75FdD49" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
-        <label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/svg/qr/zec.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="ZEC" class="col-sm-4 col-form-label"><strong>Zcash (ZEC)</strong> <a href="/assets/img/svg/qr/zec.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="ZEC" type="text" value="t1Sv6rSRchWUXkWNz7PkeYixTs9M2aAs4wX" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
-        <label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/svg/qr/ltc.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="LTC" class="col-sm-4 col-form-label"><strong>Litecoin (LTC)</strong> <a href="/assets/img/svg/qr/ltc.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="LTC" type="text" value="LSccXrCDm7zu4Gc6PiiW6sBaKjADfFGQSQ" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
-        <label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/svg/qr/xlm.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="XLM" class="col-sm-4 col-form-label"><strong>Stellar (XLM)</strong> <a href="/assets/img/svg/qr/xlm.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="XLM" type="text" value="GA3GFFRS2PEZHFYOKYO5FSK5GAMW44AOGI4RY5ISXOWMD3PWAARFVAA4" class="form-control input-lg onclick-select" readonly>
         </div>
       </div>
 
       <div class="form-group row">
-        <label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/svg/qr/xmr.svg"><em class="fa fa-qrcode"></em></a></label>
+        <label for="XMR" class="col-sm-4 col-form-label"><strong>Monero (XMR)</strong> <a href="/assets/img/svg/qr/xmr.svg"><i class="fa fa-qrcode"></i></a></label>
         <div class="col-sm-8">
           <input id="XMR" type="text" value="45yJ8LkShLt2f9gCqbBQUcDw7um9XxD2vZ8h2Rt3GoLq9kMrznB3UAHBS1chJk9KjugpBbbJFGtdAeXE5j99wuGxDcbYUri" class="form-control input-lg onclick-select" readonly>
         </div>
diff --git a/pages/os.html b/pages/os.html
index dd54dc38..6f78978b 100644
--- a/pages/os.html
+++ b/pages/os.html
@@ -10,7 +10,7 @@ description: "Even your own computer could be compromising your privacy. Discove
 <h3>Warning</h3>
 
 <ul>
-  <li><a href="#win10"><em class="fas fa-link"></em> 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>
 
 {% include sections/tor-operating-systems.html %}
diff --git a/pages/providers.html b/pages/providers.html
index 74688136..e78f9a4a 100644
--- a/pages/providers.html
+++ b/pages/providers.html
@@ -16,7 +16,7 @@ description: "There's a ton of people providing services online. Discover which
     <li class="list-group-item"><a href="/providers/email/"><span class="fas fa-mail-bulk fa-fw"></span> Email</a></li>
     <li class="list-group-item"><a href="/providers/hosting/"><span class="fas fa-database fa-fw"></span> Hosting</a></li>
     <li class="list-group-item"><a href="/providers/paste/"><span class="fas fa-paste fa-fw"></span> Pastebins</a></li>
-    <li class="list-group-item"><a href="/providers/search-engines/"><em class="fas fa-search fa-fw"></em> Search Engines</a></li>
+    <li class="list-group-item"><a href="/providers/search-engines/"><i class="fas fa-search fa-fw"></i> Search Engines</a></li>
     <li class="list-group-item"><a href="/providers/social-networks/"><span class="fas fa-expand-arrows-alt fa-fw"></span> Social Networks</a></li>
     <li class="list-group-item"><a href="/providers/social-news-aggregator/"><span class="far fa-newspaper fa-fw"></span> Social News Aggregators</a></li>
     <li class="list-group-item"><a href="/providers/vpn/"><span class="far fa-eye-slash fa-fw"></span> VPN</a></li>
diff --git a/pages/providers/email.html b/pages/providers/email.html
index d3e5809c..ac9a6f64 100644
--- a/pages/providers/email.html
+++ b/pages/providers/email.html
@@ -10,7 +10,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
 {% include sections/email-providers.html %}
 
 <hr>
-<h1 id="criteria" class="anchor"><a href="#criteria"><em class="fas fa-link anchor-icon"></em></a> Our Email Provider Criteria</h1>
+<h1 id="criteria" class="anchor"><a href="#criteria"><i class="fas fa-link anchor-icon"></i></a> Our Email Provider Criteria</h1>
 
 <p><strong>Please note we are not affiliated with any of the providers we recommend. This allows us to provide completely objective recommendations.</strong> We have developed a clear set of requirements for any Email provider wishing to be recommended, including implementing industry best practices, modern technology and more. We suggest you familiarize yourself with this list before choosing an Email provider, and conduct your own research to ensure the Email provider you choose is the right choice for you.</p>
 
@@ -169,7 +169,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
 </div>
 <hr>
 
-<h1 id="email-encryption" class="anchor"><a href="#email-encryption"><em class="fas fa-link anchor-icon"></em></a> Email encryption</h1>
+<h1 id="email-encryption" class="anchor"><a href="#email-encryption"><i class="fas fa-link anchor-icon"></i></a> Email encryption</h1>
 <div class="container">
   <div class="row">
     <div class="col-md-6">
@@ -189,7 +189,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
   </div>
 </div>
 
-<h1 id="metadata" class="anchor"><a href="#metadata"><em class="fas fa-link anchor-icon"></em></a> Email metadata</h1>
+<h1 id="metadata" class="anchor"><a href="#metadata"><i class="fas fa-link anchor-icon"></i></a> Email metadata</h1>
 <div class="container">
   <div class="row">
     <div class="col-md-6">
@@ -214,7 +214,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
 
 <hr>
 
-<h1 id="cloaking" class="anchor"><a href="#cloaking"><em class="fas fa-link anchor-icon"></em></a> Email cloaking services</h1>
+<h1 id="cloaking" class="anchor"><a href="#cloaking"><i class="fas fa-link anchor-icon"></i></a> Email cloaking services</h1>
 <div class="container">
   <a href="https://anonaddy.com">
     <img src="/assets/img/svg/3rd-party/anonaddy.svg"
@@ -233,7 +233,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
   <p><strong><a href="https://simplelogin.io">SimpleLogin</a></strong> allows you to easily create aliases for your email. Can be self-hosted. <a href="https://github.com/simple-login/app">Source code on GitHub</a>.</p>
 </div>
 
-<h1 id="selfhosting" class="anchor"><a href="#selfhosting"><em class="fas fa-link anchor-icon"></em></a> Self-hosting Email</h1>
+<h1 id="selfhosting" class="anchor"><a href="#selfhosting"><i class="fas fa-link anchor-icon"></i></a> Self-hosting Email</h1>
 <div class="container">
   <p>Advanced users may consider setting up their own email server. Mailservers require attention and continuous maintenance in order to keep things secure and mail delivery reliable.</p>
   <h3>Combined software solutions</h3>
@@ -258,7 +258,7 @@ description: "Find a secure email provider that will keep your privacy in mind.
     </ul>
 </div>
 
-<h1 id="info" class="anchor"><a href="#info"><em class="fas fa-link anchor-icon"></em></a> Related Email Articles</h1>
+<h1 id="info" class="anchor"><a href="#info"><i class="fas fa-link anchor-icon"></i></a> Related Email Articles</h1>
 <div class="container">
   <div class="row">
     <ul>
diff --git a/pages/providers/vpn.html b/pages/providers/vpn.html
index 4da7f6b0..f365d7d9 100644
--- a/pages/providers/vpn.html
+++ b/pages/providers/vpn.html
@@ -7,7 +7,7 @@ breadcrumb: "VPN"
 ---
 
 <div class="card border-danger">
-  <div class="card-header text-danger"><em class="fas fa-exclamation-circle fa-fw"></em> Warning</div>
+  <div class="card-header text-danger"><i class="fas fa-exclamation-circle fa-fw"></i> Warning</div>
   <div class="card-body">
     <p class="card-text text-danger">Using a VPN will <strong>not</strong> keep your browsing habits anonymous, nor will it add additional security to non-secure (HTTP) traffic.</p>
     <p class="card-text text-danger">If you are looking for <strong>anonymity</strong>, you should use the Tor Browser <strong>instead</strong> of a VPN.</p>
@@ -22,7 +22,7 @@ breadcrumb: "VPN"
 {% include sections/vpn.html %}
 
 <hr>
-<h1 id="criteria" class="anchor"><a href="#criteria"><em class="fas fa-link anchor-icon"></em></a> Our VPN Provider Criteria</h1>
+<h1 id="criteria" class="anchor"><a href="#criteria"><i class="fas fa-link anchor-icon"></i></a> Our VPN Provider Criteria</h1>
 
 <p><strong>Please note we are not affiliated with any of the providers we recommend. This allows us to provide completely objective recommendations.</strong> We have developed a clear set of requirements for any VPN provider wishing to be recommended, including strong encryption, independent security audits, modern technology, and more. We suggest you familiarize yourself with this list before choosing a VPN provider, and conduct your own research to ensure the VPN provider you choose is as trustworthy as possible.</p>
 
@@ -166,7 +166,7 @@ breadcrumb: "VPN"
 </div>
 <hr>
 
-<h1 id="info" class="anchor"><a href="#info"><em class="fas fa-link anchor-icon"></em></a> Further Information and Dangers</h1>
+<h1 id="info" class="anchor"><a href="#info"><i class="fas fa-link anchor-icon"></i></a> Further Information and Dangers</h1>
 
 <div class="container">
   <div class="row">
diff --git a/pages/services/services.html b/pages/services/services.html
index 5fb99fc8..fe374139 100644
--- a/pages/services/services.html
+++ b/pages/services/services.html
@@ -9,13 +9,13 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
 
 <div class="card card-list">
   <ul class="list-group list-group-flush">
-    <li class="list-group-item"><a href="https://search.privacytools.io/"><em class="fas fa-search fa-lg fa-fw"></em> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://social.privacytools.io/"><em class="fas fa-retweet fa-lg fa-fw"></em> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
-    <li class="list-group-item"><a href="/services/chat/"><em class="fas fa-comment fa-lg fa-fw"></em> Matrix - Federated private chat at chat.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://forum.privacytools.io/"><em class="fab fa-discourse fa-lg fa-fw"></em> Discourse - Forum at forum.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://tube.privacytools.io/"><em class="fas fa-file-video fa-lg fa-fw"></em> PeerTube - Decentralized Video at tube.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://write.privacytools.io/"><em class="fas fa-pen-alt fa-lg fa-fw"></em> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
-    <li class="list-group-item"><a href="https://bin.privacytools.io/"><em class="fas fa-clipboard fa-lg fa-fw"></em> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://search.privacytools.io/"><i class="fas fa-search fa-lg fa-fw"></i> Searx - Privacy Friendly Search at search.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://social.privacytools.io/"><i class="fas fa-retweet fa-lg fa-fw"></i> Mastodon - Tracker Free Social Networking at social.privacytools.io</a></li>
+    <li class="list-group-item"><a href="/services/chat/"><i class="fas fa-comment fa-lg fa-fw"></i> Matrix - Federated private chat at chat.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://forum.privacytools.io/"><i class="fab fa-discourse fa-lg fa-fw"></i> Discourse - Forum at forum.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://tube.privacytools.io/"><i class="fas fa-file-video fa-lg fa-fw"></i> PeerTube - Decentralized Video at tube.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://write.privacytools.io/"><i class="fas fa-pen-alt fa-lg fa-fw"></i> Write Freely - Federated minimalist blog at write.privacytools.io</a></li>
+    <li class="list-group-item"><a href="https://bin.privacytools.io/"><i class="fas fa-clipboard fa-lg fa-fw"></i> PrivateBin - Encrypted Pastebin at bin.privacytools.io</a></li>
   </ul>
 </div>
 
@@ -23,7 +23,7 @@ description: "The PrivacyTools team is proud to introduce a suite of privacy-cen
 
 <div class="card card-list">
   <ul class="list-group list-group-flush">
-    <li class="list-group-item"><a href="https://status.privacytools.io/" class="text-success"><em class="fas fa-check-circle fa-lg fa-fw"></em> Statuspage - Check the status of our services for any outages or scheduled maintenance</a></li>
+    <li class="list-group-item"><a href="https://status.privacytools.io/" class="text-success"><i class="fas fa-check-circle fa-lg fa-fw"></i> Statuspage - Check the status of our services for any outages or scheduled maintenance</a></li>
   </ul>
 </div>
 
diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html
index 16f4dfe2..69285c20 100644
--- a/pages/software/real-time-communication.html
+++ b/pages/software/real-time-communication.html
@@ -9,7 +9,7 @@ description: "Discover secure and private ways to communicate with others online
 
 <h3 id="exploiting-centralized-networks" class="anchor">
   <a href="#exploiting-centralized-networks">
-    <em class="fas fa-link anchor-icon"></em>
+    <i class="fas fa-link anchor-icon"></i>
 </a>
   Recent news about breaking E2EE on centralized instant messengers
 </h3>
diff --git a/pages/sponsors.html b/pages/sponsors.html
index efef487a..081c0dd4 100644
--- a/pages/sponsors.html
+++ b/pages/sponsors.html
@@ -49,19 +49,19 @@ permalink: /sponsors/
 <h5>General Information</h5>
 <p>This website receives well over 250,000 pageviews on a monthly basis and is highly ranked for privacy-related keywords. In addition to the benefits below your contribution will be featured on our OpenCollective page and we will thank you via social media for your contribution.</p>
 <p><em>Please note that this page is updated manually, and while we're generally on top of things, please don't hesitate to reach out to <a href="mailto:sponsors@privacytools.io">sponsors@privacytools.io</a> if you think we've missed something :)</em></p>
-<h5><em class="fas fa-fw fa-user text-info"></em> Backers - $10–$24</h5>
+<h5><i class="fas fa-fw fa-user text-info"></i> Backers - $10–$24</h5>
 <ul>
 <li>Your name added to the list of sponsors on this page.</li>
 </ul>
-<h5><em class="fas fa-fw fa-user-astronaut text-info"></em> Highlighted Backers - $25–$99</h5>
+<h5><i class="fas fa-fw fa-user-astronaut text-info"></i> Highlighted Backers - $25–$99</h5>
 <ul>
 <li>Your name in bold at the top of our general sponsors list.</li>
 </ul>
-<h5><em class="fas fa-fw fa-user-secret text-muted"></em> Advocates - $100–$249</h5>
+<h5><i class="fas fa-fw fa-user-secret text-muted"></i> Advocates - $100–$249</h5>
 <ul>
 <li>Your square logo, name, and link above the general sponsors list.</li>
 </ul>
-<h5><em class="fas fa-fw fa-briefcase text-warning"></em> Organizations - $250+</h5>
+<h5><i class="fas fa-fw fa-briefcase text-warning"></i> Organizations - $250+</h5>
 <ul>
 <li>Your medium-sized logo as a prominent link on our homepage and at the very top of our sponsors page.</li>
 </ul>