diff --git a/core/src/main/java/haveno/core/locale/CurrencyUtil.java b/core/src/main/java/haveno/core/locale/CurrencyUtil.java
index 911bb65d..c94d55c7 100644
--- a/core/src/main/java/haveno/core/locale/CurrencyUtil.java
+++ b/core/src/main/java/haveno/core/locale/CurrencyUtil.java
@@ -406,6 +406,13 @@ public class CurrencyUtil {
                 removedCryptoCurrency.isPresent() ? removedCryptoCurrency.get().getName() : Res.get("shared.na");
             return getCryptoCurrency(currencyCode).map(TradeCurrency::getName).orElse(xmrOrRemovedAsset);
         }
+        if (isTraditionalNonFiatCurrency(currencyCode)) {
+            return getTraditionalNonFiatCurrencies().stream()
+                    .filter(currency -> currency.getCode().equals(currencyCode))
+                    .findAny()
+                    .map(TradeCurrency::getName)
+                    .orElse(currencyCode);
+        }
         try {
             return Currency.getInstance(currencyCode).getDisplayName();
         } catch (Throwable t) {
diff --git a/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java
index 73e78ab6..c6217cfe 100644
--- a/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java
+++ b/desktop/src/main/java/haveno/desktop/app/HavenoAppMain.java
@@ -216,7 +216,7 @@ public class HavenoAppMain extends HavenoExecutable {
 
             // Set the dialog content
             VBox vbox = new VBox(10);
-            ImageView logoImageView = new ImageView(ImageUtil.getImageByPath("logo_splash_light.png"));
+            ImageView logoImageView = new ImageView(ImageUtil.getImageByPath("logo_splash_light_mode.png"));
             logoImageView.setFitWidth(342);
             logoImageView.setPreserveRatio(true);
             vbox.getChildren().addAll(logoImageView, passwordField, errorMessageField, versionField);
diff --git a/desktop/src/main/java/haveno/desktop/haveno.css b/desktop/src/main/java/haveno/desktop/haveno.css
index 7c24526a..7fc6948f 100644
--- a/desktop/src/main/java/haveno/desktop/haveno.css
+++ b/desktop/src/main/java/haveno/desktop/haveno.css
@@ -2283,6 +2283,7 @@ textfield */
     -fx-background-insets: 44;
     -fx-background-radius: 15;
     -fx-border-radius: 15;
+    -fx-effect: dropshadow(gaussian, -bs-text-color-dropshadow-light-mode, 44, 0, 0, 0);
 }
 
 .notification-popup-bg, .peer-info-popup-bg {
diff --git a/desktop/src/main/java/haveno/desktop/main/MainView.java b/desktop/src/main/java/haveno/desktop/main/MainView.java
index ee743432..2a5b994c 100644
--- a/desktop/src/main/java/haveno/desktop/main/MainView.java
+++ b/desktop/src/main/java/haveno/desktop/main/MainView.java
@@ -305,8 +305,12 @@ public class MainView extends InitializableView<StackPane, MainViewModel>  {
             }
         });
 
+        // add spacer to center the nav buttons when window is small
+        Region rightSpacer = new Region();
+        HBox.setHgrow(rightSpacer, Priority.ALWAYS);
+
         HBox primaryNav = new HBox(getLogoPane(), marketButton, getNavigationSpacer(), buyButton, getNavigationSpacer(),
-                sellButton, getNavigationSpacer(), portfolioButtonWithBadge, getNavigationSpacer(), fundsButton);
+                sellButton, getNavigationSpacer(), portfolioButtonWithBadge, getNavigationSpacer(), fundsButton, rightSpacer);
 
         primaryNav.setAlignment(Pos.CENTER_LEFT);
         primaryNav.getStyleClass().add("nav-primary");
diff --git a/desktop/src/main/java/haveno/desktop/theme-dark.css b/desktop/src/main/java/haveno/desktop/theme-dark.css
index 1e568142..5316735b 100644
--- a/desktop/src/main/java/haveno/desktop/theme-dark.css
+++ b/desktop/src/main/java/haveno/desktop/theme-dark.css
@@ -578,15 +578,15 @@
 }
 
 #image-logo-splash {
-    -fx-image: url("../../images/logo_splash_dark.png");
+    -fx-image: url("../../images/logo_splash_dark_mode.png");
 }
 
 #image-logo-splash-testnet {
-    -fx-image: url("../../images/logo_splash_testnet_dark.png");
+    -fx-image: url("../../images/logo_splash_testnet_dark_mode.png");
 }
 
 #image-logo-landscape {
-    -fx-image: url("../../images/logo_landscape_dark.png");
+    -fx-image: url("../../images/logo_landscape_dark_mode.png");
 }
 
 .table-view .placeholder {
diff --git a/desktop/src/main/java/haveno/desktop/theme-light.css b/desktop/src/main/java/haveno/desktop/theme-light.css
index 160a21e3..99bc71a4 100644
--- a/desktop/src/main/java/haveno/desktop/theme-light.css
+++ b/desktop/src/main/java/haveno/desktop/theme-light.css
@@ -144,15 +144,15 @@
 }
 
 #image-logo-splash {
-    -fx-image: url("../../images/logo_splash_light.png");
+    -fx-image: url("../../images/logo_splash_light_mode.png");
 }
 
 #image-logo-splash-testnet {
-    -fx-image: url("../../images/logo_splash_testnet_light.png");
+    -fx-image: url("../../images/logo_splash_testnet_light_mode.png");
 }
 
 #image-logo-landscape {
-    -fx-image: url("../../images/logo_landscape_light.png");
+    -fx-image: url("../../images/logo_landscape_light_mode.png");
 }
 
 #charts .default-color0.chart-series-area-fill {
diff --git a/desktop/src/main/resources/images/logo_landscape_dark.png b/desktop/src/main/resources/images/logo_landscape_dark_mode.png
similarity index 100%
rename from desktop/src/main/resources/images/logo_landscape_dark.png
rename to desktop/src/main/resources/images/logo_landscape_dark_mode.png
diff --git a/desktop/src/main/resources/images/logo_landscape_light.png b/desktop/src/main/resources/images/logo_landscape_light_mode.png
similarity index 100%
rename from desktop/src/main/resources/images/logo_landscape_light.png
rename to desktop/src/main/resources/images/logo_landscape_light_mode.png
diff --git a/desktop/src/main/resources/images/logo_splash_dark.png b/desktop/src/main/resources/images/logo_splash_dark_mode.png
similarity index 100%
rename from desktop/src/main/resources/images/logo_splash_dark.png
rename to desktop/src/main/resources/images/logo_splash_dark_mode.png
diff --git a/desktop/src/main/resources/images/logo_splash_light.png b/desktop/src/main/resources/images/logo_splash_light_mode.png
similarity index 100%
rename from desktop/src/main/resources/images/logo_splash_light.png
rename to desktop/src/main/resources/images/logo_splash_light_mode.png
diff --git a/desktop/src/main/resources/images/logo_splash_testnet_dark.png b/desktop/src/main/resources/images/logo_splash_testnet_dark_mode.png
similarity index 100%
rename from desktop/src/main/resources/images/logo_splash_testnet_dark.png
rename to desktop/src/main/resources/images/logo_splash_testnet_dark_mode.png
diff --git a/desktop/src/main/resources/images/logo_splash_testnet_light.png b/desktop/src/main/resources/images/logo_splash_testnet_light_mode.png
similarity index 100%
rename from desktop/src/main/resources/images/logo_splash_testnet_light.png
rename to desktop/src/main/resources/images/logo_splash_testnet_light_mode.png