diff --git a/BTCPayServer/wwwroot/img/icon-sprite.svg b/BTCPayServer/wwwroot/img/icon-sprite.svg
index fb5e1ebaa..e36bcfed9 100644
--- a/BTCPayServer/wwwroot/img/icon-sprite.svg
+++ b/BTCPayServer/wwwroot/img/icon-sprite.svg
@@ -45,6 +45,7 @@
 <symbol id="forms-text" viewBox="0 0 24 24" fill="none"><rect x="1" y="1" width="22" height="22" rx="3" stroke="currentColor" stroke-width="2"/><path d="M7 7.75H17" stroke="currentColor" stroke-width="2" stroke-linecap="round"/><path d="M12 8V16" stroke="currentColor" stroke-width="2" stroke-linecap="round"/></symbol>
 <symbol id="info" viewBox="0 0 24 24" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M12 22.39c5.739 0 10.39-4.651 10.39-10.39C22.39 6.261 17.74 1.61 12 1.61 6.261 1.61 1.61 6.26 1.61 12c0 5.739 4.651 10.39 10.39 10.39zm0-2.597a7.793 7.793 0 1 0 0-15.586 7.793 7.793 0 0 0 0 15.586z" fill="currentColor"/><path d="M12 6.805a1.299 1.299 0 1 0 0 2.597 1.299 1.299 0 0 0 0-2.597zM10.701 12s0-1.299 1.299-1.299S13.299 12 13.299 12v3.897s0 1.298-1.299 1.298-1.299-1.298-1.299-1.298z" fill="currentColor"/></symbol>
 <symbol id="key" viewBox="0 0 24 24" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.5 9.5C10.5003 8.65387 10.769 7.82965 11.2673 7.14583C11.7657 6.46202 12.468 5.95384 13.2733 5.69436C14.0787 5.43488 14.9456 5.43748 15.7494 5.70176C16.5532 5.96605 17.2525 6.47842 17.7467 7.1652C18.2409 7.85198 18.5047 8.6778 18.4999 9.52392C18.4952 10.37 18.2223 11.1929 17.7205 11.8741C17.2186 12.5553 16.5137 13.0599 15.707 13.3152C14.9003 13.5705 14.0334 13.5634 13.231 13.295C13.0989 13.2507 12.9571 13.2441 12.8214 13.2759C12.6858 13.3077 12.5617 13.3766 12.463 13.475L11.44 14.5H10.25C10.0511 14.5 9.86032 14.579 9.71967 14.7197C9.57902 14.8603 9.5 15.0511 9.5 15.25V16.44L9.44 16.5H8.25C8.05109 16.5 7.86032 16.579 7.71967 16.7197C7.57902 16.8603 7.5 17.0511 7.5 17.25V18.44L7.44 18.5H5.75C5.6837 18.5 5.62011 18.4737 5.57322 18.4268C5.52634 18.3799 5.5 18.3163 5.5 18.25V16.56L10.524 11.537C10.6226 11.4384 10.6917 11.3144 10.7237 11.1787C10.7556 11.0431 10.7492 10.9012 10.705 10.769C10.5686 10.3598 10.4994 9.93129 10.5 9.5ZM14.5 4C13.6681 3.99986 12.847 4.18843 12.0985 4.55153C11.35 4.91463 10.6937 5.44279 10.1788 6.09625C9.66398 6.74971 9.30409 7.51145 9.12623 8.32412C8.94837 9.13679 8.95718 9.97923 9.152 10.788L4.22 15.72C4.07931 15.8605 4.00018 16.0512 4 16.25V18.25C4 19.216 4.784 20 5.75 20H7.75C7.94885 19.9998 8.13948 19.9207 8.28 19.78L8.78 19.28C8.92069 19.1395 8.99983 18.9488 9 18.75V18H9.75C9.94885 17.9998 10.1395 17.9207 10.28 17.78L10.78 17.28C10.9207 17.1395 10.9998 16.9488 11 16.75V16H11.75C11.9488 15.9998 12.1395 15.9207 12.28 15.78L13.212 14.848C13.9672 15.0293 14.7523 15.0487 15.5155 14.9047C16.2787 14.7608 17.0028 14.4568 17.64 14.0128C18.2773 13.5689 18.8133 12.995 19.2128 12.3289C19.6123 11.6628 19.8662 10.9197 19.9577 10.1485C20.0493 9.37721 19.9765 8.59531 19.7441 7.85422C19.5117 7.11314 19.125 6.42968 18.6094 5.84883C18.0938 5.26798 17.461 4.80292 16.7527 4.48426C16.0444 4.16559 15.2767 4.00055 14.5 4ZM15 10C15.2652 10 15.5196 9.89464 15.7071 9.70711C15.8946 9.51957 16 9.26522 16 9C16 8.73478 15.8946 8.48043 15.7071 8.29289C15.5196 8.10536 15.2652 8 15 8C14.7348 8 14.4804 8.10536 14.2929 8.29289C14.1054 8.48043 14 8.73478 14 9C14 9.26522 14.1054 9.51957 14.2929 9.70711C14.4804 9.89464 14.7348 10 15 10Z" fill="currentColor"/></symbol>
