diff --git a/FireWalletBrowser.bsdesign b/FireWalletBrowser.bsdesign
index 5eed954..12ed537 100644
Binary files a/FireWalletBrowser.bsdesign and b/FireWalletBrowser.bsdesign differ
diff --git a/main.py b/main.py
index aefbeba..58d9629 100644
--- a/main.py
+++ b/main.py
@@ -673,8 +673,8 @@ def signMessage(domain):
 
     content += "<textarea style='display: none;' id='data' rows='4' cols='50'>"+json.dumps(data)+"</textarea>"
 
-    copyScript = "<script>function copyToClipboard() {var copyText = document.getElementById('data');copyText.style.display = 'block';copyText.select();copyText.setSelectionRange(0, 99999);document.execCommand('copy');copyText.style.display = 'none';}</script>"
-    content += "<button onclick='copyToClipboard()'>Copy to clipboard</button>" + copyScript
+    copyScript = "<script>function copyToClipboard() {var copyText = document.getElementById('data');copyText.style.display = 'block';copyText.select();copyText.setSelectionRange(0, 99999);document.execCommand('copy');copyText.style.display = 'none';var copyButton = document.getElementById('copyButton');copyButton.innerHTML='Copied';}</script>"
+    content += "<button id='copyButton' onclick='copyToClipboard()' class='btn btn-secondary'>Copy to clipboard</button>" + copyScript
 
     
 
@@ -959,9 +959,15 @@ def settings_action(action):
             return redirect("/settings?error=" + str(resp['error']))
         return redirect("/settings?success=Zapped transactions")
     elif action == "xpub":
+        xpub = account_module.getxPub(request.cookies.get("account"))
+        content = "<br><br>"
+        content += "<textarea style='display: none;' id='data' rows='4' cols='50'>"+xpub+"</textarea>"
+        content += "<script>function copyToClipboard() {var copyText = document.getElementById('data');copyText.style.display = 'block';copyText.select();copyText.setSelectionRange(0, 99999);document.execCommand('copy');copyText.style.display = 'none';var copyButton = document.getElementById('copyButton');copyButton.innerHTML='Copied';}</script>"
+        content += "<button id='copyButton' onclick='copyToClipboard()' class='btn btn-secondary'>Copy to clipboard</button>"
+
         return render_template("message.html", account=account,sync=account_module.getNodeSync(),
                                title="xPub Key",
-                               content="<code>"+account_module.getxPub(request.cookies.get("account"))+"</code>")
+                               content="<code>"+xpub+"</code>" + content)
 
     return redirect("/settings?error=Invalid action")
 
diff --git a/templates/assets/js/receive.min.js b/templates/assets/js/receive.min.js
index a8e8594..365ad01 100644
--- a/templates/assets/js/receive.min.js
+++ b/templates/assets/js/receive.min.js
@@ -1 +1 @@
-function copyAddress(){var e=document.getElementById("copyLink").getAttribute("address"),t=document.createElement("input");t.value=e,document.body.appendChild(t),t.select(),t.setSelectionRange(0,99999),navigator.clipboard.writeText(t.value),document.body.removeChild(t),document.getElementById("copyLink").innerHTML="Copied!"}
\ No newline at end of file
+function copyToClipboard(){var e=document.getElementById("data");e.style.display="block",e.select(),e.setSelectionRange(0,99999),document.execCommand("copy"),e.style.display="none",document.getElementById("copyButton").innerHTML="Copied"}
\ No newline at end of file
diff --git a/templates/receive.html b/templates/receive.html
index 61f73c5..cc7e32d 100644
--- a/templates/receive.html
+++ b/templates/receive.html
@@ -66,7 +66,7 @@
                 <div class="card" style="margin: auto;max-width: 500px;margin-top: 50px;">
                     <div class="card-body text-center">
                         <h4 class="card-title">{{address}}</h4><img src="/qr/{{address}}">
-                        <p class="card-text">Use this address to receive HNS or Handshake domains from other people or wallets.</p><a class="card-link" id="copyLink" href="javascript:;" address="{{address}}" onclick="copyAddress()">Copy</a>
+                        <p class="card-text">Use this address to receive HNS or Handshake domains from other people or wallets.</p><textarea id="data" style="display: none;">{{address}}</textarea><button class="btn btn-primary" id="copyButton" type="button" onclick="copyToClipboard()">Copy</button>
                     </div>
                 </div>
             </div>