diff --git a/assets/src/main/java/bisq/asset/Base58BitcoinAddressValidator.java b/assets/src/main/java/bisq/asset/Base58AddressValidator.java
similarity index 85%
rename from assets/src/main/java/bisq/asset/Base58BitcoinAddressValidator.java
rename to assets/src/main/java/bisq/asset/Base58AddressValidator.java
index 181f4011ba..f038a69423 100644
--- a/assets/src/main/java/bisq/asset/Base58BitcoinAddressValidator.java
+++ b/assets/src/main/java/bisq/asset/Base58AddressValidator.java
@@ -23,21 +23,21 @@ import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.params.MainNetParams;
 
 /**
- * {@link AddressValidator} for Base58-encoded Bitcoin addresses.
+ * {@link AddressValidator} for Base58-encoded addresses.
  *
  * @author Chris Beams
  * @since 0.7.0
  * @see org.bitcoinj.core.LegacyAddress#fromBase58(NetworkParameters, String)
  */
-public class Base58BitcoinAddressValidator implements AddressValidator {
+public class Base58AddressValidator implements AddressValidator {
 
     private final NetworkParameters networkParameters;
 
-    public Base58BitcoinAddressValidator() {
+    public Base58AddressValidator() {
         this(MainNetParams.get());
     }
 
-    public Base58BitcoinAddressValidator(NetworkParameters networkParameters) {
+    public Base58AddressValidator(NetworkParameters networkParameters) {
         this.networkParameters = networkParameters;
     }
 
diff --git a/assets/src/main/java/bisq/asset/BitcoinAddressValidator.java b/assets/src/main/java/bisq/asset/BitcoinAddressValidator.java
new file mode 100644
index 0000000000..133d066d02
--- /dev/null
+++ b/assets/src/main/java/bisq/asset/BitcoinAddressValidator.java
@@ -0,0 +1,52 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.asset;
+
+import org.bitcoinj.core.Address;
+import org.bitcoinj.core.AddressFormatException;
+import org.bitcoinj.core.NetworkParameters;
+import org.bitcoinj.params.MainNetParams;
+
+/**
+ * {@link AddressValidator} for Bitcoin addresses.
+ *
+ * @author Oscar Guindzberg
+ */
+public class BitcoinAddressValidator implements AddressValidator {
+
+    private final NetworkParameters networkParameters;
+
+    public BitcoinAddressValidator() {
+        this(MainNetParams.get());
+    }
+
+    public BitcoinAddressValidator(NetworkParameters networkParameters) {
+        this.networkParameters = networkParameters;
+    }
+
+    @Override
+    public AddressValidationResult validate(String address) {
+        try {
+            Address.fromString(networkParameters, address);
+        } catch (AddressFormatException ex) {
+            return AddressValidationResult.invalidAddress(ex);
+        }
+
+        return AddressValidationResult.validAddress();
+    }
+}
diff --git a/assets/src/main/java/bisq/asset/coins/Actinium.java b/assets/src/main/java/bisq/asset/coins/Actinium.java
index 45f0941527..304625b424 100644
--- a/assets/src/main/java/bisq/asset/coins/Actinium.java
+++ b/assets/src/main/java/bisq/asset/coins/Actinium.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Actinium extends Coin {
 
     public Actinium() {
-        super("Actinium", "ACM", new Base58BitcoinAddressValidator(new ActiniumParams()));
+        super("Actinium", "ACM", new Base58AddressValidator(new ActiniumParams()));
     }
 
 
diff --git a/assets/src/main/java/bisq/asset/coins/Adeptio.java b/assets/src/main/java/bisq/asset/coins/Adeptio.java
index ae10025ecc..b23ed19ec5 100644
--- a/assets/src/main/java/bisq/asset/coins/Adeptio.java
+++ b/assets/src/main/java/bisq/asset/coins/Adeptio.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class Adeptio extends Coin {
     }
 
 
-    public static class AdeptioAddressValidator extends Base58BitcoinAddressValidator {
+    public static class AdeptioAddressValidator extends Base58AddressValidator {
 
         public AdeptioAddressValidator() {
             super(new AdeptioParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Animecoin.java b/assets/src/main/java/bisq/asset/coins/Animecoin.java
index db72f9b4b5..e274e2bf69 100644
--- a/assets/src/main/java/bisq/asset/coins/Animecoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Animecoin.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Animecoin extends Coin {
     public Animecoin() {
-        super("Animecoin", "ANI", new Base58BitcoinAddressValidator(new AnimecoinMainNetParams()));
+        super("Animecoin", "ANI", new Base58AddressValidator(new AnimecoinMainNetParams()));
     }
 
     public static class AnimecoinMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Australiacash.java b/assets/src/main/java/bisq/asset/coins/Australiacash.java
index f120ed5e79..86e8a02de8 100644
--- a/assets/src/main/java/bisq/asset/coins/Australiacash.java
+++ b/assets/src/main/java/bisq/asset/coins/Australiacash.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Australiacash extends Coin {
     public Australiacash() {
-        super("Australiacash", "AUS", new Base58BitcoinAddressValidator(new AustraliacashParams()));
+        super("Australiacash", "AUS", new Base58AddressValidator(new AustraliacashParams()));
     }
 	   public static class AustraliacashParams extends NetworkParametersAdapter {
 
diff --git a/assets/src/main/java/bisq/asset/coins/BSQ.java b/assets/src/main/java/bisq/asset/coins/BSQ.java
index 86f39f6ec9..f769a582e3 100644
--- a/assets/src/main/java/bisq/asset/coins/BSQ.java
+++ b/assets/src/main/java/bisq/asset/coins/BSQ.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 
 import org.bitcoinj.core.NetworkParameters;
@@ -57,7 +57,7 @@ public class BSQ extends Coin {
     }
 
 
-    public static class BSQAddressValidator extends Base58BitcoinAddressValidator {
+    public static class BSQAddressValidator extends Base58AddressValidator {
 
         public BSQAddressValidator(NetworkParameters networkParameters) {
             super(networkParameters);
diff --git a/assets/src/main/java/bisq/asset/coins/Bitcoin.java b/assets/src/main/java/bisq/asset/coins/Bitcoin.java
index 74154062f3..74b9986966 100644
--- a/assets/src/main/java/bisq/asset/coins/Bitcoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Bitcoin.java
@@ -17,7 +17,7 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.BitcoinAddressValidator;
 import bisq.asset.Coin;
 
 import org.bitcoinj.core.NetworkParameters;
@@ -28,7 +28,7 @@ import org.bitcoinj.params.TestNet3Params;
 public abstract class Bitcoin extends Coin {
 
     public Bitcoin(Network network, NetworkParameters networkParameters) {
-        super("Bitcoin", "BTC", new Base58BitcoinAddressValidator(networkParameters), network);
+        super("Bitcoin", "BTC", new BitcoinAddressValidator(networkParameters), network);
     }
 
 
diff --git a/assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java b/assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java
index f827636162..46f22bbe94 100644
--- a/assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java
+++ b/assets/src/main/java/bisq/asset/coins/BitcoinRhodium.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class BitcoinRhodium extends Coin {
 
     public BitcoinRhodium() {
-        super("Bitcoin Rhodium", "XRC", new Base58BitcoinAddressValidator(new BitcoinRhodiumParams()));
+        super("Bitcoin Rhodium", "XRC", new Base58AddressValidator(new BitcoinRhodiumParams()));
     }
 
     public static class BitcoinRhodiumParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Bitmark.java b/assets/src/main/java/bisq/asset/coins/Bitmark.java
index 8bcbe20bb5..22650b001d 100644
--- a/assets/src/main/java/bisq/asset/coins/Bitmark.java
+++ b/assets/src/main/java/bisq/asset/coins/Bitmark.java
@@ -17,7 +17,7 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -31,6 +31,6 @@ public class Bitmark extends Coin {
     }
 
     public Bitmark() {
-        super("Bitmark", "BTM", new Base58BitcoinAddressValidator(new BitmarkParams()));
+        super("Bitmark", "BTM", new Base58AddressValidator(new BitmarkParams()));
     }
 }
diff --git a/assets/src/main/java/bisq/asset/coins/CTSCoin.java b/assets/src/main/java/bisq/asset/coins/CTSCoin.java
index f21dee31cb..41f8f4328e 100644
--- a/assets/src/main/java/bisq/asset/coins/CTSCoin.java
+++ b/assets/src/main/java/bisq/asset/coins/CTSCoin.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class CTSCoin extends Coin {
     public CTSCoin() {
-        super("CTSCoin", "CTSC", new Base58BitcoinAddressValidator(new CtscMainNetParams()));
+        super("CTSCoin", "CTSC", new Base58AddressValidator(new CtscMainNetParams()));
     }
 
     public static class CtscMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Chaucha.java b/assets/src/main/java/bisq/asset/coins/Chaucha.java
index 0f307a719d..327eb5b41e 100644
--- a/assets/src/main/java/bisq/asset/coins/Chaucha.java
+++ b/assets/src/main/java/bisq/asset/coins/Chaucha.java
@@ -17,18 +17,18 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Chaucha extends Coin {
 
     public Chaucha() {
-        super("Chaucha", "CHA", new Base58BitcoinAddressValidator(new ChauchaParams()));
+        super("Chaucha", "CHA", new Base58AddressValidator(new ChauchaParams()));
     }
 
 	public static class ChauchaParams extends NetworkParametersAdapter {
-	
+
 	    public ChauchaParams() {
 	        addressHeader = 88;
 	        p2shHeader = 50;
diff --git a/assets/src/main/java/bisq/asset/coins/Credits.java b/assets/src/main/java/bisq/asset/coins/Credits.java
index 8e3224f654..7b11cf199e 100644
--- a/assets/src/main/java/bisq/asset/coins/Credits.java
+++ b/assets/src/main/java/bisq/asset/coins/Credits.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class Credits extends Coin {
     }
 
 
-    public static class CreditsAddressValidator extends Base58BitcoinAddressValidator {
+    public static class CreditsAddressValidator extends Base58AddressValidator {
 
         public CreditsAddressValidator() {
             super(new CreditsParams());
diff --git a/assets/src/main/java/bisq/asset/coins/DSTRA.java b/assets/src/main/java/bisq/asset/coins/DSTRA.java
index 230dd01dc6..0516f62782 100644
--- a/assets/src/main/java/bisq/asset/coins/DSTRA.java
+++ b/assets/src/main/java/bisq/asset/coins/DSTRA.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class DSTRA extends Coin {
     }
 
 
-    public static class DSTRAAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DSTRAAddressValidator extends Base58AddressValidator {
 
         public DSTRAAddressValidator() {
             super(new DSTRAParams());
diff --git a/assets/src/main/java/bisq/asset/coins/DarkPay.java b/assets/src/main/java/bisq/asset/coins/DarkPay.java
index 8ba492e069..449bd46935 100644
--- a/assets/src/main/java/bisq/asset/coins/DarkPay.java
+++ b/assets/src/main/java/bisq/asset/coins/DarkPay.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class DarkPay extends Coin {
     public DarkPay() {
-        super("DarkPay", "D4RK", new Base58BitcoinAddressValidator(new DarkPayMainNetParams()));
+        super("DarkPay", "D4RK", new Base58AddressValidator(new DarkPayMainNetParams()));
     }
 
     public static class DarkPayMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Dash.java b/assets/src/main/java/bisq/asset/coins/Dash.java
index 397b3d6111..2cde18acd7 100644
--- a/assets/src/main/java/bisq/asset/coins/Dash.java
+++ b/assets/src/main/java/bisq/asset/coins/Dash.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Dash extends Coin {
     public Dash() {
-        super("Dash", "DASH", new Base58BitcoinAddressValidator(new DashMainNetParams()), Network.MAINNET);
+        super("Dash", "DASH", new Base58AddressValidator(new DashMainNetParams()), Network.MAINNET);
     }
 
     public static class DashMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/DeepOnion.java b/assets/src/main/java/bisq/asset/coins/DeepOnion.java
index 947388c06b..dc452b343b 100644
--- a/assets/src/main/java/bisq/asset/coins/DeepOnion.java
+++ b/assets/src/main/java/bisq/asset/coins/DeepOnion.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -27,7 +27,7 @@ public class DeepOnion extends Coin {
         super("DeepOnion", "ONION", new DeepOnionAddressValidator());
     }
 
-    public static class DeepOnionAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DeepOnionAddressValidator extends Base58AddressValidator {
 
         public DeepOnionAddressValidator() {
             super(new DeepOnionParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Dextro.java b/assets/src/main/java/bisq/asset/coins/Dextro.java
index 350a932105..202db914a0 100644
--- a/assets/src/main/java/bisq/asset/coins/Dextro.java
+++ b/assets/src/main/java/bisq/asset/coins/Dextro.java
@@ -18,18 +18,18 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Dextro extends Coin {
 
     public Dextro() {
-        super("Dextro", "DXO", new Base58BitcoinAddressValidator(new DextroParams()));
+        super("Dextro", "DXO", new Base58AddressValidator(new DextroParams()));
     }
 
 
-    public static class DextroAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DextroAddressValidator extends Base58AddressValidator {
 
         public DextroAddressValidator() {
             super(new DextroParams());
@@ -44,7 +44,7 @@ public class Dextro extends Coin {
         }
     }
 
-    
+
     public static class DextroParams extends NetworkParametersAdapter {
 
         public DextroParams() {
diff --git a/assets/src/main/java/bisq/asset/coins/Dogecoin.java b/assets/src/main/java/bisq/asset/coins/Dogecoin.java
index e9fedd2813..7318b7e04a 100644
--- a/assets/src/main/java/bisq/asset/coins/Dogecoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Dogecoin.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Dogecoin extends Coin {
 
     public Dogecoin() {
-        super("Dogecoin", "DOGE", new Base58BitcoinAddressValidator(new DogecoinMainNetParams()), Network.MAINNET);
+        super("Dogecoin", "DOGE", new Base58AddressValidator(new DogecoinMainNetParams()), Network.MAINNET);
     }
 
     public static class DogecoinMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Doichain.java b/assets/src/main/java/bisq/asset/coins/Doichain.java
index f050cf632c..46c254548f 100644
--- a/assets/src/main/java/bisq/asset/coins/Doichain.java
+++ b/assets/src/main/java/bisq/asset/coins/Doichain.java
@@ -17,16 +17,16 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Doichain extends Coin {
 
     public Doichain() {
-        super("Doichain", "DOI", new Base58BitcoinAddressValidator(new DoichainParams()));
+        super("Doichain", "DOI", new Base58AddressValidator(new DoichainParams()));
     }
-        
+
     public static class DoichainParams extends NetworkParametersAdapter {
         public DoichainParams() {
             addressHeader = 52;
diff --git a/assets/src/main/java/bisq/asset/coins/Donu.java b/assets/src/main/java/bisq/asset/coins/Donu.java
index 782c53f2bd..f1e4bc2804 100644
--- a/assets/src/main/java/bisq/asset/coins/Donu.java
+++ b/assets/src/main/java/bisq/asset/coins/Donu.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class Donu extends Coin {
     }
 
 
-    public static class DonuAddressValidator extends Base58BitcoinAddressValidator {
+    public static class DonuAddressValidator extends Base58AddressValidator {
 
         public DonuAddressValidator() {
             super(new DonuParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Emercoin.java b/assets/src/main/java/bisq/asset/coins/Emercoin.java
index 5728575412..6a52f3b4a5 100644
--- a/assets/src/main/java/bisq/asset/coins/Emercoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Emercoin.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Emercoin extends Coin {
 
     public Emercoin() {
-        super("Emercoin", "EMC", new Base58BitcoinAddressValidator(new EmercoinMainNetParams()), Network.MAINNET);
+        super("Emercoin", "EMC", new Base58AddressValidator(new EmercoinMainNetParams()), Network.MAINNET);
     }
 
     public static class EmercoinMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Faircoin.java b/assets/src/main/java/bisq/asset/coins/Faircoin.java
index 4d2b86cad8..ffec962a18 100644
--- a/assets/src/main/java/bisq/asset/coins/Faircoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Faircoin.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Faircoin extends Coin {
 
     public Faircoin() {
-        super("Faircoin", "FAIR", new Base58BitcoinAddressValidator(new Faircoin.FaircoinParams()));
+        super("Faircoin", "FAIR", new Base58AddressValidator(new Faircoin.FaircoinParams()));
     }
 
     public static class FaircoinParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Fujicoin.java b/assets/src/main/java/bisq/asset/coins/Fujicoin.java
index c54f26a55c..63a415f6a8 100644
--- a/assets/src/main/java/bisq/asset/coins/Fujicoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Fujicoin.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Fujicoin extends Coin {
     public Fujicoin() {
-        super("Fujicoin", "FJC", new Base58BitcoinAddressValidator(new FujicoinParams()));
+        super("Fujicoin", "FJC", new Base58AddressValidator(new FujicoinParams()));
     }
 	   public static class FujicoinParams extends NetworkParametersAdapter {
 
diff --git a/assets/src/main/java/bisq/asset/coins/Galilel.java b/assets/src/main/java/bisq/asset/coins/Galilel.java
index 9dbabc4b8c..7834b08c81 100644
--- a/assets/src/main/java/bisq/asset/coins/Galilel.java
+++ b/assets/src/main/java/bisq/asset/coins/Galilel.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Galilel extends Coin {
     public Galilel() {
-        super("Galilel", "GALI", new Base58BitcoinAddressValidator(new GalilelMainNetParams()));
+        super("Galilel", "GALI", new Base58AddressValidator(new GalilelMainNetParams()));
     }
 
     public static class GalilelMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/GambleCoin.java b/assets/src/main/java/bisq/asset/coins/GambleCoin.java
index 27447cf9a0..2b1f16da06 100644
--- a/assets/src/main/java/bisq/asset/coins/GambleCoin.java
+++ b/assets/src/main/java/bisq/asset/coins/GambleCoin.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class GambleCoin extends Coin {
     }
 
 
-    public static class GambleCoinAddressValidator extends Base58BitcoinAddressValidator {
+    public static class GambleCoinAddressValidator extends Base58AddressValidator {
 
         public GambleCoinAddressValidator() {
             super(new GambleCoinParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Genesis.java b/assets/src/main/java/bisq/asset/coins/Genesis.java
index fcb49992a8..821c5b677a 100644
--- a/assets/src/main/java/bisq/asset/coins/Genesis.java
+++ b/assets/src/main/java/bisq/asset/coins/Genesis.java
@@ -18,8 +18,6 @@
 package bisq.asset.coins;
 
 import bisq.asset.*;
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.AddressFormatException;
 
 public class Genesis extends Coin {
 
@@ -27,7 +25,7 @@ public class Genesis extends Coin {
         super("Genesis", "GENX", new GenesisAddressValidator());
     }
 
-    public static class GenesisAddressValidator extends Base58BitcoinAddressValidator {
+    public static class GenesisAddressValidator extends Base58AddressValidator {
 
         public GenesisAddressValidator() {
             super(new GenesisParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Hatch.java b/assets/src/main/java/bisq/asset/coins/Hatch.java
index 0d2d5b3b97..8136878908 100644
--- a/assets/src/main/java/bisq/asset/coins/Hatch.java
+++ b/assets/src/main/java/bisq/asset/coins/Hatch.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Hatch extends Coin {
     public Hatch() {
-        super("Hatch", "HATCH", new Base58BitcoinAddressValidator(new HatchMainNetParams()), Network.MAINNET);
+        super("Hatch", "HATCH", new Base58AddressValidator(new HatchMainNetParams()), Network.MAINNET);
     }
 
     public static class HatchMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Helium.java b/assets/src/main/java/bisq/asset/coins/Helium.java
index 592c6cfaa1..84a64d3a95 100644
--- a/assets/src/main/java/bisq/asset/coins/Helium.java
+++ b/assets/src/main/java/bisq/asset/coins/Helium.java
@@ -17,15 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Helium extends Coin {
 
     public Helium() {
-        super("Helium", "HLM", new Base58BitcoinAddressValidator(new HeliumParams()));
+        super("Helium", "HLM", new Base58AddressValidator(new HeliumParams()));
     }
 
     public static class HeliumParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/IdaPay.java b/assets/src/main/java/bisq/asset/coins/IdaPay.java
index c205b2d7e5..e62094cd2b 100644
--- a/assets/src/main/java/bisq/asset/coins/IdaPay.java
+++ b/assets/src/main/java/bisq/asset/coins/IdaPay.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class IdaPay extends Coin {
     }
 
 
-    public static class IdaPayAddressValidator extends Base58BitcoinAddressValidator {
+    public static class IdaPayAddressValidator extends Base58AddressValidator {
 
         public IdaPayAddressValidator() {
             super(new IdaPayParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Kekcoin.java b/assets/src/main/java/bisq/asset/coins/Kekcoin.java
index b7927609d7..29df724275 100644
--- a/assets/src/main/java/bisq/asset/coins/Kekcoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Kekcoin.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Kekcoin extends Coin {
 
     public Kekcoin() {
-        super("Kekcoin", "KEK", new Base58BitcoinAddressValidator(new KekcoinParams()));
+        super("Kekcoin", "KEK", new Base58AddressValidator(new KekcoinParams()));
     }
 
 
diff --git a/assets/src/main/java/bisq/asset/coins/KnowYourDeveloper.java b/assets/src/main/java/bisq/asset/coins/KnowYourDeveloper.java
index cc9468455a..687af6c11b 100644
--- a/assets/src/main/java/bisq/asset/coins/KnowYourDeveloper.java
+++ b/assets/src/main/java/bisq/asset/coins/KnowYourDeveloper.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class KnowYourDeveloper extends Coin {
     public KnowYourDeveloper() {
-        super("Know Your Developer", "KYDC", new Base58BitcoinAddressValidator(new KydMainNetParams()));
+        super("Know Your Developer", "KYDC", new Base58AddressValidator(new KydMainNetParams()));
     }
 
     public static class KydMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Kore.java b/assets/src/main/java/bisq/asset/coins/Kore.java
index 184d426f09..560671a57f 100644
--- a/assets/src/main/java/bisq/asset/coins/Kore.java
+++ b/assets/src/main/java/bisq/asset/coins/Kore.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Kore extends Coin {
     public Kore() {
-        super("Kore", "KORE", new Base58BitcoinAddressValidator(new KoreMainNetParams()));
+        super("Kore", "KORE", new Base58AddressValidator(new KoreMainNetParams()));
      }
 
     public static class KoreMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/LBRYCredits.java b/assets/src/main/java/bisq/asset/coins/LBRYCredits.java
index b6e9836266..d445b69a42 100644
--- a/assets/src/main/java/bisq/asset/coins/LBRYCredits.java
+++ b/assets/src/main/java/bisq/asset/coins/LBRYCredits.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class LBRYCredits extends Coin {
 
     public LBRYCredits() {
-        super("LBRY Credits", "LBC", new Base58BitcoinAddressValidator(new LBRYCreditsMainNetParams()), Network.MAINNET);
+        super("LBRY Credits", "LBC", new Base58AddressValidator(new LBRYCreditsMainNetParams()), Network.MAINNET);
     }
 
     public static class LBRYCreditsMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Litecoin.java b/assets/src/main/java/bisq/asset/coins/Litecoin.java
index 6580f851dd..34e7ef8671 100644
--- a/assets/src/main/java/bisq/asset/coins/Litecoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Litecoin.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Litecoin extends Coin {
     public Litecoin() {
-        super("Litecoin", "LTC", new Base58BitcoinAddressValidator(new LitecoinMainNetParams()), Network.MAINNET);
+        super("Litecoin", "LTC", new Base58AddressValidator(new LitecoinMainNetParams()), Network.MAINNET);
     }
 
     public static class LitecoinMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/LitecoinPlus.java b/assets/src/main/java/bisq/asset/coins/LitecoinPlus.java
index c5ce3070c1..91aef5ccc2 100644
--- a/assets/src/main/java/bisq/asset/coins/LitecoinPlus.java
+++ b/assets/src/main/java/bisq/asset/coins/LitecoinPlus.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class LitecoinPlus extends Coin {
 
     public LitecoinPlus() {
-        super("LitecoinPlus", "LCP", new Base58BitcoinAddressValidator(new LitecoinPlusMainNetParams()));
+        super("LitecoinPlus", "LCP", new Base58AddressValidator(new LitecoinPlusMainNetParams()));
     }
 
     public static class LitecoinPlusMainNetParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Lytix.java b/assets/src/main/java/bisq/asset/coins/Lytix.java
index 629a47f3d4..28eccfaac1 100644
--- a/assets/src/main/java/bisq/asset/coins/Lytix.java
+++ b/assets/src/main/java/bisq/asset/coins/Lytix.java
@@ -17,15 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Lytix extends Coin {
 
     public Lytix() {
-        super("Lytix", "LYTX", new Base58BitcoinAddressValidator(new LytixParams()));
+        super("Lytix", "LYTX", new Base58AddressValidator(new LytixParams()));
     }
 
     public static class LytixParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/MobitGlobal.java b/assets/src/main/java/bisq/asset/coins/MobitGlobal.java
index 6b2bfbff12..310126bb45 100644
--- a/assets/src/main/java/bisq/asset/coins/MobitGlobal.java
+++ b/assets/src/main/java/bisq/asset/coins/MobitGlobal.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class MobitGlobal extends Coin {
     }
 
 
-    public static class MobitGlobalAddressValidator extends Base58BitcoinAddressValidator {
+    public static class MobitGlobalAddressValidator extends Base58AddressValidator {
 
         public MobitGlobalAddressValidator() {
             super(new MobitGlobalParams());
diff --git a/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java b/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java
index 4055768af3..782faf646d 100644
--- a/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java
+++ b/assets/src/main/java/bisq/asset/coins/MonetaryUnit.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class MonetaryUnit extends Coin {
     }
 
 
-    public static class MonetaryUnitAddressValidator extends Base58BitcoinAddressValidator {
+    public static class MonetaryUnitAddressValidator extends Base58AddressValidator {
 
         public MonetaryUnitAddressValidator() {
             super(new MonetaryUnitParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Myce.java b/assets/src/main/java/bisq/asset/coins/Myce.java
index 0e39bdf549..c0fbdd6e56 100644
--- a/assets/src/main/java/bisq/asset/coins/Myce.java
+++ b/assets/src/main/java/bisq/asset/coins/Myce.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Myce extends Coin {
 
     public Myce() {
-        super("Myce", "YCE", new Base58BitcoinAddressValidator(new MyceParams()));
+        super("Myce", "YCE", new Base58AddressValidator(new MyceParams()));
     }
 
     public static class MyceParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/Navcoin.java b/assets/src/main/java/bisq/asset/coins/Navcoin.java
index 6427555636..a1d35f70aa 100644
--- a/assets/src/main/java/bisq/asset/coins/Navcoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Navcoin.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Navcoin extends Coin {
     public Navcoin() {
-        super("Navcoin", "NAV", new Base58BitcoinAddressValidator(new NavcoinParams()));
+        super("Navcoin", "NAV", new Base58AddressValidator(new NavcoinParams()));
     }
 
     public static class NavcoinParams extends NetworkParametersAdapter {
diff --git a/assets/src/main/java/bisq/asset/coins/PIVX.java b/assets/src/main/java/bisq/asset/coins/PIVX.java
index cfde4d8594..d8251e6c9e 100644
--- a/assets/src/main/java/bisq/asset/coins/PIVX.java
+++ b/assets/src/main/java/bisq/asset/coins/PIVX.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class PIVX extends Coin {
     }
 
 
-    public static class PIVXAddressValidator extends Base58BitcoinAddressValidator {
+    public static class PIVXAddressValidator extends Base58AddressValidator {
 
         public PIVXAddressValidator() {
             super(new PIVXParams());
diff --git a/assets/src/main/java/bisq/asset/coins/PZDC.java b/assets/src/main/java/bisq/asset/coins/PZDC.java
index 18f40b9b91..94453e3f7d 100644
--- a/assets/src/main/java/bisq/asset/coins/PZDC.java
+++ b/assets/src/main/java/bisq/asset/coins/PZDC.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class PZDC extends Coin {
     }
 
 
-    public static class PZDCAddressValidator extends Base58BitcoinAddressValidator {
+    public static class PZDCAddressValidator extends Base58AddressValidator {
 
         public PZDCAddressValidator() {
             super(new PZDCParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Particl.java b/assets/src/main/java/bisq/asset/coins/Particl.java
index 601af39662..96f12b5e52 100644
--- a/assets/src/main/java/bisq/asset/coins/Particl.java
+++ b/assets/src/main/java/bisq/asset/coins/Particl.java
@@ -17,7 +17,7 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 import bisq.asset.AddressValidationResult;
@@ -34,7 +34,7 @@ public class Particl extends Coin {
             this.p2shHeader = 60;
         }
     }
-   public static class ParticlMainNetAddressValidator extends Base58BitcoinAddressValidator {
+   public static class ParticlMainNetAddressValidator extends Base58AddressValidator {
 
         public ParticlMainNetAddressValidator() {
             super(new ParticlMainNetParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Pinkcoin.java b/assets/src/main/java/bisq/asset/coins/Pinkcoin.java
index 0792bd0857..63544fd2de 100644
--- a/assets/src/main/java/bisq/asset/coins/Pinkcoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Pinkcoin.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Pinkcoin extends Coin {
 
     public Pinkcoin() {
-        super("Pinkcoin", "PINK", new Base58BitcoinAddressValidator(new PinkcoinParams()));
+        super("Pinkcoin", "PINK", new Base58AddressValidator(new PinkcoinParams()));
     }
 
 
diff --git a/assets/src/main/java/bisq/asset/coins/QMCoin.java b/assets/src/main/java/bisq/asset/coins/QMCoin.java
index 75f8deade5..b162a615cf 100644
--- a/assets/src/main/java/bisq/asset/coins/QMCoin.java
+++ b/assets/src/main/java/bisq/asset/coins/QMCoin.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class QMCoin extends Coin {
     }
 
 
-    public static class QMCoinAddressValidator extends Base58BitcoinAddressValidator {
+    public static class QMCoinAddressValidator extends Base58AddressValidator {
 
         public QMCoinAddressValidator() {
             super(new QMCoinParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Qbase.java b/assets/src/main/java/bisq/asset/coins/Qbase.java
index 2d076a74dc..1cc57e540c 100644
--- a/assets/src/main/java/bisq/asset/coins/Qbase.java
+++ b/assets/src/main/java/bisq/asset/coins/Qbase.java
@@ -1,7 +1,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -11,7 +11,7 @@ public class Qbase extends Coin {
     }
 
 
-    public static class QbaseAddressValidator extends Base58BitcoinAddressValidator {
+    public static class QbaseAddressValidator extends Base58AddressValidator {
 
         public QbaseAddressValidator() {
             super(new Qbase.QbaseParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Radium.java b/assets/src/main/java/bisq/asset/coins/Radium.java
index 8c59a1258c..9fa42ac775 100644
--- a/assets/src/main/java/bisq/asset/coins/Radium.java
+++ b/assets/src/main/java/bisq/asset/coins/Radium.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Radium extends Coin {
 
     public Radium() {
-        super("Radium", "RADS", new Base58BitcoinAddressValidator(new RadiumParams()));
+        super("Radium", "RADS", new Base58AddressValidator(new RadiumParams()));
     }
 
 
diff --git a/assets/src/main/java/bisq/asset/coins/SUB1X.java b/assets/src/main/java/bisq/asset/coins/SUB1X.java
index 9bcb32386a..70052cbde2 100644
--- a/assets/src/main/java/bisq/asset/coins/SUB1X.java
+++ b/assets/src/main/java/bisq/asset/coins/SUB1X.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class SUB1X extends Coin {
     }
 
 
-    public static class SUB1XAddressValidator extends Base58BitcoinAddressValidator {
+    public static class SUB1XAddressValidator extends Base58AddressValidator {
 
         public SUB1XAddressValidator() {
             super(new SUB1XParams());
diff --git a/assets/src/main/java/bisq/asset/coins/SixEleven.java b/assets/src/main/java/bisq/asset/coins/SixEleven.java
index 706f97e90d..7e8d71df0c 100644
--- a/assets/src/main/java/bisq/asset/coins/SixEleven.java
+++ b/assets/src/main/java/bisq/asset/coins/SixEleven.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -28,7 +28,7 @@ public class SixEleven extends Coin {
         super("SixEleven", "SIL", new SixElevenAddressValidator());
     }
 
-    public static class SixElevenAddressValidator extends Base58BitcoinAddressValidator {
+    public static class SixElevenAddressValidator extends Base58AddressValidator {
 
         public SixElevenAddressValidator() {
             super(new SixEleven.SixElevenChainParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Spectrecoin.java b/assets/src/main/java/bisq/asset/coins/Spectrecoin.java
index 404c351208..1890b69cdd 100644
--- a/assets/src/main/java/bisq/asset/coins/Spectrecoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Spectrecoin.java
@@ -17,14 +17,14 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Spectrecoin extends Coin {
 
     public Spectrecoin() {
-        super("Spectrecoin", "XSPEC", new Base58BitcoinAddressValidator(new SpectrecoinParams()));
+        super("Spectrecoin", "XSPEC", new Base58AddressValidator(new SpectrecoinParams()));
     }
 
 
diff --git a/assets/src/main/java/bisq/asset/coins/Starwels.java b/assets/src/main/java/bisq/asset/coins/Starwels.java
index b7e0f024c5..4b86038624 100644
--- a/assets/src/main/java/bisq/asset/coins/Starwels.java
+++ b/assets/src/main/java/bisq/asset/coins/Starwels.java
@@ -17,12 +17,12 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 
 public class Starwels extends Coin {
 
     public Starwels() {
-        super("Starwels", "USDH", new Base58BitcoinAddressValidator());
+        super("Starwels", "USDH", new Base58AddressValidator());
     }
 }
diff --git a/assets/src/main/java/bisq/asset/coins/UnitedCommunityCoin.java b/assets/src/main/java/bisq/asset/coins/UnitedCommunityCoin.java
index dba97a2c55..e9a3263823 100644
--- a/assets/src/main/java/bisq/asset/coins/UnitedCommunityCoin.java
+++ b/assets/src/main/java/bisq/asset/coins/UnitedCommunityCoin.java
@@ -18,7 +18,7 @@
 package bisq.asset.coins;
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
@@ -29,7 +29,7 @@ public class UnitedCommunityCoin extends Coin {
     }
 
 
-    public static class UnitedCommunityCoinAddressValidator extends Base58BitcoinAddressValidator {
+    public static class UnitedCommunityCoinAddressValidator extends Base58AddressValidator {
 
         public UnitedCommunityCoinAddressValidator() {
             super(new UnitedCommunityCoinParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Veil.java b/assets/src/main/java/bisq/asset/coins/Veil.java
index 8e9e5ee2f9..c4caecc71c 100644
--- a/assets/src/main/java/bisq/asset/coins/Veil.java
+++ b/assets/src/main/java/bisq/asset/coins/Veil.java
@@ -18,8 +18,6 @@
 package bisq.asset.coins;
 
 import bisq.asset.*;
-import org.bitcoinj.core.Address;
-import org.bitcoinj.core.AddressFormatException;
 
 public class Veil extends Coin {
 
@@ -27,7 +25,7 @@ public class Veil extends Coin {
         super("Veil", "VEIL", new VeilAddressValidator());
     }
 
-    public static class VeilAddressValidator extends Base58BitcoinAddressValidator {
+    public static class VeilAddressValidator extends Base58AddressValidator {
 
         public VeilAddressValidator() {
             super(new VeilParams());
diff --git a/assets/src/main/java/bisq/asset/coins/Vertcoin.java b/assets/src/main/java/bisq/asset/coins/Vertcoin.java
index a24f386ea3..bb78ff3742 100644
--- a/assets/src/main/java/bisq/asset/coins/Vertcoin.java
+++ b/assets/src/main/java/bisq/asset/coins/Vertcoin.java
@@ -17,13 +17,13 @@
 
 package bisq.asset.coins;
 
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 import bisq.asset.NetworkParametersAdapter;
 
 public class Vertcoin extends Coin {
     public Vertcoin() {
-        super("Vertcoin", "VTC", new Base58BitcoinAddressValidator(new VertcoinMainNetParams()));
+        super("Vertcoin", "VTC", new Base58AddressValidator(new VertcoinMainNetParams()));
     }
 
     public static class VertcoinMainNetParams extends NetworkParametersAdapter {
diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
index 874f6fc866..d75e4f273b 100644
--- a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
@@ -1058,7 +1058,7 @@ public class BtcWalletService extends WalletService {
         final Coin receiverAmount = amount.subtract(fee);
         Preconditions.checkArgument(Restrictions.isAboveDust(receiverAmount),
                 "The amount is too low (dust limit).");
-        tx.addOutput(receiverAmount, LegacyAddress.fromBase58(params, toAddress));
+        tx.addOutput(receiverAmount, Address.fromString(params, toAddress));
 
         SendRequest sendRequest = SendRequest.forTx(tx);
         sendRequest.fee = fee;
@@ -1089,7 +1089,7 @@ public class BtcWalletService extends WalletService {
         checkArgument(Restrictions.isAboveDust(netValue),
                 "The amount is too low (dust limit).");
 
-        tx.addOutput(netValue, LegacyAddress.fromBase58(params, toAddress));
+        tx.addOutput(netValue, Address.fromString(params, toAddress));
 
         SendRequest sendRequest = SendRequest.forTx(tx);
         sendRequest.fee = fee;
@@ -1154,14 +1154,14 @@ public class BtcWalletService extends WalletService {
             Preconditions.checkArgument(Restrictions.isAboveDust(buyerAmount),
                     "The buyerAmount is too low (dust limit).");
 
-            tx.addOutput(buyerAmount, LegacyAddress.fromBase58(params, buyerAddressString));
+            tx.addOutput(buyerAmount, Address.fromString(params, buyerAddressString));
         }
         // sellerAmount can be 0
         if (sellerAmount.isPositive()) {
             Preconditions.checkArgument(Restrictions.isAboveDust(sellerAmount),
                     "The sellerAmount is too low (dust limit).");
 
-            tx.addOutput(sellerAmount, LegacyAddress.fromBase58(params, sellerAddressString));
+            tx.addOutput(sellerAmount, Address.fromString(params, sellerAddressString));
         }
 
         SendRequest sendRequest = SendRequest.forTx(tx);
diff --git a/core/src/main/java/bisq/core/btc/wallet/WalletService.java b/core/src/main/java/bisq/core/btc/wallet/WalletService.java
index fbe8b355a3..a91c2ed619 100644
--- a/core/src/main/java/bisq/core/btc/wallet/WalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/WalletService.java
@@ -37,7 +37,6 @@ import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.Context;
 import org.bitcoinj.core.ECKey;
 import org.bitcoinj.core.InsufficientMoneyException;
-import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.NetworkParameters;
 import org.bitcoinj.core.listeners.TransactionConfidenceEventListener;
 import org.bitcoinj.script.ScriptException;
@@ -499,12 +498,12 @@ public abstract class WalletService {
     // Empty complete Wallet
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void emptyWallet(String toAddress,
-                            KeyParameter aesKey,
-                            ResultHandler resultHandler,
-                            ErrorMessageHandler errorMessageHandler)
+    public void emptyBtcWallet(String toAddress,
+                               KeyParameter aesKey,
+                               ResultHandler resultHandler,
+                               ErrorMessageHandler errorMessageHandler)
             throws InsufficientMoneyException, AddressFormatException {
-        SendRequest sendRequest = SendRequest.emptyWallet(LegacyAddress.fromBase58(params, toAddress));
+        SendRequest sendRequest = SendRequest.emptyWallet(Address.fromString(params, toAddress));
         sendRequest.fee = Coin.ZERO;
         sendRequest.feePerKb = getTxFeeForWithdrawalPerByte().multiply(1000);
         sendRequest.aesKey = aesKey;
@@ -739,7 +738,8 @@ public abstract class WalletService {
 
     public static boolean isOutputScriptConvertibleToAddress(TransactionOutput output) {
         return ScriptPattern.isP2PKH(output.getScriptPubKey()) ||
-                ScriptPattern.isP2SH(output.getScriptPubKey());
+                ScriptPattern.isP2SH(output.getScriptPubKey()) ||
+                ScriptPattern.isP2WH(output.getScriptPubKey());
     }
 
     @Nullable
diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java
index 2d337d1f38..8a4871b0a4 100644
--- a/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java
+++ b/core/src/main/java/bisq/core/dao/state/model/governance/CompensationProposal.java
@@ -118,7 +118,7 @@ public final class CompensationProposal extends Proposal implements IssuanceProp
         return Coin.valueOf(requestedBsq);
     }
 
-    public Address getAddress() throws AddressFormatException {
+    public LegacyAddress getAddress() throws AddressFormatException {
         // Remove leading 'B'
         String underlyingBtcAddress = bsqAddress.substring(1, bsqAddress.length());
         return LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), underlyingBtcAddress);
diff --git a/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java b/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java
index dc08b6b951..6501e83631 100644
--- a/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java
+++ b/core/src/main/java/bisq/core/dao/state/model/governance/ReimbursementProposal.java
@@ -118,7 +118,7 @@ public final class ReimbursementProposal extends Proposal implements IssuancePro
         return Coin.valueOf(requestedBsq);
     }
 
-    public Address getAddress() throws AddressFormatException {
+    public LegacyAddress getAddress() throws AddressFormatException {
         // Remove leading 'B'
         String underlyingBtcAddress = bsqAddress.substring(1, bsqAddress.length());
         return LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), underlyingBtcAddress);
diff --git a/core/src/main/java/bisq/core/util/coin/BsqFormatter.java b/core/src/main/java/bisq/core/util/coin/BsqFormatter.java
index 60206f56ab..65a75f2cd5 100644
--- a/core/src/main/java/bisq/core/util/coin/BsqFormatter.java
+++ b/core/src/main/java/bisq/core/util/coin/BsqFormatter.java
@@ -106,12 +106,13 @@ public class BsqFormatter implements CoinFormatter {
 
     }
 
-    public Address getAddressFromBsqAddress(String encoded) {
+    public LegacyAddress getAddressFromBsqAddress(String encoded) {
+        String maybeUpdatedEncoded = encoded;
         if (useBsqAddressFormat)
-            encoded = encoded.substring(prefix.length(), encoded.length());
+            maybeUpdatedEncoded = encoded.substring(prefix.length(), encoded.length());
 
         try {
-            return LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), encoded);
+            return LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), maybeUpdatedEncoded);
         } catch (AddressFormatException e) {
             throw new RuntimeException(e);
         }
diff --git a/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java b/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java
index 407cda0212..38eda4094c 100644
--- a/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java
+++ b/core/src/main/java/bisq/core/util/validation/BtcAddressValidator.java
@@ -21,8 +21,8 @@ import bisq.core.locale.Res;
 
 import bisq.common.config.Config;
 
+import org.bitcoinj.core.Address;
 import org.bitcoinj.core.AddressFormatException;
-import org.bitcoinj.core.LegacyAddress;
 
 import javax.inject.Inject;
 
@@ -44,7 +44,7 @@ public final class BtcAddressValidator extends InputValidator {
 
     private ValidationResult validateBtcAddress(String input) {
         try {
-            LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(), input);
+            Address.fromString(Config.baseCurrencyNetworkParameters(), input);
             return new ValidationResult(true);
         } catch (AddressFormatException e) {
             return new ValidationResult(false, Res.get("validation.btc.invalidFormat"));
diff --git a/core/src/test/java/bisq/core/locale/MockTestnetCoin.java b/core/src/test/java/bisq/core/locale/MockTestnetCoin.java
index ddffc0e8fa..8ed0e85e9e 100644
--- a/core/src/test/java/bisq/core/locale/MockTestnetCoin.java
+++ b/core/src/test/java/bisq/core/locale/MockTestnetCoin.java
@@ -25,7 +25,7 @@ import org.bitcoinj.params.TestNet3Params;
 
 
 import bisq.asset.AddressValidationResult;
-import bisq.asset.Base58BitcoinAddressValidator;
+import bisq.asset.Base58AddressValidator;
 import bisq.asset.Coin;
 
 public class MockTestnetCoin extends Coin {
@@ -55,7 +55,7 @@ public class MockTestnetCoin extends Coin {
         }
     }
 
-    public static class BSQAddressValidator extends Base58BitcoinAddressValidator {
+    public static class BSQAddressValidator extends Base58AddressValidator {
 
         public BSQAddressValidator(NetworkParameters networkParameters) {
             super(networkParameters);
diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java
index d03c61093a..9d5c77b650 100644
--- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java
+++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/BtcEmptyWalletWindow.java
@@ -160,7 +160,7 @@ public final class BtcEmptyWalletWindow extends Overlay<BtcEmptyWalletWindow> {
         emptyWalletButton.setDisable(true);
         openOfferManager.removeAllOpenOffers(() -> {
             try {
-                btcWalletService.emptyWallet(addressInputTextField.getText(),
+                btcWalletService.emptyBtcWallet(addressInputTextField.getText(),
                         aesKey,
                         () -> {
                             closeButton.updateText(Res.get("shared.close"));
diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java
index 9ee9da3654..215cb36935 100644
--- a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java
+++ b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java
@@ -68,8 +68,8 @@ import bisq.common.util.Tuple2;
 import bisq.common.util.Tuple3;
 import bisq.common.util.Utilities;
 
+import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
-import org.bitcoinj.core.LegacyAddress;
 import org.bitcoinj.core.TransactionConfidence;
 import org.bitcoinj.uri.BitcoinURI;
 import org.bitcoinj.utils.Fiat;
@@ -718,7 +718,7 @@ public class GUIUtil {
 
     public static String getBitcoinURI(String address, Coin amount, String label) {
         return address != null ?
-                BitcoinURI.convertToBitcoinURI(LegacyAddress.fromBase58(Config.baseCurrencyNetworkParameters(),
+                BitcoinURI.convertToBitcoinURI(Address.fromString(Config.baseCurrencyNetworkParameters(),
                         address), amount, label, null) :
                 "";
     }