+<symbol id="lightning-node" viewBox="0 0 24 24" fill="none"><path d="M14 4C14 5.10457 13.1046 6 12 6C10.8954 6 10 5.10457 10 4C10 2.89543 10.8954 2 12 2C13.1046 2 14 2.89543 14 4Z" fill="currentColor"/><path d="M20 14C21.1046 14 22 13.1046 22 12C22 10.8954 21.1046 10 20 10C18.8954 10 18 10.8954 18 12C18 13.1046 18.8954 14 20 14Z" fill="currentColor"/><path d="M14 20C14 21.1046 13.1046 22 12 22C10.8954 22 10 21.1046 10 20C10 18.8954 10.8954 18 12 18C13.1046 18 14 18.8954 14 20Z" fill="currentColor"/><path d="M4 14C5.10457 14 6 13.1046 6 12C6 10.8954 5.10457 10 4 10C2.89543 10 2 10.8954 2 12C2 13.1046 2.89543 14 4 14Z" fill="currentColor"/><path d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z" fill="currentColor"/></symbol>
 <symbol id="lightning" viewBox="0 0 24 24" fill="none"><path d="M17.57 10.7c-.1-.23-.27-.34-.5-.34h-4.3l.5-3.76a.48.48 0 0 0-.33-.55.52.52 0 0 0-.66.17l-5.45 6.54a.59.59 0 0 0-.05.6c.1.17.27.28.49.28h4.3l-.49 3.76c-.05.22.11.5.33.55.06.05.17.05.22.05a.5.5 0 0 0 .44-.22l5.45-6.54c.1-.17.16-.39.05-.55Z" fill="currentColor"/></symbol>
 <symbol id="lock" viewBox="0 0 24 24" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M8.13333 8.26667V10.4H7.86667C7.3716 10.4 6.8968 10.5967 6.54673 10.9467C6.19667 11.2968 6 11.7716 6 12.2667V18.1333C6 19.1637 6.83627 20 7.86667 20H16.9333C17.4284 20 17.9032 19.8033 18.2533 19.4533C18.6033 19.1032 18.8 18.6284 18.8 18.1333V12.2667C18.8 11.7716 18.6033 11.2968 18.2533 10.9467C17.9032 10.5967 17.4284 10.4 16.9333 10.4H16.6667V8.26667C16.6667 7.13508 16.2171 6.04983 15.417 5.24968C14.6168 4.44952 13.5316 4 12.4 4C11.2684 4 10.1832 4.44952 9.38301 5.24968C8.58286 6.04983 8.13333 7.13508 8.13333 8.26667ZM15.0667 10.4V8.26667C15.0667 7.55942 14.7857 6.88115 14.2856 6.38105C13.7855 5.88095 13.1072 5.6 12.4 5.6C11.6928 5.6 11.0145 5.88095 10.5144 6.38105C10.0143 6.88115 9.73333 7.55942 9.73333 8.26667V10.4H15.0667ZM16.6667 12H16.9333C17.0041 12 17.0719 12.0281 17.1219 12.0781C17.1719 12.1281 17.2 12.1959 17.2 12.2667V18.1333C17.2 18.2041 17.1719 18.2719 17.1219 18.3219C17.0719 18.3719 17.0041 18.4 16.9333 18.4H7.86667C7.79594 18.4 7.72811 18.3719 7.6781 18.3219C7.6281 18.2719 7.6 18.2041 7.6 18.1333V12.2667C7.6 12.1959 7.6281 12.1281 7.6781 12.0781C7.72811 12.0281 7.79594 12 7.86667 12H16.6667Z" fill="currentColor"/></symbol>
 <symbol id="logo-btcpay" viewBox="0 0 24 24" fill="none"><g fill="currentColor" transform="matrix(0.27159594,0,0,0.27159594,5.6093989,0.60189406)"><path d="M 5.206,83.433 A 4.86,4.86 0 0 1 0.347,78.572 V 5.431 a 4.86,4.86 0 1 1 9.719,0 v 73.141 a 4.861,4.861 0 0 1 -4.86,4.861"/><path d="M 5.209,83.433 A 4.862,4.862 0 0 1 3.123,74.18 L 32.43,60.274 2.323,38.093 a 4.861,4.861 0 0 1 5.766,-7.826 l 36.647,26.999 a 4.864,4.864 0 0 1 -0.799,8.306 L 7.289,82.964 a 4.866,4.866 0 0 1 -2.08,0.469"/><path d="M 5.211,54.684 A 4.86,4.86 0 0 1 2.324,45.91 L 32.43,23.73 3.123,9.821 A 4.861,4.861 0 0 1 7.289,1.037 l 36.648,17.394 a 4.86,4.86 0 0 1 0.799,8.305 l -36.647,27 a 4.844,4.844 0 0 1 -2.878,0.948"/><path d="M 10.066,31.725 V 52.278 L 24.01,42.006 Z"/><path d="M 10.066,5.431 A 4.861,4.861 0 0 0 5.206,0.57 4.86,4.86 0 0 0 0.347,5.431 v 61.165 h 9.72 V 5.431 Z"/></g></symbol>
