diff --git a/_templates/choose-your-wallet.html b/_templates/choose-your-wallet.html
index 61458941..7a090902 100755
--- a/_templates/choose-your-wallet.html
+++ b/_templates/choose-your-wallet.html
@@ -14,7 +14,7 @@ id: choose-your-wallet
 <p class="pleftfloat"><img src="/img/icon-be-the-network.svg" alt="Network" />{% translate bethenetworktxt %}</p>
 
 <div class="previewrow previewmobile" onclick="mobileWHover(event);">
-  
+
 <h2><img class="titleicon" src="/img/ico_mobile.svg" alt="mobile wallets" />{% translate walletmobi %}</h2>
 <p>{% translate walletmobitxt %}</p>
 
@@ -107,6 +107,17 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-electrum.png" alt="electrum" />Electrum</a>
 </div>
+<div>
+  <div>
+    <div>
+      <h2>Xapo</h2>
+      <span><img src="/img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/os/android.png" alt="Android" title="Android" /></span>
+      <p>{% translate walletxapo %}</p>
+      <p><a href="https://xapo.com">{% translate walletvisit %}</a></p>
+    </div>
+  </div>
+  <a href="#" onclick="return false;"><img src="../img/clients/lo-xapo.png" alt="xapo" />Xapo</a>
+</div>
 
 <h2><img class="titleicon" src="/img/ico_international.svg" alt="web wallets" />{% translate walletweb %}</h2>
 <p>{% translate walletwebtxt %}</p>
@@ -287,6 +298,19 @@ id: choose-your-wallet
   </div>
   <a href="#" onclick="return false;"><img src="/img/clients/lo-electrum.png" alt="electrum" />Electrum</a>
 </div>
+<div>
+  <div>
+    <div class="b1"></div>
+    <div class="b2">
+      <h2>Xapo</h2>
+      <span><img src="../img/os/win.png" alt="Windows" title="Windows" /><img src="/img/os/linux.png" alt="Linux" title="Linux" /><img src="/img/os/osx-uni.png" alt="Mac OS X" title="Mac OS X" /><img src="/img/os/android.png" alt="Android" title="Android" /></span>
+      <p class="hyphenate">{% translate walletxapo %}</p>
+      <p><a href="https://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>
 
 <div class="previewrow">
diff --git a/_translations/en.yml b/_translations/en.yml
index 0e615e5b..72d4208a 100644
--- a/_translations/en.yml
+++ b/_translations/en.yml
@@ -66,7 +66,7 @@ en:
     secure: "Security and control over your money"
     securetext: "Bitcoin transactions are secured by military grade cryptography. Nobody can charge you money or make a payment on your behalf. So long as you take the required steps to <a href=\"#secure-your-wallet#\">protect your wallet</a>, Bitcoin can give you control over your money and a strong level of protection against many types of fraud."
     lowfee: "Zero or low fees"
-    lowfeetext: "Bitcoin allows you to send and receive payments at very low cost. Except for special cases like very small payments, there is no enforced fee. It is however recommended to pay a higher voluntary fee for faster confirmation of your transaction and to remunerate the people who operate the Bitcoin network." 
+    lowfeetext: "Bitcoin allows you to send and receive payments at very low cost. Except for special cases like very small payments, there is no enforced fee. It is however recommended to pay a higher voluntary fee for faster confirmation of your transaction and to remunerate the people who operate the Bitcoin network."
     anonymous: "Protect your identity"
     anonymoustext: "With Bitcoin, there is no credit card number that some malicious actor can collect in order to impersonate you. In fact, it is even possible to send a payment without revealing your identity, almost just like with physical money. You should however take note that some effort can be required to <a href=\"#protect-your-privacy#\">protect your privacy</a>."
   community:
@@ -115,6 +115,7 @@ en:
     wallethive: "Hive is a fast, integrated, user-friendly Bitcoin wallet for Mac OS X. With a focus on usability, Hive is translated into many languages and has apps, making it easy to interact with your favorite Bitcoin services and merchants."
     walletarmory: "Armory is an advanced Bitcoin client that expands its features for Bitcoin power users. It offers many backup and encryption features, and it allows secure cold-storage on offline computers."
     walletelectrum: "Electrum's focus is speed and simplicity, with low resource usage. It uses remote servers that handle the most complicated parts of the Bitcoin system, and it allows you to recover your wallet from a secret phrase."
+    walletxapo: "Xapo combines the convenience of an everyday Wallet with the security of a cold-storage Vault."
     walletbitcoinwallet: "Bitcoin Wallet for Android is easy to use and reliable, while also being secure and fast. Its vision is de-centralization and zero trust: No central service is needed for Bitcoin-related operations. The app is a good choice for non-technical people. It is also available for BlackBerry OS."
     walletmyceliumwallet: "Mycelium Bitcoin Wallet is an open source wallet for Android designed for security, speed, and ease of use. It has unique features to manage your keys and for cold storage that help you secure your bitcoins."
     walletblockchaininfo: "Blockchain.info is a user-friendly hybrid wallet. It stores an encrypted version of your wallet online but decryption happens in your browser. For security reasons, you should always use the browser extension and email backups."
@@ -510,7 +511,7 @@ en:
     confirmationtxt: "Confirmation means that a transaction has been <b>processed by the network and is highly unlikely to be reversed</b>. Transactions receive a confirmation when they are included in a <a href=\"#vocabulary##[vocabulary.block]\">block</a> and for each subsequent block. Even a single confirmation can be considered secure for low value transactions, although for larger amounts like 1000 US$, it makes sense to wait for 6 confirmations or more. Each confirmation <i>exponentially</i> decreases the risk of a reversed transaction."
     cryptography: "Cryptography"
     cryptographytxt: "Cryptography is the branch of mathematics that lets us create <b>mathematical proofs that provide high levels of security</b>. Online commerce and banking already uses cryptography. In the case of Bitcoin, cryptography is used to make it impossible for anybody to spend funds from another user's wallet or to corrupt the <a href=\"#[vocabulary.blockchain]\">block chain</a>. It can also be used to encrypt a wallet, so that it cannot be used without a password."
-    doublespend: "Double Spend" 
+    doublespend: "Double Spend"
     doublespendtxt: "If a malicious user tries to <b>spend their bitcoins to two different recipients at the same time</b>, this is double spending. Bitcoin <a href=\"#[vocabulary.mining]\">mining</a> and the <a href=\"#[vocabulary.blockchain]\">block chain</a> are there to create a consensus on the network about which of the two transactions will confirm and be considered valid."
     hashrate: "Hash Rate"
     hashratetxt: "The hash rate is the <b>measuring unit of the processing power of the Bitcoin network</b>. The Bitcoin network must make intensive mathematical operations for security purposes. When the network reached a hash rate of 10 Th/s, it meant it could make 10 trillion calculations per second."
diff --git a/img/clients/lo-xapo.png b/img/clients/lo-xapo.png
new file mode 100644
index 00000000..2aff5c65
Binary files /dev/null and b/img/clients/lo-xapo.png differ