diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
index 89b5989a..4003d295 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java
@@ -39,6 +39,8 @@ import java.util.stream.Collectors;
 public class KeystoreController extends WalletFormController implements Initializable {
     private static final Logger log = LoggerFactory.getLogger(KeystoreController.class);
 
+    private static final String DEFAULT_WATCH_ONLY_FINGERPRINT = "00000000";
+
     private Keystore keystore;
 
     @FXML
@@ -215,6 +217,7 @@ public class KeystoreController extends WalletFormController implements Initiali
         if(keystoreSource != KeystoreSource.SW_WATCH) {
             launchImportDialog(keystoreSource);
         } else {
+            fingerprint.setText(DEFAULT_WATCH_ONLY_FINGERPRINT);
             selectSourcePane.setVisible(false);
         }
     }
diff --git a/src/main/java/com/sparrowwallet/sparrow/whirlpool/Whirlpool.java b/src/main/java/com/sparrowwallet/sparrow/whirlpool/Whirlpool.java
index 0462f161..f31c5c37 100644
--- a/src/main/java/com/sparrowwallet/sparrow/whirlpool/Whirlpool.java
+++ b/src/main/java/com/sparrowwallet/sparrow/whirlpool/Whirlpool.java
@@ -57,7 +57,7 @@ public class Whirlpool {
     private static final Logger log = LoggerFactory.getLogger(Whirlpool.class);
 
     public static final List<Network> WHIRLPOOL_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
-    public static final int DEFAULT_MIXTO_MIN_MIXES = 5;
+    public static final int DEFAULT_MIXTO_MIN_MIXES = 3;
     public static final int DEFAULT_MIXTO_RANDOM_FACTOR = 4;
 
     private final WhirlpoolServer whirlpoolServer;
diff --git a/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml b/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml
index 47241480..8002b30b 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml
@@ -238,12 +238,12 @@
                     </SegmentedButton>
                     <SegmentedButton HBox.hgrow="ALWAYS">
                         <buttons>
-                            <ToggleButton HBox.hgrow="ALWAYS" text="Save PSBT" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#savePSBT">
+                            <ToggleButton HBox.hgrow="ALWAYS" text="Save Transaction" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#savePSBT">
                                 <graphic>
                                     <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="SD_CARD" />
                                 </graphic>
                             </ToggleButton>
-                            <ToggleButton HBox.hgrow="ALWAYS" text="Load PSBT" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#loadPSBT">
+                            <ToggleButton HBox.hgrow="ALWAYS" text="Load Transaction" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#loadPSBT">
                                 <graphic>
                                     <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="ARROW_UP" />
                                 </graphic>