diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/payment_methods/TradeWizardPaymentMethodsController.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/payment_methods/TradeWizardPaymentMethodsController.java
index 39a699572c..f7bf1b943a 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/payment_methods/TradeWizardPaymentMethodsController.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/trade_wizard/payment_methods/TradeWizardPaymentMethodsController.java
@@ -158,7 +158,7 @@ public void onActivate() {
                     boolean isCustomPaymentMethod = fiatPaymentMethod.isCustomPaymentMethod();
                     if (!isCustomPaymentMethod && isPredefinedPaymentMethodsContainName(name)) {
                         maybeAddFiatPaymentMethod(fiatPaymentMethod);
-                    } else {
+                    } else if (isCustomPaymentMethod) {
                         maybeAddCustomFiatPaymentMethod(fiatPaymentMethod);
                     }
                 }));
@@ -168,7 +168,10 @@ public void onActivate() {
                         return;
                     }
                     BitcoinPaymentMethod bitcoinPaymentMethod = BitcoinPaymentMethodUtil.getPaymentMethod(name);
-                    maybeAddBitcoinPaymentMethod(bitcoinPaymentMethod);
+                    boolean isCustomPaymentMethod = bitcoinPaymentMethod.isCustomPaymentMethod();
+                    if (!isCustomPaymentMethod) {
+                        maybeAddBitcoinPaymentMethod(bitcoinPaymentMethod);
+                    }
                 }));
         maybeAddOnChainPaymentMethodAsSelected();
     }
@@ -311,7 +314,7 @@ private void maybeRemoveCustomFiatPaymentMethods() {
         // To ensure backwards compatibility we need to drop custom fiat payment methods if the user has more than 3,
         // which is the max allowed number of custom fiat payment methods per market
         while (model.getAddedCustomFiatPaymentMethods().size() > MAX_ALLOWED_CUSTOM_FIAT_PAYMENTS) {
-            model.getAddedCustomFiatPaymentMethods().remove(model.getAddedCustomBitcoinPaymentMethods().size() - 1);
+            model.getAddedCustomFiatPaymentMethods().remove(model.getAddedCustomFiatPaymentMethods().size() - 1);
         }
     }
 
diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/list/message_box/BubbleMessageBox.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/list/message_box/BubbleMessageBox.java
index 3e39d9a792..78dcb434c4 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/list/message_box/BubbleMessageBox.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/list/message_box/BubbleMessageBox.java
@@ -248,6 +248,7 @@ private HBox createAndGetSupportedLanguagesBox() {
                     String languageCode = offer.getSupportedLanguageCodes().get(i).toUpperCase();
                     Label codeLabel = (i == codesCount - 1) ? new Label(languageCode) : new Label(languageCode + ",");
                     codeLabel.setTooltip(new BisqTooltip(LanguageRepository.getDisplayString(languageCode)));
+                    codeLabel.getStyleClass().add("text-fill-white");
                     hBox.getChildren().add(codeLabel);
                 }
             }
diff --git a/apps/desktop/desktop/src/main/resources/images/icons/language/language_green.png b/apps/desktop/desktop/src/main/resources/images/icons/language/language_green.png
index 0b7cb0fde2..4e6b5ef3d6 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/icons/language/language_green.png and b/apps/desktop/desktop/src/main/resources/images/icons/language/language_green.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/icons/language/language_green@2x.png b/apps/desktop/desktop/src/main/resources/images/icons/language/language_green@2x.png
index 823d63926b..116b02cfcc 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/icons/language/language_green@2x.png and b/apps/desktop/desktop/src/main/resources/images/icons/language/language_green@2x.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey.png b/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey.png
index 86a3a7446a..30f915a0eb 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey.png and b/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey@2x.png b/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey@2x.png
index e3f924a807..5fe4590924 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey@2x.png and b/apps/desktop/desktop/src/main/resources/images/icons/language/language_grey@2x.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/icons/language/language_white.png b/apps/desktop/desktop/src/main/resources/images/icons/language/language_white.png
index 82c7a4bea6..8008c6c756 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/icons/language/language_white.png and b/apps/desktop/desktop/src/main/resources/images/icons/language/language_white.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/icons/language/language_white@2x.png b/apps/desktop/desktop/src/main/resources/images/icons/language/language_white@2x.png
index c85ef6d51f..12c7348431 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/icons/language/language_white@2x.png and b/apps/desktop/desktop/src/main/resources/images/icons/language/language_white@2x.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active.png b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active.png
index f92a9af2b0..34b472d542 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active.png and b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active@2x.png b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active@2x.png
index 714941b5d8..c547311f93 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active@2x.png and b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-active@2x.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover.png b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover.png
index 227c1883bf..5302272e40 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover.png and b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover@2x.png b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover@2x.png
index 3c9138f84a..7dc56490ab 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover@2x.png and b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network-hover@2x.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network.png b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network.png
index 266933cca4..ea584fa8a5 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network.png and b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network.png differ
diff --git a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network@2x.png b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network@2x.png
index e7cd425e47..c86cceb86a 100644
Binary files a/apps/desktop/desktop/src/main/resources/images/navigation/nav-network@2x.png and b/apps/desktop/desktop/src/main/resources/images/navigation/nav-network@2x.png differ