diff --git a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java b/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
index a603e7ea69..c24c23181a 100644
--- a/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
+++ b/src/main/java/io/bitsquare/gui/components/ValidatingTextField.java
@@ -70,7 +70,6 @@ public class ValidatingTextField extends TextField {
 
     public ValidatingTextField() {
         super();
-
         setupListeners();
     }
 
diff --git a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java
index c9215837ae..0194f1b497 100644
--- a/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java
+++ b/src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferPresenter.java
@@ -203,21 +203,18 @@ class CreateOfferPresenter {
         // bindBidirectional for amount, price, volume and minAmount
         amount.addListener(ov -> {
             model.amountAsCoin = parseToBtcWith4Decimals(amount.get());
-            calculateVolume();
             calculateTotalToPay();
             calculateCollateral();
         });
 
         price.addListener(ov -> {
             model.priceAsFiat = parseToFiatWith2Decimals(price.get());
-            calculateVolume();
             calculateTotalToPay();
             calculateCollateral();
         });
 
         volume.addListener(ov -> {
             model.volumeAsFiat = parseToFiatWith2Decimals(volume.get());
-            calculateAmount();
             calculateTotalToPay();
             calculateCollateral();
         });
@@ -259,6 +256,7 @@ class CreateOfferPresenter {
             showWarningInvalidFiatDecimalPlaces.set(!hasFiatValidDecimals(price.get()));
             model.priceAsFiat = parseToFiatWith2Decimals(price.get());
             price.set(formatFiat(model.priceAsFiat));
+            calculateVolume();
         }
     }
 
diff --git a/src/main/resources/images/logo_600_600.png b/src/main/resources/images/logo_600_600.png
index 5572fe6fa8..084d2e8c25 100644
Binary files a/src/main/resources/images/logo_600_600.png and b/src/main/resources/images/logo_600_600.png differ
diff --git a/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java b/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
index 3cc5fa662d..6488b7b21d 100644
--- a/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
+++ b/src/test/java/io/bitsquare/gui/util/BSFormatterTest.java
@@ -52,7 +52,6 @@ public class BSFormatterTest {
         assertFalse(hasBtcValidDecimals("0.0001222312312312313"));
     }
 
-
     @Test
     public void testParseToFiatWith2Decimals() {