@@ -114,6 +115,7 @@
 <symbol id="wallet-hot" viewBox="0 0 32 32" fill="none"><path d="M26.5362 7.08746H25.9614V3.25512C25.9614 2.10542 25.3865 1.14734 24.6201 0.572488C23.8536 -0.00236247 22.7039 -0.193979 21.7458 -0.00236246L4.11707 5.36291C2.00929 5.93776 0.667969 7.85392 0.667969 9.96171V12.0695V12.836V27.3988C0.667969 30.0815 2.77575 32.1893 5.45839 32.1893H26.5362C29.2189 32.1893 31.3267 30.0815 31.3267 27.3988V12.0695C31.3267 9.38686 29.2189 7.08746 26.5362 7.08746ZM4.69192 7.08746L22.129 1.91381C22.5123 1.72219 23.0871 1.91381 23.4704 2.10542C23.8536 2.29704 24.0452 2.87189 24.0452 3.25512V7.08746H5.45839C4.88354 7.08746 4.5003 7.27908 3.92545 7.47069C4.11707 7.27908 4.5003 7.08746 4.69192 7.08746ZM29.4105 27.2072C29.4105 28.7402 28.0692 30.0815 26.5362 30.0815H5.45839C3.92545 30.0815 2.58414 28.7402 2.58414 27.2072V12.836V11.8779C2.58414 10.3449 3.92545 9.00362 5.45839 9.00362H26.5362C28.0692 9.00362 29.4105 10.3449 29.4105 11.8779V27.2072Z" fill="currentColor"/><path d="M25.9591 21.6487C27.0174 21.6487 27.8753 20.7908 27.8753 19.7326C27.8753 18.6743 27.0174 17.8164 25.9591 17.8164C24.9009 17.8164 24.043 18.6743 24.043 19.7326C24.043 20.7908 24.9009 21.6487 25.9591 21.6487Z" fill="currentColor"/></symbol>
 <symbol id="wallet-new" viewBox="0 0 32 32" fill="none"><path d="M16 10V22" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><path d="M22 16H10" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/><circle fill="none" cx="16" cy="16" r="15" stroke="currentColor" stroke-width="2"/></symbol>
 <symbol id="wallet-seed" viewBox="0 0 32 32" fill="none"><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="wallet-wallet" viewBox="0 0 24 24" fill="none"><rect x="4" y="6" width="16" height="13" rx="4" stroke="currentColor" stroke-width="1.5"/><rect x="7.5" y="9.5" width="4" height="3" rx="1.5" fill="currentColor"/></symbol>
 <symbol id="wallet-watchonly" viewBox="0 0 32 32" fill="none"><path d="M26.5362 7.08746H25.9614V3.25512C25.9614 2.10542 25.3865 1.14734 24.6201 0.572488C23.8536 -0.00236247 22.7039 -0.193979 21.7458 -0.00236246L4.11707 5.36291C2.00929 5.93776 0.667969 7.85392 0.667969 9.96171V12.0695V12.836V27.3988C0.667969 30.0815 2.77575 32.1893 5.45839 32.1893H26.5362C29.2189 32.1893 31.3267 30.0815 31.3267 27.3988V12.0695C31.3267 9.38686 29.2189 7.08746 26.5362 7.08746ZM4.69192 7.08746L22.129 1.91381C22.5123 1.72219 23.0871 1.91381 23.4704 2.10542C23.8536 2.29704 24.0452 2.87189 24.0452 3.25512V7.08746H5.45839C4.88354 7.08746 4.5003 7.27908 3.92545 7.47069C4.11707 7.27908 4.5003 7.08746 4.69192 7.08746ZM29.4105 27.2072C29.4105 28.7402 28.0692 30.0815 26.5362 30.0815H5.45839C3.92545 30.0815 2.58414 28.7402 2.58414 27.2072V12.836V11.8779C2.58414 10.3449 3.92545 9.00362 5.45839 9.00362H26.5362C28.0692 9.00362 29.4105 10.3449 29.4105 11.8779V27.2072Z" fill="currentColor"/><path d="M25.9591 21.6487C27.0174 21.6487 27.8753 20.7908 27.8753 19.7326C27.8753 18.6743 27.0174 17.8164 25.9591 17.8164C24.9009 17.8164 24.043 18.6743 24.043 19.7326C24.043 20.7908 24.9009 21.6487 25.9591 21.6487Z" fill="currentColor"/></symbol>
 <symbol id="wallet-xpub" viewBox="0 0 24 24" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.5 9.5C10.5003 8.65387 10.769 7.82965 11.2673 7.14583C11.7657 6.46202 12.468 5.95384 13.2733 5.69436C14.0787 5.43488 14.9456 5.43748 15.7494 5.70176C16.5532 5.96605 17.2525 6.47842 17.7467 7.1652C18.2409 7.85198 18.5047 8.6778 18.4999 9.52392C18.4952 10.37 18.2223 11.1929 17.7205 11.8741C17.2186 12.5553 16.5137 13.0599 15.707 13.3152C14.9003 13.5705 14.0334 13.5634 13.231 13.295C13.0989 13.2507 12.9571 13.2441 12.8214 13.2759C12.6858 13.3077 12.5617 13.3766 12.463 13.475L11.44 14.5H10.25C10.0511 14.5 9.86032 14.579 9.71967 14.7197C9.57902 14.8603 9.5 15.0511 9.5 15.25V16.44L9.44 16.5H8.25C8.05109 16.5 7.86032 16.579 7.71967 16.7197C7.57902 16.8603 7.5 17.0511 7.5 17.25V18.44L7.44 18.5H5.75C5.6837 18.5 5.62011 18.4737 5.57322 18.4268C5.52634 18.3799 5.5 18.3163 5.5 18.25V16.56L10.524 11.537C10.6226 11.4384 10.6917 11.3144 10.7237 11.1787C10.7556 11.0431 10.7492 10.9012 10.705 10.769C10.5686 10.3598 10.4994 9.93129 10.5 9.5ZM14.5 4C13.6681 3.99986 12.847 4.18843 12.0985 4.55153C11.35 4.91463 10.6937 5.44279 10.1788 6.09625C9.66398 6.74971 9.30409 7.51145 9.12623 8.32412C8.94837 9.13679 8.95718 9.97923 9.152 10.788L4.22 15.72C4.07931 15.8605 4.00018 16.0512 4 16.25V18.25C4 19.216 4.784 20 5.75 20H7.75C7.94885 19.9998 8.13948 19.9207 8.28 19.78L8.78 19.28C8.92069 19.1395 8.99983 18.9488 9 18.75V18H9.75C9.94885 17.9998 10.1395 17.9207 10.28 17.78L10.78 17.28C10.9207 17.1395 10.9998 16.9488 11 16.75V16H11.75C11.9488 15.9998 12.1395 15.9207 12.28 15.78L13.212 14.848C13.9672 15.0293 14.7523 15.0487 15.5155 14.9047C16.2787 14.7608 17.0028 14.4568 17.64 14.0128C18.2773 13.5689 18.8133 12.995 19.2128 12.3289C19.6123 11.6628 19.8662 10.9197 19.9577 10.1485C20.0493 9.37721 19.9765 8.59531 19.7441 7.85422C19.5117 7.11314 19.125 6.42968 18.6094 5.84883C18.0938 5.26798 17.461 4.80292 16.7527 4.48426C16.0444 4.16559 15.2767 4.00055 14.5 4ZM15 10C15.2652 10 15.5196 9.89464 15.7071 9.70711C15.8946 9.51957 16 9.26522 16 9C16 8.73478 15.8946 8.48043 15.7071 8.29289C15.5196 8.10536 15.2652 8 15 8C14.7348 8 14.4804 8.10536 14.2929 8.29289C14.1054 8.48043 14 8.73478 14 9C14 9.26522 14.1054 9.51957 14.2929 9.70711C14.4804 9.89464 14.7348 10 15 10Z" fill="currentColor"/></symbol>
 <symbol id="warning" viewBox="0 0 24 24" fill="none"><path fill-rule="evenodd" clip-rule="evenodd" d="M12.2528 5.32603C12.2282 5.28043 12.1917 5.24233 12.1472 5.21577C12.1027 5.18922 12.0518 5.1752 12 5.1752C11.9482 5.1752 11.8973 5.18922 11.8528 5.21577C11.8083 5.24233 11.7718 5.28043 11.7472 5.32603L4.75786 18.4014C4.73445 18.4451 4.72276 18.4942 4.72393 18.5438C4.7251 18.5934 4.7391 18.6419 4.76455 18.6844C4.79001 18.727 4.82606 18.7623 4.86919 18.7868C4.91233 18.8113 4.96107 18.8242 5.01068 18.8243H18.9893C19.0389 18.8242 19.0877 18.8113 19.1308 18.7868C19.1739 18.7623 19.21 18.727 19.2354 18.6844C19.2609 18.6419 19.2749 18.5934 19.2761 18.5438C19.2772 18.4942 19.2656 18.4451 19.2421 18.4014L12.2528 5.32603ZM10.2268 4.51356C10.9841 3.09547 13.0159 3.09547 13.7732 4.51356L20.7625 17.5889C20.9263 17.8953 21.0079 18.2389 20.9994 18.5862C20.9909 18.9335 20.8926 19.2727 20.714 19.5707C20.5354 19.8687 20.2827 20.1154 19.9804 20.2867C19.6782 20.458 19.3367 20.548 18.9893 20.5481H5.01068C4.66327 20.548 4.3218 20.458 4.01955 20.2867C3.7173 20.1154 3.46457 19.8687 3.286 19.5707C3.10743 19.2727 3.0091 18.9335 3.0006 18.5862C2.9921 18.2389 3.07372 17.8953 3.2375 17.5889L10.2268 4.51356ZM13.1492 15.9514C13.1492 16.2561 13.0281 16.5484 12.8126 16.764C12.5971 16.9795 12.3048 17.1005 12 17.1005C11.6952 17.1005 11.4029 16.9795 11.1874 16.764C10.9719 16.5484 10.8508 16.2561 10.8508 15.9514C10.8508 15.6466 10.9719 15.3543 11.1874 15.1388C11.4029 14.9233 11.6952 14.8022 12 14.8022C12.3048 14.8022 12.5971 14.9233 12.8126 15.1388C13.0281 15.3543 13.1492 15.6466 13.1492 15.9514ZM12.8619 9.91816C12.8619 9.68957 12.7711 9.47035 12.6094 9.30871C12.4478 9.14708 12.2286 9.05627 12 9.05627C11.7714 9.05627 11.5522 9.14708 11.3906 9.30871C11.2289 9.47035 11.1381 9.68957 11.1381 9.91816V12.7911C11.1381 13.0197 11.2289 13.2389 11.3906 13.4006C11.5522 13.5622 11.7714 13.653 12 13.653C12.2286 13.653 12.4478 13.5622 12.6094 13.4006C12.7711 13.2389 12.8619 13.0197 12.8619 12.7911V9.91816Z" fill="currentColor"/></symbol>
