diff --git a/_includes/legacy/sections/email-clients.html b/_includes/legacy/sections/email-clients.html
index 13edf4ba..d7f2f928 100644
--- a/_includes/legacy/sections/email-clients.html
+++ b/_includes/legacy/sections/email-clients.html
@@ -33,8 +33,6 @@
   <li><a href="https://neomutt.org/">NeoMutt</a> - NeoMutt is an open-source command line mail reader (or MUA) for Linux and BSD. It’s a fork of <a href="https://en.wikipedia.org/wiki/Mutt_(email_client)">Mutt</a> with added features.
 </ul>
 
-
-
 <h2 id="mobileclients" class="anchor"><a href="#mobileclients"><i class="fas fa-link anchor-icon"></i></a> Mobile Email Clients</h2>
 
 <h3 id="adroidclients" class="anchor"><a href="#adroidclients"><i class="fas fa-link anchor-icon"></i></a> Android Email Clients</h3>
@@ -65,7 +63,7 @@
 
 {% include legacy/cardv2.html
   title="Canary Mail"
-  image="/assets/img/legacy_png/3rd-party/canarymail.png"
+  image="/assets/img/legacy_svg/3rd-party/canarymail.svg"
   labels="color==warning::link==https://canarymail.io/faq.html::text==Closed source::tooltip==The source programming code for Canary Mail is not available. Canary Mail is a proprietary application."
   description="Canary Mail is a paid email client designed to make end-to-end encryption seamless with security features such as a biometric app lock."
   website="https://canarymail.io/"
diff --git a/assets/img/legacy_png/3rd-party/canarymail.png b/assets/img/legacy_png/3rd-party/canarymail.png
deleted file mode 100644
index c2654388..00000000
Binary files a/assets/img/legacy_png/3rd-party/canarymail.png and /dev/null differ
diff --git a/assets/img/legacy_svg/3rd-party/canarymail.svg b/assets/img/legacy_svg/3rd-party/canarymail.svg
new file mode 100644
index 00000000..4ca87107
--- /dev/null
+++ b/assets/img/legacy_svg/3rd-party/canarymail.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 128 128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><mask id="SVGID_1_" x="551.9" y="672.2" width="1384.3" height="631" maskUnits="userSpaceOnUse"><g class="st1"><linearGradient id="SVGID_2_" x1="-522.68" x2="2867.6" y1="2109.9" y2="152.57" gradientTransform="translate(132.45 -178.76)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#E7E7E7" offset=".122"/><stop stop-color="#A9A9A9" offset=".3804"/><stop stop-color="#464646" offset=".7508"/><stop offset="1"/></linearGradient><rect class="st2" x="551.9" y="672.2" width="1384.3" height="631"/></g></mask><mask id="SVGID_3_" x="701.7" y="712.7" width="969.2" height="545.8" maskUnits="userSpaceOnUse"><g class="st4"><linearGradient id="SVGID_4_" x1="-1176.1" x2="1607.7" y1="-57.277" y2="1506.4" gradientTransform="translate(168.4 -189.49)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#E7E7E7" offset=".122"/><stop stop-color="#A9A9A9" offset=".3804"/><stop stop-color="#464646" offset=".7508"/><stop offset="1"/></linearGradient><rect class="st5" x="701.7" y="712.7" width="969.2" height="545.8"/></g></mask><mask id="SVGID_5_" x="683.2" y="722.6" width="1259.5" height="845.5" maskUnits="userSpaceOnUse"><g class="st7"><linearGradient id="SVGID_6_" x1="-660.07" x2="2759.7" y1="2305" y2="330.53" gradientTransform="translate(163.96 -115.17)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#FAFAFA" offset=".1039"/><stop stop-color="#ECECEC" offset=".2275"/><stop stop-color="#D3D3D3" offset=".3613"/><stop stop-color="#B2B2B2" offset=".5022"/><stop stop-color="#878787" offset=".6487"/><stop stop-color="#525252" offset=".8"/><stop stop-color="#151515" offset=".9524"/><stop offset="1"/></linearGradient><rect class="st8" x="683.2" y="722.6" width="1259.5" height="845.5"/></g></mask><mask id="SVGID_7_" x="737.5" y="748.8" width="881.3" height="819" maskUnits="userSpaceOnUse"><g class="st10"><linearGradient id="SVGID_8_" x1="-1417.1" x2="1782.1" y1="-576.94" y2="1871.2" gradientTransform="translate(176.99 -115.25)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#B9B9B9" offset=".2492"/><stop stop-color="#565656" offset=".6196"/><stop stop-color="#181818" offset=".878"/><stop offset="1"/></linearGradient><rect class="st11" x="737.5" y="748.8" width="881.3" height="819"/></g></mask><mask id="SVGID_12_" x="613.6" y="877" width="563.6" height="849.8" maskUnits="userSpaceOnUse"><g class="st14"><linearGradient id="SVGID_13_" x1="1840.5" x2="401.69" y1="2739.8" y2="947.48" gradientTransform="translate(147.26 -77.076)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#C5C5C5" offset=".1715"/><stop stop-color="#808080" offset=".3977"/><stop stop-color="#494949" offset=".6019"/><stop stop-color="#212121" offset=".7767"/><stop stop-color="#090909" offset=".9151"/><stop offset="1"/></linearGradient><rect class="st15" x="613.6" y="877" width="563.6" height="849.8"/></g></mask><mask id="SVGID_14_" x="596.8" y="538" width="580.4" height="1168.9" maskUnits="userSpaceOnUse"><g class="st17"><linearGradient id="SVGID_15_" x1="-391.05" x2="1308.2" y1="-629.21" y2="2116.3" gradientTransform="translate(143.24 -81.87)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#BEBEBE" offset=".2129"/><stop stop-color="#6E6E6E" offset=".4994"/><stop stop-color="#333" offset=".7353"/><stop stop-color="#0E0E0E" offset=".9083"/><stop offset="1"/></linearGradient><rect class="st18" x="596.8" y="538" width="580.4" height="1168.9"/></g></mask><mask id="SVGID_16_" x="105.5" y="282.1" width="680.1" height="1122.3" maskUnits="userSpaceOnUse"><g class="st20"><linearGradient id="SVGID_17_" x1="-1881.2" x2="669.25" y1="728.12" y2="1026.9" gradientTransform="translate(25.322 -154.47)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop offset="1"/></linearGradient><rect class="st21" x="105.5" y="282.1" width="680.1" height="1122.3"/></g></mask><mask id="SVGID_18_" x="108.4" y="282.1" width="908.4" height="570.3" maskUnits="userSpaceOnUse"><g class="st23"><linearGradient id="SVGID_19_" x1="-551.85" x2="850.82" y1="-107.54" y2="1131.8" gradientTransform="translate(26.015 -286.94)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#F5F5F5" offset=".026522"/><stop stop-color="#ACACAC" offset=".2402"/><stop stop-color="#6F6F6F" offset=".441"/><stop stop-color="#3F3F3F" offset=".6229"/><stop stop-color="#1D1D1D" offset=".7825"/><stop stop-color="#080808" offset=".9136"/><stop offset="1"/></linearGradient><rect class="st24" x="108.4" y="282.1" width="908.4" height="570.3"/></g></mask><mask id="SVGID_23_" x="1112.1" y="1126.8" width="596.6" height="639.1" maskUnits="userSpaceOnUse"><g class="st27"><linearGradient id="SVGID_24_" x1="2419.6" x2="827.12" y1="2622.7" y2="1239.2" gradientTransform="translate(266.89 -67.702)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#CECECE" offset=".1273"/><stop stop-color="#909090" offset=".3061"/><stop stop-color="#5D5D5D" offset=".4778"/><stop stop-color="#353535" offset=".6375"/><stop stop-color="#181818" offset=".7825"/><stop stop-color="#060606" offset=".9081"/><stop offset="1"/></linearGradient><rect class="st28" x="1112.1" y="1126.8" width="596.6" height="639.1"/></g></mask><mask id="SVGID_25_" x="930.9" y="1550.6" width="777.7" height="215.4" maskUnits="userSpaceOnUse"><g class="st30"><linearGradient id="SVGID_26_" x1="2205.7" x2="896.6" y1="2776.2" y2="1536.8" gradientTransform="translate(223.43 -67.7)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop offset="1"/></linearGradient><rect class="st31" x="930.9" y="1550.6" width="777.7" height="215.4"/></g></mask><mask id="SVGID_27_" x="164.8" y="1246.5" width="1012.4" height="480.5" maskUnits="userSpaceOnUse"><g class="st33"><linearGradient id="SVGID_28_" x1="1717" x2="410.34" y1="3136.2" y2="1243.5" gradientTransform="translate(39.563 -77.05)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#CBCBCB" offset=".1101"/><stop stop-color="#969696" offset=".239"/><stop stop-color="#686868" offset=".3696"/><stop stop-color="#434343" offset=".4992"/><stop stop-color="#252525" offset=".6276"/><stop stop-color="#111" offset=".7546"/><stop stop-color="#040404" offset=".8796"/><stop offset="1"/></linearGradient><rect class="st34" x="164.8" y="1246.5" width="1012.4" height="480.5"/></g></mask><mask id="SVGID_29_" x="631.3" y="710.6" width="545.9" height="996.3" maskUnits="userSpaceOnUse"><g class="st36"><linearGradient id="SVGID_30_" x1="-583.14" x2="951.69" y1="1376.3" y2="1277.8" gradientTransform="translate(151.5 -81.87)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop stop-color="#aaa" offset=".2775"/><stop stop-color="#616161" offset=".5376"/><stop stop-color="#2D2D2D" offset=".7517"/><stop stop-color="#0C0C0C" offset=".9119"/><stop offset="1"/></linearGradient><rect class="st37" x="631.3" y="710.6" width="545.9" height="996.3"/></g></mask><mask id="SVGID_31_" x="699.6" y="710.6" width="1009.1" height="1024.1" maskUnits="userSpaceOnUse"><g class="st39"><linearGradient id="SVGID_32_" x1="-1130.7" x2="3607.3" y1="-189.46" y2="3062.5" gradientTransform="translate(167.89 -75.19)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop offset="1"/></linearGradient><rect class="st40" x="699.6" y="710.6" width="1009.1" height="1024.1"/></g></mask><mask id="SVGID_33_" x="704.4" y="722.6" width="1238.3" height="733.1" maskUnits="userSpaceOnUse"><g class="st42"><linearGradient id="SVGID_34_" x1="-1492.6" x2="3724.4" y1="-251.9" y2="2671.2" gradientTransform="translate(169.05 -142.16)" gradientUnits="userSpaceOnUse"><stop stop-color="#fff" offset="0"/><stop offset="1"/></linearGradient><rect class="st43" x="704.4" y="722.6" width="1238.3" height="733.1"/></g></mask></defs><style type="text/css">.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#220742;}
+	.st2{fill:url(#SVGID_2_);}
+	.st3{mask:url(#SVGID_1_);fill-rule:evenodd;clip-rule:evenodd;fill:#66E5FB;}
+	.st5{fill:url(#SVGID_4_);}
+	.st6{mask:url(#SVGID_3_);fill:#021B8D;}
+	.st8{fill:url(#SVGID_6_);}
+	.st9{mask:url(#SVGID_5_);fill-rule:evenodd;clip-rule:evenodd;fill:#66E5FB;}
+	.st11{fill:url(#SVGID_8_);}
+	.st12{mask:url(#SVGID_7_);fill:#021B8D;}
+	.st13{clip-path:url(#SVGID_10_);fill:url(#SVGID_11_);}
+	.st15{fill:url(#SVGID_13_);}
+	.st16{mask:url(#SVGID_12_);fill:#021B8D;}
+	.st18{fill:url(#SVGID_15_);}
+	.st19{mask:url(#SVGID_14_);fill-rule:evenodd;clip-rule:evenodd;fill:#D1F8FF;}
+	.st21{fill:url(#SVGID_17_);}
+	.st22{mask:url(#SVGID_16_);fill-rule:evenodd;clip-rule:evenodd;fill:#D1F8FF;}
+	.st24{fill:url(#SVGID_19_);}
+	.st25{mask:url(#SVGID_18_);fill-rule:evenodd;clip-rule:evenodd;fill:#D1F8FF;}
+	.st26{clip-path:url(#SVGID_21_);fill:url(#SVGID_22_);}
+	.st28{fill:url(#SVGID_24_);}
+	.st29{mask:url(#SVGID_23_);fill-rule:evenodd;clip-rule:evenodd;fill:#5EFAF7;}
+	.st31{fill:url(#SVGID_26_);}
+	.st32{mask:url(#SVGID_25_);fill:#021B8D;}
+	.st34{fill:url(#SVGID_28_);}
+	.st35{mask:url(#SVGID_27_);fill:#021B8D;}
+	.st37{fill:url(#SVGID_30_);}
+	.st38{mask:url(#SVGID_29_);fill:#021B8D;}
+	.st40{fill:url(#SVGID_32_);}
+	.st41{mask:url(#SVGID_31_);fill-rule:evenodd;clip-rule:evenodd;fill:#D1F8FF;}
+	.st43{fill:url(#SVGID_34_);}
+	.st44{mask:url(#SVGID_33_);fill-rule:evenodd;clip-rule:evenodd;fill:#D1F8FF;}</style><path class="st3" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1936.1 1049.5-1383-377.3c-28.2 342 451 684.5 911.8 624 168-22.1 333.6-97.8 471.2-246.7" mask="url(#SVGID_1_)"/><path class="st6" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m705.2 713.7-3.6-1 19.5 19.7 901.7 526c16.1-5.7 32.1-12 48-18.9z" mask="url(#SVGID_3_)"/><path class="st9" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1942.7 1445-1238.3-722.4c-115.7 323 258.5 777.9 719.2 838.7 168 22.2 347.6-8.1 519.1-116.3" mask="url(#SVGID_5_)"/><path class="st12" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1549 1567.8c23.2-0.7 46.4-2.4 69.8-5.3l-881.3-813.7z" mask="url(#SVGID_7_)"/><g transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)"><defs><path id="SVGID_9_" d="m1177.2 1706.9c-429.3-178-673-714.2-477.6-996.3 60.8-87.7 164-150.8 317.2-171 0 0-135.2-206.7-350-248.8-753.4-148-898.3 1644.1 510.4 1416.1"/></defs><clipPath id="SVGID_10_"><use width="100%" height="100%" xlink:href="#SVGID_9_"/></clipPath><linearGradient id="SVGID_11_" x1="889.72" x2="-62.029" y1="1760.9" y2="112.41" gradientUnits="userSpaceOnUse"><stop stop-color="#114FEE" offset="0"/><stop stop-color="#5EFAF7" offset="1"/></linearGradient><rect class="st13" x="-231.5" y="142.8" width="1408.7" height="1792.1" clip-path="url(#SVGID_10_)" fill="url(#SVGID_11_)" style="fill:url(#SVGID_11_)"/></g><path class="st16" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1177.2 1706.9c-354.9-147.1-582.9-539-541-829.8-49.2 170.5-21.6 651.2 115.6 834.2 122.3 21.1 263.5 21.8 425.4-4.4" mask="url(#SVGID_12_)"/><path class="st19" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1177.2 1706.9c-429.3-178-673-714.2-477.6-996.3 60.8-87.7 164-150.8 317.2-171-281.3-24.9-468.2 238.6-409 521.1 60.7 289.9 277.3 581.7 569.4 646.2" mask="url(#SVGID_14_)"/><path class="st22" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m785.6 332.8c-36.1-18.6-75.8-33.6-118.8-42-500.9-98.4-732.6 660.7-417.8 1113.6-3.9-22.8-148.7-889.3 536.6-1071.6" mask="url(#SVGID_16_)"/><path class="st25" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1016.8 539.6s-135.2-206.7-350-248.8c-321.2-63.1-531.6 226.4-558.4 561.6 244.6-611.5 908.4-312.8 908.4-312.8" mask="url(#SVGID_18_)"/><g transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)"><defs><path id="SVGID_20_" d="m1708.7 1728.9-1009.1-1018.3c-195.4 282.1 48.3 818.3 477.6 996.3 156.6 64.9 337.8 82.1 531.5 22"/></defs><clipPath id="SVGID_21_"><use width="100%" height="100%" xlink:href="#SVGID_20_"/></clipPath><linearGradient id="SVGID_22_" x1="699.28" x2="1674.5" y1="1428.3" y2="1000.8" gradientUnits="userSpaceOnUse"><stop stop-color="#114FEE" offset="0"/><stop stop-color="#5EFAF7" offset="1"/></linearGradient><rect class="st26" x="504.2" y="710.6" width="1204.5" height="1078.4" clip-path="url(#SVGID_21_)" fill="url(#SVGID_22_)" style="fill:url(#SVGID_22_)"/></g><path class="st29" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1708.7 1728.9-596.6-602.1 296.8 636.5c95 7.9 195.6-2.1 299.8-34.4" mask="url(#SVGID_23_)"/><path class="st32" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1708.7 1728.9-160.9-162.3c-245 11.5-448.5 3.6-616.9-16 72.1 64.4 154.9 118.5 246.3 156.3 156.6 64.9 337.8 82.1 531.5 22" mask="url(#SVGID_25_)"/><path class="st35" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1177.2 1706.9c-91.3-37.8-174.2-92-246.3-156.3-607.8-70.9-759.6-294-766.1-304.1 121.9 310.4 437.9 553.4 1012.4 460.4" mask="url(#SVGID_27_)"/><path class="st38" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1177.2 1706.9c-533.2-438-445.4-800-401.9-919.8l-75.8-76.5c-195.3 282 48.4 818.3 477.7 996.3" mask="url(#SVGID_29_)"/><path class="st41" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1689.2 1734.7c6.5-1.8 13-3.8 19.5-5.8l-1009.1-1018.3z" mask="url(#SVGID_31_)"/><path class="st44" transform="matrix(.069666 0 0 .069666 -7.3393 -7.3381)" d="m1925.4 1455.7c5.8-3.5 11.5-7 17.3-10.6l-1238.3-722.5z" mask="url(#SVGID_33_)"/></svg>