diff --git a/common/pom.xml b/common/pom.xml
index 95be6e4f9d4..226679531ba 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/common/src/main/java/io/bisq/common/app/Version.java b/common/src/main/java/io/bisq/common/app/Version.java
index 4832ed79e00..298710e3d6c 100644
--- a/common/src/main/java/io/bisq/common/app/Version.java
+++ b/common/src/main/java/io/bisq/common/app/Version.java
@@ -29,7 +29,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "0.5.2"; 
+    public static final String VERSION = "0.5.3"; 
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);
diff --git a/common/src/main/resources/i18n/displayStrings.properties b/common/src/main/resources/i18n/displayStrings.properties
index ae4ebc60025..a0c44a805c2 100644
--- a/common/src/main/resources/i18n/displayStrings.properties
+++ b/common/src/main/resources/i18n/displayStrings.properties
@@ -1532,7 +1532,7 @@ If you have not fulfilled the above requirements you would lose your security de
 to get in contact with the {1} buyer by using the provided email address or mobile number to verify that he or she \
   is really the owner of the Zelle (ClearXchange) account.
 
-popup.info.revertIdCheckRequirement=With version 0.5.2 we remove the requirement introduced in version 0.5.0 for verifying the peers ID by email when payment methods \
+popup.info.revertIdCheckRequirement=With this version we remove the requirement introduced in version 0.5.0 for verifying the peers ID by email when payment methods \
   with bank transfer or Faster Payment was used.\n\n\
   The email address is not exposed anymore in Sepa, Faster Payment and national bank transfer payment methods.\n\n\
   Please see the discussion on the Bisq Forum for further background:\n\
diff --git a/core/pom.xml b/core/pom.xml
index 71f13c7b902..02d6596387a 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
 
     <artifactId>core</artifactId>