diff --git a/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css b/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css
index 7d4edf07e..4fd8b9286 100644
--- a/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css
+++ b/BTCPayServer/wwwroot/main/bootstrap/bootstrap.css
@@ -12266,11 +12266,9 @@ ul:not([class]) li {
 }
 
 .accordion-button .icon {
-  flex-shrink: 0;
-  width: 24px;
-  height: 24px;
+  --icon-size: 1.5rem;
   margin-left: auto;
-  transition: transform 0.2s ease-in-out;
+  transition: transform var(--btcpay-transition-duration-fast) ease-in-out;
 }
 
 .accordion-button:not(.collapsed) .icon {
@@ -12306,6 +12304,37 @@ ul:not([class]) li {
   padding: 1rem;
 }
 
+/* Badges */
+.badge-translucent {
+  --btcpay-bg-opacity: .25;
+}
+.badge-translucent.text-bg-primary {
+  --btcpay-primary-text: var(--btcpay-primary);
+}
+.badge-translucent.text-bg-secondary {
+  --btcpay-secondary-text: var(--btcpay-neutral-light-900);
+  --btcpay-secondary-rgb: 248, 249, 250;
+}
+.badge-translucent.text-bg-success {
+  --btcpay-success-text: var(--btcpay-success);
+}
+.badge-translucent.text-bg-info {
+  --btcpay-info-text: var(--btcpay-info);
+}
+.badge-translucent.text-bg-warning {
+  --btcpay-warning-text: var(--btcpay-yellow-600);
+}
+.badge-translucent.text-bg-danger {
+  --btcpay-danger-text: var(--btcpay-danger);
+}
+.badge-translucent.text-bg-light {
+  --btcpay-light-text: var(--btcpay-neutral-800);
+  --btcpay-bg-opacity: .75;
+}
+.badge-translucent.text-bg-dark {
+  --btcpay-dark-text: var(--btcpay-white);
+}
+
 /* Icons */
 .icon {
     display: inline-block;
diff --git a/BTCPayServer/wwwroot/main/themes/default.css b/BTCPayServer/wwwroot/main/themes/default.css
index 1e13a11ce..4a5e5a9c8 100644
--- a/BTCPayServer/wwwroot/main/themes/default.css
+++ b/BTCPayServer/wwwroot/main/themes/default.css
@@ -158,9 +158,9 @@
   --btcpay-font-size-xs: 10px;
   --btcpay-font-size-s: 12px;
   --btcpay-font-size-m: 14px;
-  --btcpay-font-size-l: 18px;
-  --btcpay-font-size-xl: 36px;
-  --btcpay-font-size-xxl: 45px;
+  --btcpay-font-size-l: 20px;
+  --btcpay-font-size-xl: 28px;
+  --btcpay-font-size-xxl: 36px;
   --btcpay-font-weight-normal: 400;
   --btcpay-font-weight-semibold: 600;
   --btcpay-font-weight-bold: 700;
@@ -254,7 +254,7 @@
   --btcpay-pre-bg: var(--btcpay-neutral-900);
 
   --btcpay-primary: var(--btcpay-brand-primary);
-  --btcpay-primary-accent: var(--btcpay-brand-tertiary);
+  --btcpay-primary-accent: var(--btcpay-primary-700);
   --btcpay-primary-text: var(--btcpay-white);
   --btcpay-primary-text-hover: var(--btcpay-white);
   --btcpay-primary-text-active: var(--btcpay-white);
@@ -277,7 +277,7 @@
   --btcpay-primary-rgb: 81, 177, 62;
 
   --btcpay-secondary: var(--btcpay-white);
-  --btcpay-secondary-accent: var(--btcpay-secondary);
+  --btcpay-secondary-accent: var(--btcpay-neutral-700);
   --btcpay-secondary-text: var(--btcpay-primary);
   --btcpay-secondary-text-hover: var(--btcpay-primary);
   --btcpay-secondary-text-active: var(--btcpay-brand-dark);