diff --git a/_includes/sections/email-clients.html b/_includes/sections/email-clients.html
index 1aa59ebe..2e354e6b 100644
--- a/_includes/sections/email-clients.html
+++ b/_includes/sections/email-clients.html
@@ -5,12 +5,12 @@
   image="/assets/img/svg/3rd-party/thunderbird.svg"
   description="Thunderbird is a free, open source, cross-platform email, newsgroup, news feed, and chat (XMPP, IRC, Twitter) client developed by the Thunderbird community, and previously by the Mozilla Foundation."
   website="https://www.thunderbird.net/"
-  privacy-policy="https://www.mozilla.org/en-US/privacy/thunderbird/"
+  privacy-policy="https://www.mozilla.org/privacy/thunderbird/"
   forum="https://forum.privacytools.io/t/discussion-thunderbird/659"
   source="https://hg.mozilla.org/comm-central/"
-  windows="https://www.thunderbird.net/en-US/"
-  mac="https://www.thunderbird.net/en-US/"
-  linux="https://www.thunderbird.net/en-US/"
+  windows="https://www.thunderbird.net"
+  mac="https://www.thunderbird.net"
+  linux="https://www.thunderbird.net/"
   freebsd="https://www.freshports.org/mail/thunderbird/"
   openbsd="http://openports.se/mail/mozilla-thunderbird"
   netbsd="http://pkgsrc.se/mail/thunderbird"
