diff --git a/BTCPayServer/Views/Shared/_Layout.cshtml b/BTCPayServer/Views/Shared/_Layout.cshtml
index fba904fec..da82a5ca9 100644
--- a/BTCPayServer/Views/Shared/_Layout.cshtml
+++ b/BTCPayServer/Views/Shared/_Layout.cshtml
@@ -130,21 +130,24 @@
 
     @if (User.Identity.IsAuthenticated)
     {
-        <footer class="footer">
+        <footer class="btcpay-footer">
             <div class="container">
-                <div class="d-flex flex-wrap justify-content-between">
-                    <div>
-                        <div>
-                            <a href="https://github.com/btcpayserver/btcpayserver" target="_blank"  rel="noreferrer noopener"><img src="~/img/github.svg" alt="Github" class="social-logo social-link" asp-append-version="true">Github</a>
-                        </div>
-                        <div>
-                            <a href="https://chat.btcpayserver.org/" target="_blank"  rel="noreferrer noopener"><img src="~/img/mattermost.svg" alt="Mattermost" class="social-logo social-link" asp-append-version="true">Mattermost</a>
-                        </div>
-                        <div>
-                            <a href="https://twitter.com/BtcpayServer" target="_blank"  rel="noreferrer noopener"><img src="~/img/twitter.svg" alt="Twitter" class="social-logo social-link" asp-append-version="true">Twitter</a>
-                        </div>                
+                <div class="d-flex flex-column justify-content-between flex-lg-row py-1">
+                    <div class="d-flex justify-content-center justify-content-lg-start mb-2 mb-lg-0">
+                        <a href="https://github.com/btcpayserver/btcpayserver" class="d-flex align-items-center me-4" target="_blank" rel="noreferrer noopener">
+                            <vc:icon symbol="github" />
+                            <span style="margin-left:.4rem">Github</span>
+                        </a>
+                        <a href="https://chat.btcpayserver.org/" class="d-flex align-items-center me-4" target="_blank" rel="noreferrer noopener">
+                            <vc:icon symbol="mattermost" />
+                            <span style="margin-left:.4rem">Mattermost</span>
+                        </a>
+                        <a href="https://twitter.com/BtcpayServer" class="d-flex align-items-center" target="_blank" rel="noreferrer noopener">
+                            <vc:icon symbol="twitter" />
+                            <span style="margin-left:.4rem">Twitter</span>
+                        </a>
                     </div>
-                    <div class="p-2 align-self-center">@Env.ToString()</div>
+                    <div class="text-center text-lg-start">@Env.ToString()</div>
                 </div>
             </div>
         </footer>
diff --git a/BTCPayServer/wwwroot/img/github.png b/BTCPayServer/wwwroot/img/github.png
deleted file mode 100644
index 9490ffc6d..000000000
Binary files a/BTCPayServer/wwwroot/img/github.png and /dev/null differ
diff --git a/BTCPayServer/wwwroot/img/github.svg b/BTCPayServer/wwwroot/img/github.svg
deleted file mode 100644
index 1bc79a499..000000000
--- a/BTCPayServer/wwwroot/img/github.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="121" height="119" xmlns="http://www.w3.org/2000/svg">
-  <g fill="#161514" fill-rule="evenodd">
-    <path d="M.221 60.833c0 26.681 17.303 49.317 41.297 57.302 3.018.559 4.126-1.31 4.126-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.479-3.748.413-3.671.413-3.671 6.064.426 9.257 6.223 9.257 6.223 5.386 9.232 14.127 6.563 17.573 5.02.542-3.903 2.107-6.567 3.834-8.075-13.413-1.527-27.513-6.705-27.513-29.844 0-6.593 2.359-11.98 6.222-16.209-.627-1.521-2.694-7.663.585-15.981 0 0 5.071-1.623 16.611 6.19 4.817-1.338 9.983-2.009 15.115-2.032 5.132.023 10.302.694 15.128 2.032 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.318 1.219 14.46.592 15.981 3.872 4.229 6.215 9.616 6.215 16.209 0 23.194-14.127 28.301-27.574 29.796 2.166 1.874 4.096 5.549 4.096 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.087 3.49 4.148 2.897 23.981-7.994 41.262-30.622 41.262-57.294 0-33.352-27.037-60.388-60.387-60.388C27.262.445.221 27.481.221 60.833z"/>
-    <path d="M23.093 87.149c-.133.3-.605.39-1.035.184-.438-.197-.684-.606-.542-.907.13-.309.603-.395 1.04-.188.439.197.689.61.537.911M25.539 89.877c-.288.267-.851.143-1.233-.279-.395-.421-.469-.984-.177-1.255.297-.267.843-.142 1.239.279.395.426.472.985.171 1.255M27.92 93.355c-.37.257-.975.016-1.349-.521-.37-.537-.37-1.181.008-1.439.375-.258.971-.026 1.35.507.369.546.369 1.19-.009 1.453M31.182 96.715c-.331.365-1.036.267-1.552-.231-.528-.487-.675-1.178-.343-1.543.335-.366 1.044-.263 1.564.231.524.486.684 1.182.331 1.543M35.682 98.666c-.146.473-.825.688-1.509.487-.683-.207-1.13-.761-.992-1.239.142-.476.824-.7 1.513-.485.682.206 1.13.756.988 1.237M40.624 99.028c.017.498-.563.911-1.281.92-.722.016-1.306-.387-1.314-.877 0-.503.567-.912 1.289-.924.718-.014 1.306.386 1.306.881M45.223 98.245c.086.486-.413.985-1.126 1.118-.701.128-1.35-.172-1.439-.654-.087-.498.421-.997 1.121-1.126.714-.124 1.353.168 1.444.662"/>
-  </g>
-</svg>
diff --git a/BTCPayServer/wwwroot/img/icon-sprite.svg b/BTCPayServer/wwwroot/img/icon-sprite.svg
index fb4eb5f76..d8fcc2e64 100644
--- a/BTCPayServer/wwwroot/img/icon-sprite.svg
+++ b/BTCPayServer/wwwroot/img/icon-sprite.svg
@@ -14,4 +14,7 @@
 <symbol id="scan-qr" viewBox="0 0 32 32"><path d="M20 .875h10c.621 0 1.125.504 1.125 1.125v10m0 8v10c0 .621-.504 1.125-1.125 1.125H20m-8 0H2A1.125 1.125 0 01.875 30V20m0-8V2C.875 1.379 1.379.875 2 .875h10" stroke="currentColor" stroke-width="1.75" fill="none" fill-rule="evenodd"/></symbol>
 <symbol id="seed" viewBox="0 0 32 32"><rect x="0.875" y="2.875" width="30.25" height="26.25" rx="1.125" fill="none" stroke="currentColor" stroke-width="1.75"/><rect x="5" y="7" width="9" height="4" rx="0.5" fill="currentColor"/><rect x="5" y="14" width="9" height="4" rx="0.5" fill="currentColor"/><rect x="18" y="7" width="9" height="4" rx="0.5" fill="currentColor"/><rect x="18" y="14" width="9" height="4" rx="0.5" fill="currentColor"/><rect x="5" y="21" width="9" height="4" rx="0.5" fill="currentColor"/><rect x="18" y="21" width="9" height="4" rx="0.5" fill="currentColor"/></symbol>
 <symbol id="warning" viewBox="0 0 24 24"><path d="M12.337 3.101a.383.383 0 00-.674 0l-9.32 17.434a.383.383 0 00.338.564h18.638a.384.384 0 00.337-.564L12.337 3.101zM9.636 2.018c1.01-1.89 3.719-1.89 4.728 0l9.32 17.434a2.681 2.681 0 01-2.365 3.945H2.681a2.68 2.68 0 01-2.364-3.945L9.636 2.018zm3.896 15.25a1.532 1.532 0 11-3.064 0 1.532 1.532 0 013.064 0zm-.383-8.044a1.15 1.15 0 00-2.298 0v3.83a1.15 1.15 0 002.298 0v-3.83z" fill="currentColor"/></symbol>
+<symbol id="github" viewBox="0 0 25 24"><path clip-rule="evenodd" d="M12.75.3c-6.6 0-12 5.4-12 12 0 5.325 3.45 9.825 8.175 11.4.6.075.825-.225.825-.6v-2.025C6.375 21.825 5.7 19.5 5.7 19.5c-.525-1.35-1.35-1.725-1.35-1.725-1.125-.75.075-.75.075-.75 1.2.075 1.875 1.2 1.875 1.2 1.05 1.8 2.775 1.275 3.525.975a2.59 2.59 0 0 1 .75-1.575c-2.7-.3-5.475-1.35-5.475-5.925 0-1.275.45-2.4 1.2-3.225-.15-.3-.525-1.5.15-3.15 0 0 .975-.3 3.3 1.2.975-.3 1.95-.375 3-.375s2.025.15 3 .375c2.325-1.575 3.3-1.275 3.3-1.275.675 1.65.225 2.85.15 3.15.75.825 1.2 1.875 1.2 3.225 0 4.575-2.775 5.625-5.475 5.925.45.375.825 1.125.825 2.25v3.3c0 .3.225.675.825.6a12.015 12.015 0 0 0 8.175-11.4c0-6.6-5.4-12-12-12z" fill="currentColor" fill-rule="evenodd"></path></symbol>
+<symbol id="twitter" viewBox="0 0 37 37"><path d="M36 18c0 9.945-8.055 18-18 18S0 27.945 0 18 8.055 0 18 0s18 8.055 18 18zm-21.294 9.495c7.983 0 12.348-6.615 12.348-12.348 0-.189 0-.378-.009-.558a8.891 8.891 0 0 0 2.169-2.25 8.808 8.808 0 0 1-2.493.684 4.337 4.337 0 0 0 1.908-2.403 8.788 8.788 0 0 1-2.754 1.053 4.319 4.319 0 0 0-3.168-1.368 4.34 4.34 0 0 0-4.338 4.338c0 .342.036.675.117.99a12.311 12.311 0 0 1-8.946-4.536 4.353 4.353 0 0 0-.585 2.178 4.32 4.32 0 0 0 1.935 3.609 4.263 4.263 0 0 1-1.962-.54v.054a4.345 4.345 0 0 0 3.483 4.257 4.326 4.326 0 0 1-1.962.072 4.333 4.333 0 0 0 4.05 3.015 8.724 8.724 0 0 1-6.426 1.791 12.091 12.091 0 0 0 6.633 1.962z" fill="currentColor"></path></symbol>
+<symbol id="mattermost" viewBox="0 0 206 206"><path fill="currentColor" d="m163.012 19.596 1.082 21.794c17.667 19.519 24.641 47.161 15.846 73.14-13.129 38.782-56.419 59.169-96.693 45.535-40.272-13.633-62.278-56.124-49.15-94.905 8.825-26.066 31.275-43.822 57.276-48.524L105.422.038C61.592-1.15 20.242 26.056 5.448 69.76c-18.178 53.697 10.616 111.963 64.314 130.142 53.698 18.178 111.964-10.617 130.143-64.315 14.77-43.633-1.474-90.283-36.893-115.99"/><path fill="currentColor" d="m137.097 53.436-.596-17.531-.404-15.189s.084-7.322-.17-9.043a2.776 2.776 0 0 0-.305-.914l-.05-.109-.06-.094a2.378 2.378 0 0 0-1.293-1.07 2.382 2.382 0 0 0-1.714.078l-.033.014-.18.092a2.821 2.821 0 0 0-.75.518c-1.25 1.212-5.63 7.08-5.63 7.08l-9.547 11.82-11.123 13.563-19.098 23.75s-8.763 10.938-6.827 24.4c1.937 13.464 11.946 20.022 19.71 22.65 7.765 2.63 19.7 3.5 29.417-6.019 9.716-9.518 9.397-23.53 9.397-23.53l-.744-30.466z"/></symbol>
 </svg>
diff --git a/BTCPayServer/wwwroot/img/slack.png b/BTCPayServer/wwwroot/img/slack.png
deleted file mode 100644
index c2206ce99..000000000
Binary files a/BTCPayServer/wwwroot/img/slack.png and /dev/null differ
diff --git a/BTCPayServer/wwwroot/img/slack.svg b/BTCPayServer/wwwroot/img/slack.svg
deleted file mode 100644
index 7b451f830..000000000
--- a/BTCPayServer/wwwroot/img/slack.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg viewBox="0 0 54 54" xmlns="http://www.w3.org/2000/svg">
-    <g>
-        <path d="M19.712.133a5.381 5.381 0 0 0-5.376 5.387 5.381 5.381 0 0 0 5.376 5.386h5.376V5.52A5.381 5.381 0 0 0 19.712.133m0 14.365H5.376A5.381 5.381 0 0 0 0 19.884a5.381 5.381 0 0 0 5.376 5.387h14.336a5.381 5.381 0 0 0 5.376-5.387 5.381 5.381 0 0 0-5.376-5.386" fill="#36C5F0"></path>
-        <path d="M53.76 19.884a5.381 5.381 0 0 0-5.376-5.386 5.381 5.381 0 0 0-5.376 5.386v5.387h5.376a5.381 5.381 0 0 0 5.376-5.387m-14.336 0V5.52A5.381 5.381 0 0 0 34.048.133a5.381 5.381 0 0 0-5.376 5.387v14.364a5.381 5.381 0 0 0 5.376 5.387 5.381 5.381 0 0 0 5.376-5.387" fill="#2EB67D"></path>
-        <path d="M34.048 54a5.381 5.381 0 0 0 5.376-5.387 5.381 5.381 0 0 0-5.376-5.386h-5.376v5.386A5.381 5.381 0 0 0 34.048 54m0-14.365h14.336a5.381 5.381 0 0 0 5.376-5.386 5.381 5.381 0 0 0-5.376-5.387H34.048a5.381 5.381 0 0 0-5.376 5.387 5.381 5.381 0 0 0 5.376 5.386" fill="#ECB22E"></path>
-        <path d="M0 34.249a5.381 5.381 0 0 0 5.376 5.386 5.381 5.381 0 0 0 5.376-5.386v-5.387H5.376A5.381 5.381 0 0 0 0 34.25m14.336-.001v14.364A5.381 5.381 0 0 0 19.712 54a5.381 5.381 0 0 0 5.376-5.387V34.25a5.381 5.381 0 0 0-5.376-5.387 5.381 5.381 0 0 0-5.376 5.387" fill="#E01E5A"></path>
-    </g>
-</svg>
diff --git a/BTCPayServer/wwwroot/img/twitter.png b/BTCPayServer/wwwroot/img/twitter.png
deleted file mode 100644
index c442804d1..000000000
Binary files a/BTCPayServer/wwwroot/img/twitter.png and /dev/null differ
diff --git a/BTCPayServer/wwwroot/img/twitter.svg b/BTCPayServer/wwwroot/img/twitter.svg
deleted file mode 100644
index 1f907c42e..000000000
--- a/BTCPayServer/wwwroot/img/twitter.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="250" height="204" xmlns="http://www.w3.org/2000/svg">
-  <path d="M78.62 203.59c94.34 0 145.94-78.16 145.94-145.94 0-2.22 0-4.43-.15-6.63A104.36 104.36 0 00250 24.47a102.38 102.38 0 01-29.46 8.07 51.47 51.47 0 0022.55-28.37 102.79 102.79 0 01-32.57 12.45C194.62-.286 169.357-4.424 148.895 6.527c-20.461 10.95-31.032 34.266-25.785 56.873A145.62 145.62 0 0117.4 9.81C3.786 33.246 10.74 63.229 33.28 78.28A50.91 50.91 0 0110 71.86v.65c.007 24.416 17.218 45.445 41.15 50.28a51.21 51.21 0 01-23.16.88c6.72 20.894 25.976 35.208 47.92 35.62a102.92 102.92 0 01-63.7 22A104.41 104.41 0 010 180.55a145.21 145.21 0 0078.62 23" fill="#1DA1F2" fill-rule="nonzero"/>
-</svg>
diff --git a/BTCPayServer/wwwroot/main/site.css b/BTCPayServer/wwwroot/main/site.css
index dd4b11684..a6c27bb31 100644
--- a/BTCPayServer/wwwroot/main/site.css
+++ b/BTCPayServer/wwwroot/main/site.css
@@ -198,7 +198,7 @@ h2 small .fa-question-circle-o {
 }
 
 /* Footer */
-.footer {
+.btcpay-footer {
     position: absolute;
     left: 0;
     right: 0;
@@ -206,8 +206,18 @@ h2 small .fa-question-circle-o {
     font-size: 12px;
     overflow: hidden;
     padding: .5em 0;
-    color: var(--btcpay-footer-text, var(--btcpay-neutral-100));
-    background: var(--btcpay-footer-bg, var(--btcpay-bg-dark));
+    color: var(--btcpay-footer-text);
+    background: var(--btcpay-footer-bg);
+}
+
+.btcpay-footer a {
+    color: var(--btcpay-footer-link);
+    text-decoration: none;
+}
+
+.btcpay-footer a:focus,
+.btcpay-footer a:hover {
+    color: var(--btcpay-footer-link-accent);
 }
 
 /* Prevent layout from breaking on hyperlinks with very long URLs as the visible text */
diff --git a/BTCPayServer/wwwroot/main/themes/default-dark.css b/BTCPayServer/wwwroot/main/themes/default-dark.css
index 7be824ca4..6f424ff2e 100644
--- a/BTCPayServer/wwwroot/main/themes/default-dark.css
+++ b/BTCPayServer/wwwroot/main/themes/default-dark.css
@@ -84,7 +84,3 @@
   --btcpay-dark-shadow: rgba(211, 212, 213, 0.33);
   --btcpay-dark-rgb: 201, 209, 217;
 }
-
-.social-logo {
-  filter: contrast(0) brightness(200%);
-}