diff --git a/BTCPayServer/Views/UIStores/PayButton.cshtml b/BTCPayServer/Views/UIStores/PayButton.cshtml
index cfebf70b2..965fd3c35 100644
--- a/BTCPayServer/Views/UIStores/PayButton.cshtml
+++ b/BTCPayServer/Views/UIStores/PayButton.cshtml
@@ -364,7 +364,8 @@
         <div class="col-xxl-8">
             <pre><code id="mainCode" class="html"></code></pre>
             <button class="btn btn-primary" data-clipboard-target="#mainCode">
-                <i class="fa fa-copy"></i> Copy Code
+                <vc:icon symbol="copy"/>
+                Copy Code
             </button>
         </div>
     </div>
diff --git a/BTCPayServer/wwwroot/js/copy-to-clipboard.js b/BTCPayServer/wwwroot/js/copy-to-clipboard.js
index a42cb1417..cc9d9ef4f 100644
--- a/BTCPayServer/wwwroot/js/copy-to-clipboard.js
+++ b/BTCPayServer/wwwroot/js/copy-to-clipboard.js
@@ -7,7 +7,7 @@ const confirmCopy = (el, message) => {
 
 window.copyToClipboard = function (e, data) {
     e.preventDefault();
-    const item = e.target.closest('[data-clipboard]');
+    const item = e.target.closest('[data-clipboard]') || e.target.closest('[data-clipboard-target]');
     const confirm = item.querySelector('[data-clipboard-confirm]') || item;
     const message = confirm.getAttribute('data-clipboard-confirm') || 'Copied ✔';
     if (!confirm.dataset.clipboardInitial) {