diff --git a/core/src/main/java/io/bisq/core/app/BisqEnvironment.java b/core/src/main/java/io/bisq/core/app/BisqEnvironment.java
index c7e55c1b866..adbe7ca3545 100644
--- a/core/src/main/java/io/bisq/core/app/BisqEnvironment.java
+++ b/core/src/main/java/io/bisq/core/app/BisqEnvironment.java
@@ -44,6 +44,8 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 
@@ -107,6 +109,38 @@ else if (Utilities.isOSX())
     }
 
     private static String appDataDir(String userDataDir, String appName) {
+        //TODO fix for changing app name form bisq to Bisq (add dir renamed as well)
+        final String newAppName = "Bisq";
+        if (appName.equals(newAppName)) {
+            final String oldAppName = "bisq";
+            Path oldPath = Paths.get(Paths.get(userDataDir, oldAppName).toString());// bisq 
+            Path newPath = Paths.get(Paths.get(userDataDir, appName).toString());//Bisq
+            File oldDir = new File(oldPath.toString()); // bisq 
+            File newDir = new File(newPath.toString()); //Bisq
+            try {
+                if (Files.exists(oldPath) && oldDir.getCanonicalPath().endsWith(oldAppName)) {
+                    if (Files.exists(newPath) && newDir.getCanonicalPath().endsWith(newAppName)) {
+                        // we have both bisq and Bisq and rename Bisq to Bisq_backup
+                        File newDirBackup = new File(newDir.toString() + "_backup"); // Bisq
+                        log.info("Rename Bisq data dir {} to {}", newPath.toString(), newDirBackup.toString());
+                        if (!newDir.renameTo(newDirBackup))
+                            throw new RuntimeException("Cannot rename dir");
+
+                        log.info("Rename old data dir {} to {}", oldDir.toString(), newPath.toString());
+                        if (!oldDir.renameTo(newDir))
+                            throw new RuntimeException("Cannot rename dir");
+                    } else {
+                        log.info("Rename old data dir {} to {}", oldDir.toString(), newPath.toString());
+                        if (!oldDir.renameTo(newDir))
+                            throw new RuntimeException("Cannot rename dir");
+
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
         return Paths.get(userDataDir, appName).toString();
     }
 
diff --git a/gui/pom.xml b/gui/pom.xml
index 199062bd426..c34353da806 100644
--- a/gui/pom.xml
+++ b/gui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/gui/src/main/java/io/bisq/gui/main/MainViewModel.java b/gui/src/main/java/io/bisq/gui/main/MainViewModel.java
index bf74fd14515..06a9106d3a8 100644
--- a/gui/src/main/java/io/bisq/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bisq/gui/main/MainViewModel.java
@@ -306,7 +306,6 @@ private void showRevertIdCheckRequirement() {
         //TODO remove after v0.5.2
         String key = "revertIdCheckRequirement";
         if (preferences.showAgain(key) &&
-                Version.VERSION.equals("0.5.2") &&
                 user.getPaymentAccounts() != null &&
                 user.getPaymentAccounts().stream()
                         .filter(e -> e.getPaymentMethod().getId().equals(PaymentMethod.SEPA_ID) ||
diff --git a/jsocks/pom.xml b/jsocks/pom.xml
index b72bbf9b693..d33e8b9bfd4 100644
--- a/jsocks/pom.xml
+++ b/jsocks/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml
index b255d92d37d..798ba16e1e1 100644
--- a/jtorctl/pom.xml
+++ b/jtorctl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml
index a33afe5cbe3..ae9cbae45fd 100644
--- a/jtorproxy/pom.xml
+++ b/jtorproxy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/network/pom.xml b/network/pom.xml
index 98dc186a4c1..dd3938c73b9 100644
--- a/network/pom.xml
+++ b/network/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/package/linux/32bitBuild.sh b/package/linux/32bitBuild.sh
index b59af1d4571..0f327160e97 100644
--- a/package/linux/32bitBuild.sh
+++ b/package/linux/32bitBuild.sh
@@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e
 
 # Edit version
-version=0.5.2
+version=0.5.3
 
 jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bisq-$version.jar"
 
diff --git a/package/linux/64bitBuild.sh b/package/linux/64bitBuild.sh
index 5f3b1241de2..ff24d818a7d 100644
--- a/package/linux/64bitBuild.sh
+++ b/package/linux/64bitBuild.sh
@@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e
 
 # Edit version
-version=0.5.2
+version=0.5.3
 
 jarFile="/media/sf_vm_shared_ubuntu/Bisq-$version.jar"
 
diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile
index 70f7a0406cc..957146004a6 100644
--- a/package/linux/Dockerfile
+++ b/package/linux/Dockerfile
@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.5.2
+ENV version 0.5.3
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot
diff --git a/package/osx/create_app.sh b/package/osx/create_app.sh
index c910aa30b9f..a3dd049259b 100755
--- a/package/osx/create_app.sh
+++ b/package/osx/create_app.sh
@@ -5,7 +5,7 @@ mkdir -p gui/deploy
 
 set -e
 
-version="0.5.2"
+version="0.5.3"
 
 mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true
 
diff --git a/package/osx/finalize.sh b/package/osx/finalize.sh
index 7c329d34ca4..1921171e759 100644
--- a/package/osx/finalize.sh
+++ b/package/osx/finalize.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version="0.5.2"
+version="0.5.3"
 
 target_dir="/Users/dev/Documents/__bisq/_releases/$version"
 src_dir="/Users/dev/Documents/intellij/bisq"
diff --git a/package/win/32bitBuild.bat b/package/win/32bitBuild.bat
index 5597e3618ed..f5a187f8ecf 100644
--- a/package/win/32bitBuild.bat
+++ b/package/win/32bitBuild.bat
@@ -5,7 +5,7 @@
 :: 32 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.5.2
+SET version=0.5.3
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows_32bit
diff --git a/package/win/64bitBuild.bat b/package/win/64bitBuild.bat
index d1b8f5c6132..47535ac0fc0 100644
--- a/package/win/64bitBuild.bat
+++ b/package/win/64bitBuild.bat
@@ -5,7 +5,7 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.5.2
+SET version=0.5.3
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows
diff --git a/package/win/Bisq.iss b/package/win/Bisq.iss
index 7247fd85b04..0e0cb997efe 100755
--- a/package/win/Bisq.iss
+++ b/package/win/Bisq.iss
@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.5.2
+AppVersion=0.5.3
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq
diff --git a/pom.xml b/pom.xml
index 9734c3cf9a8..231f59a12fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.bisq</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.5.2</version>
+    <version>0.5.3</version>
     <description>Bisq - The decentralized exchange network</description>
     <url>https://bisq.io</url>
 
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.2</version>
+                <version>0.5.3</version>
                 <configuration>
                     <protocExecutable>/usr/local/bin/protoc</protocExecutable>
                 </configuration>
diff --git a/provider/pom.xml b/provider/pom.xml
index 02025e981e1..f76a47cbe68 100644
--- a/provider/pom.xml
+++ b/provider/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/seednode/pom.xml b/seednode/pom.xml
index c320e7a88ad..b6553868730 100644
--- a/seednode/pom.xml
+++ b/seednode/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/statistics/pom.xml b/statistics/pom.xml
index 67cdbc734e6..81d614a82ab 100644
--- a/statistics/pom.xml
+++ b/statistics/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>