diff --git a/drongo b/drongo
index bdb9900d..6c03c410 160000
--- a/drongo
+++ b/drongo
@@ -1 +1 @@
-Subproject commit bdb9900d8d94f62b8714e14e151635813c7c258d
+Subproject commit 6c03c4106ae612c0b80370c3ed5495b1ba9225bc
diff --git a/src/main/java/com/sparrowwallet/sparrow/AppController.java b/src/main/java/com/sparrowwallet/sparrow/AppController.java
index 1fab5134..0a82cf9b 100644
--- a/src/main/java/com/sparrowwallet/sparrow/AppController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/AppController.java
@@ -1283,7 +1283,7 @@ public class AppController implements Initializable {
                         addWalletSubTab(subTabs, storage, wallet, backupWallet);
                         Tab masterTab = subTabs.getTabs().stream().filter(tab -> ((WalletTabData)tab.getUserData()).getWallet().isMasterWallet()).findFirst().orElse(subTabs.getTabs().get(0));
                         Label masterLabel = (Label)masterTab.getGraphic();
-                        masterLabel.setText(wallet.getMasterWallet().getLabel() != null ? wallet.getMasterWallet().getLabel() : getAutomaticName(wallet.getMasterWallet()));
+                        masterLabel.setText(wallet.getMasterWallet().getLabel() != null ? wallet.getMasterWallet().getLabel() : wallet.getMasterWallet().getAutomaticName());
                         Platform.runLater(() -> {
                             setSubTabsVisible(subTabs, true);
                         });
@@ -1313,7 +1313,7 @@ public class AppController implements Initializable {
         try {
             Tab subTab = new Tab();
             subTab.setClosable(false);
-            String label = wallet.getLabel() != null ? wallet.getLabel() : (wallet.isMasterWallet() ? getAutomaticName(wallet) : wallet.getName());
+            String label = wallet.getLabel() != null ? wallet.getLabel() : (wallet.isMasterWallet() ? wallet.getAutomaticName() : wallet.getName());
             Label subTabLabel = new Label(label);
             subTabLabel.setPadding(new Insets(0, 3, 0, 3));
             subTabLabel.setGraphic(getSubTabGlyph(wallet));
@@ -1368,11 +1368,6 @@ public class AppController implements Initializable {
         return tabGlyph;
     }
 
-    private String getAutomaticName(Wallet wallet) {
-        int account = wallet.getAccountIndex();
-        return (account < 0 || account > 9) ? wallet.getName() : (!wallet.isWhirlpoolMasterWallet() || account > 1 ? "Account #" + account : "Deposit");
-    }
-
     public WalletForm getSelectedWalletForm() {
         Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
         TabData tabData = (TabData)selectedTab.getUserData();
diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
index 24674364..9cdf0657 100644
--- a/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
+++ b/src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
@@ -140,7 +140,7 @@ public class PaymentController extends WalletFormController implements Initializ
                 return null;
             }
         });
-        openWallets.setItems(FXCollections.observableList(AppServices.get().getOpenWallets().keySet().stream().filter(Wallet::isValid).collect(Collectors.toList())));
+        openWallets.setItems(FXCollections.observableList(AppServices.get().getOpenWallets().keySet().stream().filter(wallet -> wallet.isValid() && !wallet.isWhirlpoolChildWallet()).collect(Collectors.toList())));
         openWallets.prefWidthProperty().bind(address.widthProperty());
         openWallets.valueProperty().addListener((observable, oldValue, newValue) -> {
             if(newValue != null) {
@@ -475,6 +475,6 @@ public class PaymentController extends WalletFormController implements Initializ
 
     @Subscribe
     public void openWallets(OpenWalletsEvent event) {
-        openWallets.setItems(FXCollections.observableList(event.getWallets().stream().filter(Wallet::isValid).collect(Collectors.toList())));
+        openWallets.setItems(FXCollections.observableList(event.getWallets().stream().filter(wallet -> wallet.isValid() && !wallet.isWhirlpoolChildWallet()).collect(Collectors.toList())));
     }
 }
diff --git a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_airgapped.fxml b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_airgapped.fxml
index 606da858..c4306a64 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_airgapped.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_airgapped.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 
 <AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.HwAirgappedController">
-    <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true">
+    <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true" hbarPolicy="NEVER" prefHeight="620">
         <Accordion fx:id="importAccordion" />
     </ScrollPane>
 </AnchorPane>
diff --git a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml
index 61c6c4d7..ec1c2fde 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/hw_usb-devices.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 
 <AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.HwUsbDevicesController">
-        <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true">
-            <Accordion fx:id="deviceAccordion" />
-        </ScrollPane>
+    <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true" hbarPolicy="NEVER" prefHeight="620">
+        <Accordion fx:id="deviceAccordion" />
+    </ScrollPane>
 </AnchorPane>
diff --git a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/sw.fxml b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/sw.fxml
index adcd8e7e..35a21f73 100644
--- a/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/sw.fxml
+++ b/src/main/resources/com/sparrowwallet/sparrow/keystoreimport/sw.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 
 <AnchorPane stylesheets="@keystoreimport.css" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="com.sparrowwallet.sparrow.keystoreimport.SwController">
-    <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true">
+    <ScrollPane AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" fitToWidth="true" hbarPolicy="NEVER" prefHeight="620">
         <Accordion fx:id="importAccordion" />
     </ScrollPane>
 </AnchorPane>