diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html
index 7a090902..668ca9d5 100755
--- a/_templates/choose-your-wallet.html
+++ b/_templates/choose-your-wallet.html
@@ -204,7 +204,17 @@ id: choose-your-wallet
   <a href="#" onclick="return false;"><img src="/img/clients/lo-coinkite.png" alt="coinkite" /></a>
 </div>
 {% endcase %}
-
+<div data-id="xapo">
+  <div class="walletwarning">
+    <div>
+      <h2>{% translate walletwebwarning %}</h2>
+      <span></span>
+      <p>{% translate walletwebwarningtxt %}</p>
+      <p><a href="#" onclick="walletShow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+  </div>
+  <a href="#" onclick="return false;"><img src="../img/clients/lo-xapo.png" alt="xapo" /></a>
+</div>
 </div>
 
 <div class="preview">
@@ -441,6 +451,19 @@ id: choose-your-wallet
   <a href="#" onclick="return false;"><img src="/img/clients/lo-coinkite.png" alt="coinkite" /></a>
 </div>
 {% endcase %}
+<div data-id="xapo">
+  <div class="walletwarning">
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>{% translate walletwebwarning %}</h2>
+      <span></span>
+      <p class="hyphenate">{% translate walletwebwarningtxt %}</p>
+      <p><a href="#" onclick="walletShow(event);">{% translate walletwebwarningok %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="../img/clients/lo-xapo.png" alt="xapo" /></a>
+</div>
 </div>
 </div>
 
@@ -503,6 +526,19 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-coinkite.png" alt="coinkite" />Coinkite</a>
 </div>
+<div id="xapo">
+  <div>
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>Xapo</h2>
+      <span></span>
+      <p class="hyphenate">{% translate walletxapo %}</p>
+      <p><a href="http://xapo.com">{% translate walletvisit %}</a></p>
+    </div>
+    <div class="b3"></div>
+  </div>
+  <a href="#" onclick="return false;"><img src="../img/clients/lo-xapo.png" alt="xapo" />Xapo</a>
+</div>
 <div id="bitgo">
   <div>
     <div class="b1"></div>