@@ -18,7 +18,7 @@
 
 {% include cardv2.html
   title="Mailpile"
-  image="/assets/img/png/3rd-party/mailpile.svg"
+  image="/assets/img/svg/3rd-party/mailpile.svg"
   description="A modern, fast web-mail client with user-friendly encryption and privacy features."
   website="https://www.mailpile.is/"
   privacy-policy="https://www.mailpile.is/privacy.html"
@@ -31,10 +31,9 @@
 
 <h1 id="mobileclients" class="anchor"><a href="#mobileclients"><i class="fas fa-link anchor-icon"></i></a> Mobile Email Clients</h1>
 
-
 {% include cardv2.html
-  title="FairMail"
-  image="/assets/img/svg/3rd-party/fairmail.svg"
+  title="FairEmail"
+  image="/assets/img/svg/3rd-party/fairemail.svg"
   description="Fully featured, open source, privacy oriented email app for Android"
   website="https://email.faircode.eu/"
   privacy-policy="https://github.com/M66B/FairEmail/blob/master/PRIVACY.md"
@@ -42,12 +41,11 @@
   github="https://github.com/M66B/FairEmail"
   fdroid="https://f-droid.org/en/packages/eu.faircode.email/"
   googleplay="https://play.google.com/store/apps/details?id=eu.faircode.email"
-  
 %}
 
 {% include cardv2.html
   title="K-9 Mail"
-  image="/assets/img/png/3rd-party/k-9-mail.svg"
+  image="/assets/img/svg/3rd-party/k9mail.svg"
   description="An independent mail application for Android. It supports both POP3 and IMAP mailboxes, but only supports push mail for IMAP."
   website="https://k9mail.app/"
   privacy-policy="https://k9mail.app/privacy"
@@ -56,5 +54,3 @@
   fdroid="https://f-droid.org/packages/com.fsck.k9/"
   googleplay="https://play.google.com/store/apps/details?id=com.fsck.k9"
 %}
-
-
diff --git a/assets/img/svg/3rd-party/fairemail.svg b/assets/img/svg/3rd-party/fairemail.svg
new file mode 100644
index 00000000..54046c9a
--- /dev/null
+++ b/assets/img/svg/3rd-party/fairemail.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="color-1" x2="0" gradientUnits="userSpaceOnUse"><stop stop-opacity=".3" offset="0"/><stop stop-opacity="0" offset="1"/></linearGradient></defs><g transform="matrix(.7697 0 0 .7697 -1.5394 -1.5394)" font-family="none" font-size="none" font-weight="none" stroke-miterlimit="10" text-anchor="none" style="mix-blend-mode:normal"><path d="m7 43c-1.1046 0-2-0.89543-2-2v-34c0-1.1046 0.89543-2 2-2h34c1.1046 0 2 0.89543 2 2v34c0 1.1046-0.89543 2-2 2z" fill="#039be5"/><path d="m31.816 16.184h-15.632c-1.0796 0-1.9442 0.87442-1.9442 1.954l-0.0098 11.724c0 1.0796 0.87442 1.954 1.954 1.954h15.632c1.0796 0 1.954-0.87442 1.954-1.954v-11.724c0-1.0796-0.87442-1.954-1.954-1.954zm0 3.908-7.8161 4.885-7.8161-4.885v-1.954l7.8161 4.885 7.8161-4.885z" fill="none" stroke-width="0"/><path d="m33.77 18.138v11.724c0 1.0796-0.87442 1.954-1.954 1.954h-15.632c-1.0796 0-1.954-0.87442-1.954-1.954l0.0098-11.724c0-1.0796 0.86465-1.954 1.9442-1.954h15.632c1.0796 0 1.954 0.87442 1.954 1.954zm-1.954 0-7.8161 4.885-7.8161-4.885v1.954l7.8161 4.885 7.8161-4.885z" fill="#fff" stroke-width="0"/><g fill="none"><path d="m2 24c0-12.15 9.8497-22 22-22s22 9.8497 22 22-9.8497 22-22 22-22-9.8497-22-22z"/><rect x="2" y="2" width="44" height="22"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/><path d="m2 24v-22h44v22z"/></g></g></svg>
diff --git a/assets/img/svg/3rd-party/k9mail.svg b/assets/img/svg/3rd-party/k9mail.svg
new file mode 100644
index 00000000..f5128b01
--- /dev/null
+++ b/assets/img/svg/3rd-party/k9mail.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="linearGradient5094" x1="192" x2="192" y1="140.3" y2="332.3" gradientTransform="matrix(.1779 0 0 .1779 -.14521 -25.136)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient5100"/><linearGradient id="linearGradient5100"><stop stop-color="#fbfcfc" stop-opacity=".1" offset="0"/><stop stop-color="#fbfcfc" stop-opacity="0" offset="1"/></linearGradient><radialGradient id="radialGradient5715" cx="2.5447e-6" cy="243.21" r="76" gradientTransform="matrix(.44943 .44943 -.44943 .44943 109.16 -109.48)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient5100"/><filter id="filter13488" x="-.14" y="-.105" width="1.28" height="1.21" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="1.4"/></filter><filter id="filter13338" x="-.056" y="-.042" width="1.112" height="1.084" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="0.56"/></filter><filter id="filter13052" x="-.038526" y="-.063652" width="1.0771" height="1.1273" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="2.44"/></filter><filter id="filter13165" x="-.038526" y="-.063652" width="1.0771" height="1.1273" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="2.44"/></filter><linearGradient id="linearGradient14078" x1="80" x2="80" y1="252.3" y2="280.3" gradientTransform="matrix(.1779 0 0 .1779 -.14517 -25.136)" gradientUnits="userSpaceOnUse"><stop stop-color="#4d6570" offset="0"/><stop stop-color="#4d6570" stop-opacity=".06" offset="1"/></linearGradient><filter id="filter12606" x="-.033333" y="-.085714" width="1.0667" height="1.1714" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="2"/></filter><filter id="filter13315" x="-.05475" y="-.042732" width="1.1095" height="1.0855" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="2.9199997"/></filter></defs><g shape-rendering="auto"><path transform="matrix(.1779 0 0 .1779 1.6916 3.4167e-7)" d="m39.675 11.008c-3.324 0-6 2.676-6 6v8c0 3.324 2.676 6 6 6h14v16h8v-16h2c3.324 0 6-2.676 6-6v-8c0-3.324-2.676-6-6-6zm68 0c-3.324 0-6 2.676-6 6v8c0 3.324 2.676 6 6 6h2v16h8v-16h14c3.324 0 6-2.676 6-6v-8c0-3.324-2.676-6-6-6zm-86 108v12l25.607 38c2.0698 3.5886 5.9358 6 10.393 6h56c4.4567 0 8.3227-2.4114 10.393-6h0.0117l25.596-38v-12z" color="#000000" color-rendering="auto" filter="url(#filter13315)" image-rendering="auto" opacity=".2"/><path transform="matrix(.1779 0 0 .1779 1.6916 3.4167e-7)" d="m39.675 7.008c-3.324 0-6 2.676-6 6v8c0 3.324 2.676 6 6 6h14v16h8v-16h2c3.324 0 6-2.676 6-6v-8c0-3.324-2.676-6-6-6zm68 0c-3.324 0-6 2.676-6 6v8c0 3.324 2.676 6 6 6h2v16h8v-16h14c3.324 0 6-2.676 6-6v-8c0-3.324-2.676-6-6-6zm-86 108v12l25.607 38c2.0698 3.5886 5.9358 6 10.393 6h56c4.4567 0 8.3227-2.4114 10.393-6h0.0117l25.596-38v-12z" color="#000000" color-rendering="auto" filter="url(#filter13315)" image-rendering="auto" opacity=".2"/><path transform="matrix(.1779 0 0 .1779 1.6916 3.4167e-7)" d="m13.675 115.01 8 12 25.607 38c2.0698 3.5886 5.9358 6 10.393 6h56c4.4568 0 8.3228-2.4114 10.393-6h0.0117l25.596-38 8-12z" color="#000000" color-rendering="auto" filter="url(#filter12606)" image-rendering="auto" opacity=".2"/></g><g transform="matrix(.1779 0 0 .1779 -.14517 -25.136)"><path transform="translate(0,140.3)" d="m32 116v12l25.607 38c2.0698 3.5886 5.9358 6 10.393 6h56c4.4568 0 8.3228-2.4114 10.393-6h0.0117l25.596-38v-12z" fill="#607d8b" fill-rule="evenodd"/></g><g shape-rendering="auto"><rect x="11.241" y="2.6699" width="1.4232" height="4.9812" color="#000000" color-rendering="auto" fill="#263238" image-rendering="auto"/><rect x="21.203" y="2.6699" width="1.4232" height="4.9812" color="#000000" color-rendering="auto" fill="#263238" image-rendering="auto"/><path d="m5.5477 22.417v0.17791l4.5556 6.7602c0.36822 0.63841 1.056 1.0674 1.8488 1.0674h9.9625c0.79286 0 1.4806-0.42899 1.8489-1.0674h2e-3l4.5535-6.7602v-0.17791l-4.5535 6.7602h-2e-3c-0.36822 0.63841-1.056 1.0674-1.8488 1.0674h-9.9625c-0.79286 0-1.4806-0.42899-1.8488-1.0674z" color="#000000" color-rendering="auto" fill="#4d6570" image-rendering="auto"/><rect transform="rotate(90)" x="1.2467" y="-14.087" width="3.558" height="6.4044" rx="1.0674" ry="1.0674" color="#000000" color-rendering="auto" fill="#607d8b" image-rendering="auto"/><rect transform="rotate(90)" x="1.2467" y="-26.184" width="3.558" height="6.4044" rx="1.0674" ry="1.0674" color="#000000" color-rendering="auto" fill="#607d8b" image-rendering="auto"/><path d="m7.6825 3.5594v0.1779c0 0.59135 0.47606 1.0674 1.0674 1.0674h4.2696c0.59134 0 1.0674-0.47606 1.0674-1.0674v-0.1779c0 0.59134-0.47606 1.0674-1.0674 1.0674h-4.2696c-0.59134 0-1.0674-0.47607-1.0674-1.0674z" color="#000000" color-rendering="auto" fill="#4d6570" image-rendering="auto"/><path d="m19.78 3.5594v0.1779c0 0.59135 0.47607 1.0674 1.0674 1.0674h4.2696c0.59135 0 1.0674-0.47606 1.0674-1.0674v-0.1779c0 0.59134-0.47606 1.0674-1.0674 1.0674h-4.2696c-0.59134 0-1.0674-0.47607-1.0674-1.0674z" color="#000000" color-rendering="auto" fill="#4d6570" image-rendering="auto"/><path d="m8.7499 1.2467c-0.59134 0-1.0674 0.47606-1.0674 1.0674v0.1779c0-0.59135 0.47606-1.0674 1.0674-1.0674h4.2696c0.59134 0 1.0674 0.47606 1.0674 1.0674v-0.1779c0-0.59135-0.47606-1.0674-1.0674-1.0674z" color="#000000" color-rendering="auto" fill="#8097a2" image-rendering="auto"/><path d="m20.847 1.2467c-0.59134 0-1.0674 0.47606-1.0674 1.0674v0.1779c0-0.59135 0.47607-1.0674 1.0674-1.0674h4.2696c0.59135 0 1.0674 0.47606 1.0674 1.0674v-0.1779c0-0.59135-0.47606-1.0674-1.0674-1.0674z" color="#000000" color-rendering="auto" fill="#8097a2" image-rendering="auto"/></g><path d="m5.5477 20.46v2.1348l4.5556 6.7602c0.36822 0.63841 1.056 1.0674 1.8489 1.0674h9.9625c0.79286 0 1.4806-0.42899 1.8489-1.0674h2e-3l4.5535-6.7602v-2.1348z" fill="url(#linearGradient14078)" fill-rule="evenodd"/><g transform="matrix(.1779 0 0 .1779 -.14517 -25.136)"><g shape-rendering="auto"><rect transform="rotate(90)" x="180.3" y="-172" width="92" height="152" rx="12" ry="12" color="#000000" color-rendering="auto" filter="url(#filter13052)" image-rendering="auto" opacity=".2"/><rect transform="rotate(90)" x="176.3" y="-172" width="92" height="152" rx="12" color="#000000" color-rendering="auto" filter="url(#filter13165)" image-rendering="auto" opacity=".2"/><rect transform="rotate(90)" x="176.3" y="-172" width="92" height="152" rx="12" color="#000000" color-rendering="auto" fill="#ff1744" image-rendering="auto"/></g><path d="m36 192.3 60 32 60-32" fill="none" stroke="#fbe9e7" stroke-linecap="round" stroke-width="6"/><path transform="translate(0,140.3)" d="m32 36c-6.648 0-12 5.352-12 12v1c0-6.648 5.352-12 12-12h128c6.648 0 12 5.352 12 12v-1c0-6.648-5.352-12-12-12z" color="#000000" color-rendering="auto" fill="#ff4569" image-rendering="auto" shape-rendering="auto"/><path transform="translate(0,140.3)" d="m20 115v1c0 6.648 5.352 12 12 12h128c6.648 0 12-5.352 12-12v-1c0 6.648-5.352 12-12 12h-128c-6.648 0-12-5.352-12-12z" color="#000000" color-rendering="auto" fill="#d81a3d" image-rendering="auto" shape-rendering="auto"/></g><g transform="matrix(.1779 0 0 .1779 -.14517 -25.136)" shape-rendering="auto"><path d="m90 296.3c-3.324 0-6 2.676-6 6v12c0 0.27298 0.02557 0.53962 0.06055 0.80273 2.55e-4 2e-3 -2.57e-4 4e-3 0 6e-3a12 12 0 0 0-0.06055 1.1913 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-0.0664-1.1523c0.039-0.27746 0.0664-0.55911 0.0664-0.84766v-12c0-3.324-2.676-6-6-6z" color="#000000" color-rendering="auto" filter="url(#filter13488)" image-rendering="auto" opacity=".2"/><path transform="translate(0,140.3)" d="m90 152c-3.324 0-6 2.676-6 6v12c0 0.27298 0.02557 0.53962 0.06055 0.80273 2.55e-4 2e-3 -2.57e-4 4e-3 0 6e-3a12 12 0 0 0-0.06055 1.1913 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-0.0664-1.1523c0.039-0.27746 0.0664-0.55911 0.0664-0.84766v-12c0-3.324-2.676-6-6-6z" color="#000000" color-rendering="auto" filter="url(#filter13338)" image-rendering="auto" opacity=".2"/><rect transform="rotate(90)" x="292.3" y="-108" width="24" height="24" rx="6" ry="6" color="#000000" color-rendering="auto" fill="#263238" image-rendering="auto"/><circle cx="96" cy="312.3" r="12" color="#000000" color-rendering="auto" fill="#263238" image-rendering="auto"/><path transform="translate(0,140.3)" d="m90 152c-3.324 0-6 2.676-6 6v1c0-3.324 2.676-6 6-6h12c3.324 0 6 2.676 6 6v-1c0-3.324-2.676-6-6-6z" color="#000000" color-rendering="auto" fill="#37474f" image-rendering="auto"/><path transform="translate(0,140.3)" d="m84.021 171.43a12 12 0 0 0-0.021484 0.57031 12 12 0 0 0 12 12 12 12 0 0 0 12-12 12 12 0 0 0-0.0195-0.41406 12 12 0 0 1-11.98 11.414 12 12 0 0 1-11.979-11.57z" color="#000000" color-rendering="auto" fill="#1a252a" image-rendering="auto"/></g><path d="m8.7498 1.2467c-0.59134 0-1.0674 0.47606-1.0674 1.0674v1.4232c0 0.59135 0.47606 1.0674 1.0674 1.0674h2.4906v1.4232h-5.6928c-1.1827 0-2.1348 0.95213-2.1348 2.1348v12.097c0 1.1827 0.95213 2.1348 2.1348 2.1348l4.5556 6.7602c0.36822 0.63841 1.056 1.0674 1.8488 1.0674h2.8464a2.1348 2.1348 0 0 0 2.1348 2.1348 2.1348 2.1348 0 0 0 2.1345-2.1348h2.8468c0.79286 0 1.4806-0.42899 1.8488-1.0674h2e-3l4.5539-6.7602c1.1825-1.82e-4 2.1348-0.95225 2.1348-2.1348v-12.097c0-1.1827-0.95247-2.1348-2.1352-2.1348h-5.6925v-1.4232h2.4903c0.59134 0 1.0678-0.47606 1.0678-1.0674v-1.4232c0-0.59135-0.47641-1.0674-1.0678-1.0674h-4.2693c-0.59134 0-1.0674 0.47606-1.0674 1.0674v1.4232c0 0.59135 0.47607 1.0674 1.0674 1.0674h0.3558v1.4232h-8.5395v-1.4232h0.35546c0.59134 0 1.0678-0.47606 1.0678-1.0674v-1.4232c0-0.59135-0.47641-1.0674-1.0678-1.0674z" fill="url(#radialGradient5715)" fill-rule="evenodd"/><path d="m8.7498 1.2467c-0.59134 0-1.0674 0.47606-1.0674 1.0674v1.4232c0 0.59135 0.47606 1.0674 1.0674 1.0674h2.4906v1.4232h-5.6928c-1.1827 0-2.1348 0.95213-2.1348 2.1348v12.097c0 1.1827 0.95213 2.1348 2.1348 2.1348l4.5556 6.7602c0.36822 0.63841 1.056 1.0674 1.8488 1.0674h2.8464a2.1348 2.1348 0 0 0 2.1348 2.1348 2.1348 2.1348 0 0 0 2.1345-2.1348h2.8468c0.79286 0 1.4806-0.42899 1.8488-1.0674h2e-3l4.5539-6.7602c1.1825-1.82e-4 2.1348-0.95225 2.1348-2.1348v-12.097c0-1.1827-0.95247-2.1348-2.1352-2.1348h-5.6925v-1.4232h2.4903c0.59134 0 1.0678-0.47606 1.0678-1.0674v-1.4232c0-0.59135-0.47641-1.0674-1.0678-1.0674h-4.2693c-0.59134 0-1.0674 0.47606-1.0674 1.0674v1.4232c0 0.59135 0.47607 1.0674 1.0674 1.0674h0.3558v1.4232h-8.5395v-1.4232h0.35546c0.59134 0 1.0678-0.47606 1.0678-1.0674v-1.4232c0-0.59135-0.47641-1.0674-1.0678-1.0674z" fill="url(#linearGradient5094)" fill-rule="evenodd"/></svg>
diff --git a/assets/img/svg/3rd-party/mailpile.svg b/assets/img/svg/3rd-party/mailpile.svg
new file mode 100644
index 00000000..9da73d63
--- /dev/null
+++ b/assets/img/svg/3rd-party/mailpile.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="128" height="128" version="1.1" viewBox="0 0 33.867 33.867" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.66524 0 0 .66524 -.96517 4.1927)"><g fill="#3a6b8c"><polygon points="31.845 13.283 30.104 2.644 24.619 9.464 21.684 12.224 25.706 16.172 30.831 19.932 30.34 20.619 26.846 18.665 20.871 12.907 17.647 16.924 12.939 14.392 11.562 17.32 6.347 24.443 5.34 23.793 10.494 16.707 12.289 13.473 7.505 11.245 1.663 7.159 2.218 14.629 4.142 25.806 14.08 26.266 25.38 23.949 31.398 23.161 32.59 21.342"/><polygon points="8.158 4.18 1.451 5.672 8.049 9.999 13.166 12.295 17.285 15.103 19.747 12.096 23.805 8.276 29.932 1.152 17.013 2.814"/></g><g fill="#a31304"><polygon points="38.792 31.277 39.955 24.488 35.223 27.465 32.873 28.522 34.481 31.744 36.794 35.083 36.356 35.396 34.651 33.488 32.239 28.765 29.455 30.521 27.139 28.01 25.697 29.492 21.063 32.711 20.59 32.107 25.18 28.899 26.937 27.319 24.511 24.978 22.343 25.521 20.612 25.922 19.447 33.074 25.356 35.422 32.665 36.375 36.464 37.152 37.563 36.301"/><polygon points="40.162 23.551 33.186 22.152 32.029 23.9 28.28 24.32 26.385 24.489 25.48 24.721 27.711 26.791 29.617 29.346 31.729 28.041 34.976 26.578"/></g><path d="m49.834 2.655-7.384 1.315-7.405 1.542-2.728 0.433 1.311 7.074 1.35 6.243 4.976-1.134 7.71-1.351 4.696-1.044-1.01-4.363zm-4.591 11.343 0.073 0.423-2.605 0.403-5.568 1.019-0.08-0.463-0.113-0.472 2.204-0.486 0.03-5e-3 3.517-0.531 2.488-0.343zm-8.631-0.677-1e-3 -0.36 2.865-0.582 2.808-0.494 1.329-0.286 1.144-0.211 0.101 0.769-1.396 0.317-3.988 0.682-2.714 0.56zm7.806-3.594 0.095 0.434-2.764 0.534-2.992 0.457-2.437 0.434-0.219-0.808 5.709-1.049 2.569-0.423zm4.722-3.305-2.325 0.365-0.326-1.106-0.15-1.333 1.068-0.134 1.336-0.275 0.319 1.245z" fill="#4b7945"/></g></svg>