ignore scroll events with zero scroll movement

upgrade to whirlpool 1.0.6 to support simpler onion switching

.github/workflows/package.yaml

@@ -12,11 +12,11 @@ jobs:
       matrix:
         os: [windows-2022, ubuntu-20.04, macos-12]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Set up JDK 18.0.1
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '18.0.1'
@@ -31,7 +31,7 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
         run: ./gradlew packageTarDistribution
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Sparrow Build - ${{ runner.os }}
           path: |
@@ -48,7 +48,7 @@ jobs:
         run: for f in build/jpackage/sparrow*; do mv -v "$f" "${f/sparrow/sparrow-server}"; done;
       - name: Upload Headless Artifact
         if: ${{ runner.os == 'Linux' }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Sparrow Build - ${{ runner.os }} Headless
           path: |

build.gradle

@@ -2,12 +2,12 @@ import java.awt.GraphicsEnvironment
 
 plugins {
     id 'application'
-    id 'org-openjfx-javafxplugin'
     id 'extra-java-module-info'
-    id 'org.beryx.jlink' version '2.26.0'
+    id 'org-openjfx-javafxplugin'
+    id 'org.beryx.jlink' version '3.0.1'
 }
 
-def sparrowVersion = '1.7.8'
+def sparrowVersion = '1.8.6'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -63,18 +63,19 @@ java {
 
 dependencies {
     //Any changes to the dependencies must be reflected in the module definitions below!
-    implementation(project(':drongo')) {
-        exclude group: 'org.hamcrest'
-        exclude group: 'junit'
-    }
-    implementation('com.google.guava:guava:31.1-jre')
-    implementation('com.google.code.gson:gson:2.8.6')
+    implementation(project(':drongo'))
+    implementation('com.google.guava:guava:33.0.0-jre')
+    implementation('com.google.code.gson:gson:2.9.1')
     implementation('com.h2database:h2:2.1.214')
-    implementation('com.zaxxer:HikariCP:4.0.3')
+    implementation('com.zaxxer:HikariCP:4.0.3') {
+        exclude group: 'org.slf4j'
+    }
     implementation('org.jdbi:jdbi3-core:3.20.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('org.jdbi:jdbi3-sqlobject:3.20.0')
+    implementation('org.jdbi:jdbi3-sqlobject:3.20.0') {
+        exclude group: 'org.slf4j'
+    }
     implementation('org.flywaydb:flyway-core:7.10.7-SNAPSHOT')
     implementation('org.fxmisc.richtext:richtextfx:0.10.4')
     implementation('no.tornado:tornadofx-controls:1.0.4')
@@ -89,7 +90,7 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.3') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet:hummingbird:1.6.7')
+    implementation('com.sparrowwallet:hummingbird:1.7.3')
     implementation('co.nstant.in:cbor:0.9')
     implementation("com.nativelibs4java:bridj${targetName}:0.7-20140918-3") {
         exclude group: 'com.google.android.tools', module: 'dx'
@@ -118,25 +119,27 @@ dependencies {
     }
     implementation('dev.bwt:bwt-jni:0.1.8')
     implementation('net.sourceforge.javacsv:javacsv:2.0')
-    implementation('org.slf4j:jul-to-slf4j:1.7.30') {
+    implementation ('org.slf4j:slf4j-api:2.0.12')
+    implementation('org.slf4j:jul-to-slf4j:2.0.12') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.36')
+    implementation('com.sparrowwallet.bokmakierie:bokmakierie:1.0')
+    implementation('io.samourai.code.whirlpool:whirlpool-client:1.0.6')
+    implementation('io.samourai.code.wallet:java-http-client:2.0.2')
     implementation('io.reactivex.rxjava2:rxjava:2.2.15')
     implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
     implementation('org.apache.commons:commons-lang3:3.7')
+    implementation('org.apache.commons:commons-compress:1.25.0')
     implementation('net.sourceforge.streamsupport:streamsupport:1.7.0')
     implementation('com.github.librepdf:openpdf:1.3.30')
     implementation('com.googlecode.lanterna:lanterna:3.1.1')
     implementation('net.coobird:thumbnailator:0.4.18')
     implementation('com.github.hervegirod:fxsvgimage:1.0b2')
     implementation('com.sparrowwallet:toucan:0.9.0')
-    testImplementation('junit:junit:4.13.1')
-}
-
-application {
-    mainModule = 'com.sparrowwallet.sparrow'
-    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+    implementation('com.jcraft:jzlib:1.1.3')
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.0')
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }
 
 compileJava {
@@ -157,10 +160,14 @@ processResources {
 }
 
 test {
-    jvmArgs '--add-opens=java.base/java.io=com.google.gson'
+    useJUnitPlatform()
+    jvmArgs = ["--add-opens=java.base/java.io=ALL-UNNAMED", "--add-opens=java.base/java.io=com.google.gson"]
 }
 
-run {
+application {
+    mainModule = 'com.sparrowwallet.sparrow'
+    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+
     applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError",
                                  "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
                                  "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls",
@@ -206,8 +213,6 @@ jlink {
         uses 'org.flywaydb.core.extensibility.FlywayExtension'
         uses 'org.flywaydb.core.internal.database.DatabaseType'
         uses 'org.eclipse.jetty.http.HttpFieldPreEncoder'
-        uses 'org.eclipse.jetty.websocket.api.extensions.Extension'
-        uses 'org.eclipse.jetty.websocket.common.RemoteEndpointFactory'
     }
 
     options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*']
@@ -236,11 +241,14 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=java.desktop",
                    "--add-reads=com.sparrowwallet.merged.module=java.sql",
                    "--add-reads=com.sparrowwallet.merged.module=com.sparrowwallet.sparrow",
-                   "--add-reads=com.sparrowwallet.merged.module=logback.classic",
+                   "--add-reads=com.sparrowwallet.merged.module=ch.qos.logback.classic",
+                   "--add-reads=com.sparrowwallet.merged.module=org.slf4j",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
                    "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
+                   "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.pg",
+                   "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.provider",
                    "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
 
         if(os.windows) {
@@ -260,7 +268,7 @@ jlink {
         appVersion = "${sparrowVersion}"
         skipInstaller = os.macOsX || properties.skipInstallers
         imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/asc.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
         if(os.windows) {
             installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-menu-group', 'Sparrow', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
             imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
@@ -283,6 +291,16 @@ jlink {
     }
 }
 
+tasks.jlink.finalizedBy "addUserWritePermission"
+
+task addUserWritePermission(type: Exec) {
+    if(os.windows) {
+        commandLine 'icacls', "$buildDir\\image\\legal", '/grant', 'Users:(OI)(CI)F', '/T'
+    } else {
+        commandLine 'chmod', '-R', 'u+w', "$buildDir/image/legal"
+    }
+}
+
 task removeGroupWritePermission(type: Exec) {
     commandLine 'chmod', '-R', 'g-w', "$buildDir/jpackage/Sparrow"
 }
@@ -405,41 +423,16 @@ extraJavaModuleInfo {
     module('javacsv-2.0.jar', 'net.sourceforge.javacsv', '2.0') {
         exports('com.csvreader')
     }
-    module('jul-to-slf4j-1.7.30.jar', 'org.slf4j.jul.to.slf4j', '1.7.30') {
-        exports('org.slf4j.bridge')
-        requires('java.logging')
-        requires('org.slf4j')
-    }
     module('jeromq-0.5.0.jar', 'jeromq', '0.5.0') {
         exports('org.zeromq')
     }
     module('json-simple-1.1.1.jar', 'json.simple', '1.1.1') {
         exports('org.json.simple')
-    }
-    module('logback-classic-1.2.8.jar', 'logback.classic', '1.2.8') {
-        exports('ch.qos.logback.classic')
-        requires('org.slf4j')
-        requires('logback.core')
-        requires('java.xml')
-        requires('java.logging')
-    }
-    module('failureaccess-1.0.1.jar', 'failureaccess', '1.0.1') {
-        exports('com.google.common.util.concurrent.internal')
+        exports('org.json.simple.parser')
     }
     module('listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar', 'com.google.guava.listenablefuture', '9999.0-empty-to-avoid-conflict-with-guava')
-    module('guava-31.1-jre.jar', 'com.google.common', '31.1-jre') {
-        exports('com.google.common.eventbus')
-        exports('com.google.common.net')
-        exports('com.google.common.base')
-        exports('com.google.common.collect')
-        exports('com.google.common.io')
-        exports('com.google.common.primitives')
-        exports('com.google.common.math')
-        requires('failureaccess')
-        requires('java.logging')
-    }
     module('jsr305-3.0.2.jar', 'com.google.code.findbugs.jsr305', '3.0.2')
-    module('j2objc-annotations-1.3.jar', 'com.google.j2objc.j2objc.annotations', '1.3')
+    module('j2objc-annotations-2.8.jar', 'com.google.j2objc.j2objc.annotations', '2.8')
     module('jdbi3-core-3.20.0.jar', 'org.jdbi.v3.core', '3.20.0') {
         exports('org.jdbi.v3.core')
         exports('org.jdbi.v3.core.mapper')
@@ -450,6 +443,7 @@ extraJavaModuleInfo {
         requires('io.leangen.geantyref')
         requires('java.sql')
         requires('org.slf4j')
+        requires('com.github.benmanes.caffeine')
     }
     module('geantyref-1.3.11.jar', 'io.leangen.geantyref', '1.3.11') {
         exports('io.leangen.geantyref')
@@ -508,65 +502,21 @@ extraJavaModuleInfo {
         exports('co.nstant.in.cbor.model')
         exports('co.nstant.in.cbor.builder')
     }
-    module('nightjar-0.2.36.jar', 'com.sparrowwallet.nightjar', '0.2.36') {
-        requires('com.google.common')
-        requires('net.sourceforge.streamsupport')
-        requires('org.slf4j')
-        requires('org.bouncycastle.provider')
-        requires('com.fasterxml.jackson.databind')
-        requires('com.fasterxml.jackson.annotation')
-        requires('com.fasterxml.jackson.core')
-        requires('logback.classic')
-        requires('org.json')
-        requires('io.reactivex.rxjava2')
-        exports('com.samourai.http.client')
-        exports('com.samourai.tor.client')
-        exports('com.samourai.wallet.api.backend')
-        exports('com.samourai.wallet.api.backend.beans')
-        exports('com.samourai.wallet.client.indexHandler')
-        exports('com.samourai.wallet.hd')
-        exports('com.samourai.wallet.util')
-        exports('com.samourai.wallet.bip47.rpc')
-        exports('com.samourai.wallet.bip47.rpc.java')
-        exports('com.samourai.wallet.cahoots')
-        exports('com.samourai.wallet.cahoots.psbt')
-        exports('com.samourai.wallet.cahoots.stonewallx2')
-        exports('com.samourai.soroban.cahoots')
-        exports('com.samourai.soroban.client')
-        exports('com.samourai.soroban.client.cahoots')
-        exports('com.samourai.soroban.client.meeting')
-        exports('com.samourai.soroban.client.rpc')
-        exports('com.samourai.wallet.send')
-        exports('com.samourai.whirlpool.client.event')
-        exports('com.samourai.whirlpool.client.wallet')
-        exports('com.samourai.whirlpool.client.wallet.beans')
-        exports('com.samourai.whirlpool.client.wallet.data.dataSource')
-        exports('com.samourai.whirlpool.client.wallet.data.dataPersister')
-        exports('com.samourai.whirlpool.client.whirlpool')
-        exports('com.samourai.whirlpool.client.whirlpool.beans')
-        exports('com.samourai.whirlpool.client.wallet.data.pool')
-        exports('com.samourai.whirlpool.client.wallet.data.utxo')
-        exports('com.samourai.whirlpool.client.wallet.data.utxoConfig')
-        exports('com.samourai.whirlpool.client.wallet.data.supplier')
-        exports('com.samourai.whirlpool.client.mix.handler')
-        exports('com.samourai.whirlpool.client.mix.listener')
-        exports('com.samourai.whirlpool.protocol.beans')
-        exports('com.samourai.whirlpool.protocol.rest')
-        exports('com.samourai.whirlpool.client.tx0')
-        exports('com.samourai.wallet.segwit.bech32')
-        exports('com.samourai.whirlpool.client.wallet.data.chain')
-        exports('com.samourai.whirlpool.client.wallet.data.wallet')
-        exports('com.samourai.whirlpool.client.wallet.data.minerFee')
-        exports('com.samourai.whirlpool.client.wallet.data.walletState')
-        exports('com.sparrowwallet.nightjar.http')
-        exports('com.sparrowwallet.nightjar.stomp')
-        exports('com.sparrowwallet.nightjar.tor')
+    module('commons-codec-1.10.jar', 'commons.codec', '1.10') {
+        exports('org.apache.commons.codec')
     }
-    module('throwing-supplier-1.0.3.jar', 'zeroleak.throwingsupplier', '1.0.3') {
-        exports('com.zeroleak.throwingsupplier')
+    module('logback-core-1.2.13.jar', 'ch.qos.logback.core', '1.2.13') {
+        exports('ch.qos.logback.core')
     }
-    module('okhttp-2.7.5.jar', 'com.squareup.okhttp', '2.7.5') {
-        exports('com.squareup.okhttp')
+    module('jackson-datatype-jsr310-2.13.2.jar', 'jackson-datatype-jsr310', '2.13.2') {
+        exports('com.fasterxml.jackson.datatype.jsr310')
+    }
+    module('json-20240205.jar', 'org.json', '20240205') {
+        exports('org.json')
+    }
+    module('scrypt-1.4.0.jar', 'scrypt', '1.4.0') {
+        exports('com.lambdaworks.codec')
+        exports('com.lambdaworks.crypto')
     }
     module('okio-1.6.0.jar', 'com.squareup.okio', '1.6.0') {
         exports('okio')
@@ -574,22 +524,12 @@ extraJavaModuleInfo {
     module('java-jwt-3.8.1.jar', 'com.auth0.jwt', '3.8.1') {
         exports('com.auth0.jwt')
     }
-    module('json-20180130.jar', 'org.json', '1.0') {
-        exports('org.json')
-    }
-    module('scrypt-1.4.0.jar', 'com.lambdaworks.scrypt', '1.4.0') {
-        exports('com.lambdaworks.codec')
-        exports('com.lambdaworks.crypto')
-    }
     module('streamsupport-1.7.0.jar', 'net.sourceforge.streamsupport', '1.7.0') {
         requires('jdk.unsupported')
         exports('java8.util')
         exports('java8.util.function')
         exports('java8.util.stream')
     }
-    module('protobuf-java-2.6.1.jar', 'com.google.protobuf', '2.6.1') {
-        exports('com.google.protobuf')
-    }
     module('commons-text-1.2.jar', 'org.apache.commons.text', '1.2') {
         exports('org.apache.commons.text')
     }
@@ -719,15 +659,10 @@ extraJavaModuleInfo {
         exports('io.matthewnelson.component.parcelize')
     }
     module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
-    module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
-        requires('java.xml')
-    }
     module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
         exports('com.beust.jcommander')
     }
-    module('junit-4.12.jar', 'junit', '4.12') {
-        exports('org.junit')
-        requires('org.hamcrest.core')
+    module('jzlib-1.1.3.jar', 'com.jcraft.jzlib', '1.1.3') {
+        exports('com.jcraft.jzlib')
     }
-    module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3')
 }

buildSrc/build.gradle

@@ -3,9 +3,9 @@ plugins {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:8.0.1'
-    implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
-    implementation 'org.javamodularity:moduleplugin:1.8.12'
+    implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.3'
+    implementation 'org.javamodularity:moduleplugin:1.8.14'
+    implementation 'org.ow2.asm:asm:9.6'
 }
 
 repositories {

docs/reproducible.md

@@ -42,7 +42,7 @@ Check if key fingerprint matches: `3B04D753C9050D9A5D343F39843C48A565F8F04B`:
 ```
 gpg --import --import-options show-only adoptium.asc
 ```
-If key doesn't match, do not procede.
+If key doesn't match, do not proceed.
 
 Add Adoptium PGP key to a the keyring shared folder:
 ```sh
@@ -82,7 +82,7 @@ sudo apt install -y rpm fakeroot binutils
 First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
 
 ```shell
-GIT_TAG="1.7.7"
+GIT_TAG="1.8.5"
 ```
 
 The project can then be initially cloned as follows:

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

src/main/deploy/asc.properties

@@ -0,0 +1,3 @@
+mime-type=application/pgp-signature
+extension=asc
+description=ASCII Armored File

src/main/deploy/package/linux/Sparrow.desktop

@@ -6,5 +6,5 @@ Icon=/opt/sparrow/lib/Sparrow.png
 Terminal=false
 Type=Application
 Categories=Finance;Network;
-MimeType=application/psbt;application/bitcoin-transaction;x-scheme-handler/bitcoin;x-scheme-handler/auth47;x-scheme-handler/lightning
+MimeType=application/psbt;application/bitcoin-transaction;application/pgp-signature;x-scheme-handler/bitcoin;x-scheme-handler/auth47;x-scheme-handler/lightning
 StartupWMClass=Sparrow

src/main/deploy/package/osx/Info.plist

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.7.8</string>
+  <string>1.8.6</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -94,6 +94,21 @@
           <key>UTTypeIconFile</key>
           <string>sparrow.icns</string>
       </dict>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>com.sparrowwallet.asc</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>asc</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>ASCII Armored File</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
   </array>
  <key>CFBundleDocumentTypes</key>
  <array>

src/main/java/com/sparrowwallet/sparrow/AppController.java

@@ -21,6 +21,8 @@ import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
@@ -77,6 +79,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.sparrow.AppServices.*;
+import static com.sparrowwallet.sparrow.control.DownloadVerifierDialog.*;
 
 public class AppController implements Initializable {
     private static final Logger log = LoggerFactory.getLogger(AppController.class);
@@ -107,6 +110,9 @@ public class AppController implements Initializable {
     @FXML
     private MenuItem exportWallet;
 
+    @FXML
+    private MenuItem renameWallet;
+
     @FXML
     private MenuItem deleteWallet;
 
@@ -166,6 +172,9 @@ public class AppController implements Initializable {
     @FXML
     private MenuItem lockAllWallets;
 
+    @FXML
+    private MenuItem showWalletSummary;
+
     @FXML
     private MenuItem searchWallet;
 
@@ -192,7 +201,7 @@ public class AppController implements Initializable {
     private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();
 
     @FXML
-    private MenuItem restart;
+    private Menu restart;
 
     @FXML
     private StackPane rootStack;
@@ -206,12 +215,18 @@ public class AppController implements Initializable {
     @FXML
     private UnlabeledToggleSwitch serverToggle;
 
+    private Storage.KeyDerivationService keyDerivationService;
+
     private PauseTransition wait;
 
     private Timeline statusTimeline;
 
+    private SearchWalletDialog searchWalletDialog;
+
     private SendToManyDialog sendToManyDialog;
 
+    private DownloadVerifierDialog downloadVerifierDialog;
+
     private Tab previouslySelectedTab;
 
     private boolean subTabsVisible;
@@ -269,9 +284,18 @@ public class AppController implements Initializable {
     void initializeView() {
         setPlatformApplicationMenu();
 
+        rootStack.getScene().getWindow().setOnHiding(windowEvent -> {
+            if(searchWalletDialog != null && searchWalletDialog.isShowing()) {
+                searchWalletDialog.close();
+            }
+            if(sendToManyDialog != null && sendToManyDialog.isShowing()) {
+                sendToManyDialog.close();
+            }
+        });
+
         rootStack.setOnDragOver(event -> {
             if(event.getGestureSource() != rootStack && event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
+                event.acceptTransferModes(TransferMode.LINK);
             }
             event.consume();
         });
@@ -280,9 +304,7 @@ public class AppController implements Initializable {
             Dragboard db = event.getDragboard();
             boolean success = false;
             if(db.hasFiles()) {
-                for(File file : db.getFiles()) {
-                    openFile(file);
-                }
+                openFiles(db.getFiles());
                 success = true;
             }
             event.setDropCompleted(success);
@@ -324,6 +346,10 @@ public class AppController implements Initializable {
             EventManager.get().post(new OpenWalletsEvent(tabs.getScene().getWindow(), Collections.emptyList()));
         });
 
+        tabs.setPickOnBounds(false);
+
+        registerShortcuts();
+
         BitcoinUnit unit = Config.get().getBitcoinUnit();
         if(unit == null) {
             unit = BitcoinUnit.AUTO;
@@ -367,7 +393,17 @@ public class AppController implements Initializable {
         showLoadingLog.selectedProperty().bindBidirectional(showLoadingLogProperty);
         preventSleepProperty.set(Config.get().isPreventSleep());
         preventSleep.selectedProperty().bindBidirectional(preventSleepProperty);
-        restart.setText("Restart in " + (Network.get() == Network.MAINNET ? Network.TESTNET.toDisplayString() : Network.MAINNET.toDisplayString()));
+
+        MenuItem homeItem = new MenuItem("Home Folder...");
+        homeItem.setOnAction(this::restartInHome);
+        restart.getItems().add(homeItem);
+        List<Network> networks = new ArrayList<>(List.of(Network.MAINNET, Network.TESTNET, Network.SIGNET));
+        networks.remove(Network.get());
+        for(Network network : networks) {
+            MenuItem networkItem = new MenuItem(network.toDisplayString());
+            networkItem.setOnAction(event -> restart(event, network));
+            restart.getItems().add(networkItem);
+        }
         restart.setVisible(System.getProperty(JPACKAGE_APP_PATH) != null);
 
         saveTransaction.setDisable(true);
@@ -377,9 +413,11 @@ public class AppController implements Initializable {
         savePSBTBinary.disableProperty().bind(saveTransaction.visibleProperty());
         showPSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
         exportWallet.setDisable(true);
+        renameWallet.disableProperty().bind(exportWallet.disableProperty());
         deleteWallet.disableProperty().bind(exportWallet.disableProperty());
         closeTab.setDisable(true);
         lockWallet.setDisable(true);
+        showWalletSummary.disableProperty().bind(exportWallet.disableProperty());
         searchWallet.disableProperty().bind(exportWallet.disableProperty());
         refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
         sendToMany.disableProperty().bind(exportWallet.disableProperty());
@@ -404,6 +442,22 @@ public class AppController implements Initializable {
         setNetworkLabel();
     }
 
+    private void registerShortcuts() {
+        org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
+        if(platform == org.controlsfx.tools.Platform.OSX) {
+            tabs.getScene().addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+                if(event.isShortcutDown() && event.isAltDown() && (event.getCode() == KeyCode.LEFT || event.getCode() == KeyCode.RIGHT)) {
+                    int currentIndex = tabs.getSelectionModel().getSelectedIndex();
+                    if(event.getCode() == KeyCode.LEFT && currentIndex > 0) {
+                        tabs.getSelectionModel().select(currentIndex - 1);
+                    } else if(event.getCode() == KeyCode.RIGHT && currentIndex < tabs.getTabs().size() - 1) {
+                        tabs.getSelectionModel().select(currentIndex + 1);
+                    }
+                }
+            });
+        }
+    }
+
     private void setPlatformApplicationMenu() {
         org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
         if(platform == org.controlsfx.tools.Platform.OSX) {
@@ -447,6 +501,7 @@ public class AppController implements Initializable {
 
     public void showIntroduction(ActionEvent event) {
         WelcomeDialog welcomeDialog = new WelcomeDialog();
+        welcomeDialog.initOwner(rootStack.getScene().getWindow());
         Optional<Mode> optionalMode = welcomeDialog.showAndWait();
         if(optionalMode.isPresent() && optionalMode.get().equals(Mode.ONLINE)) {
             openPreferences(PreferenceGroup.SERVER);
@@ -534,7 +589,8 @@ public class AppController implements Initializable {
     }
 
     public void showInstallUdevMessage() {
-        TextAreaDialog dialog = new TextAreaDialog("sudo " + Config.get().getHwi().getAbsolutePath() + " installudevrules");
+        TextAreaDialog dialog = new TextAreaDialog("sudo " + Config.get().getHwi().getAbsolutePath() + " installudevrules", false);
+        dialog.initOwner(rootStack.getScene().getWindow());
         dialog.setTitle("Install Udev Rules");
         dialog.getDialogPane().setHeaderText("Installing udev rules ensures devices can connect over USB.\nThis command requires root privileges.\nOpen a shell and enter the following:");
         dialog.showAndWait();
@@ -552,9 +608,11 @@ public class AppController implements Initializable {
         );
 
         AppServices.moveToActiveWindowScreen(window, 800, 450);
-        File file = fileChooser.showOpenDialog(window);
-        if (file != null) {
-            openTransactionFile(file);
+        List<File> files = fileChooser.showOpenMultipleDialog(window);
+        if(files != null) {
+            for(File file : files) {
+                openTransactionFile(file);
+            }
         }
     }
 
@@ -596,13 +654,14 @@ public class AppController implements Initializable {
             } catch(TransactionParseException e) {
                 showErrorDialog("Invalid transaction", e.getMessage());
             } catch(Exception e) {
-                showErrorDialog("Invalid file", e.getMessage());
+                showErrorDialog("Invalid file", "Cannot recognise the format of the " + file.getName() + " file.");
             }
         }
     }
 
     public void openTransactionFromText(ActionEvent event) {
         TextAreaDialog dialog = new TextAreaDialog();
+        dialog.initOwner(rootStack.getScene().getWindow());
         dialog.setTitle("Open from text");
         dialog.getDialogPane().setHeaderText("Paste a transaction or PSBT:");
         Optional<String> text = dialog.showAndWait();
@@ -621,6 +680,7 @@ public class AppController implements Initializable {
 
     public void openTransactionFromId(ActionEvent event) {
         TransactionIdDialog dialog = new TransactionIdDialog();
+        dialog.initOwner(rootStack.getScene().getWindow());
         Optional<Sha256Hash> optionalTxId = dialog.showAndWait();
         if(optionalTxId.isPresent()) {
             Sha256Hash txId = optionalTxId.get();
@@ -648,6 +708,7 @@ public class AppController implements Initializable {
 
     public void openTransactionFromQR(ActionEvent event) {
         QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(rootStack.getScene().getWindow());
         Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
         if(optionalResult.isPresent()) {
             QRScanDialog.Result result = optionalResult.get();
@@ -709,8 +770,11 @@ public class AppController implements Initializable {
             Transaction transaction = transactionTabData.getTransaction();
 
             try {
-                UR ur = UR.fromBytes(transaction.bitcoinSerialize());
-                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur);
+                byte[] txBytes = transaction.bitcoinSerialize();
+                UR ur = UR.fromBytes(txBytes);
+                BBQR bbqr = new BBQR(BBQRType.TXN, txBytes);
+                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, false, false);
+                qrDisplayDialog.initOwner(rootStack.getScene().getWindow());
                 qrDisplayDialog.showAndWait();
             } catch(Exception e) {
                 log.error("Error creating UR", e);
@@ -807,8 +871,11 @@ public class AppController implements Initializable {
         if(tabData.getType() == TabData.TabType.TRANSACTION) {
             TransactionTabData transactionTabData = (TransactionTabData)tabData;
 
-            CryptoPSBT cryptoPSBT = new CryptoPSBT(transactionTabData.getPsbt().serialize());
-            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR());
+            byte[] psbtBytes = transactionTabData.getPsbt().serialize();
+            CryptoPSBT cryptoPSBT = new CryptoPSBT(psbtBytes);
+            BBQR bbqr = new BBQR(BBQRType.PSBT, psbtBytes);
+            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR(), bbqr, false, true, false);
+            qrDisplayDialog.initOwner(rootStack.getScene().getWindow());
             qrDisplayDialog.show();
         }
     }
@@ -922,19 +989,46 @@ public class AppController implements Initializable {
         AppServices.get().setPreventSleep(item.isSelected());
     }
 
-    public void restart(ActionEvent event) {
+    public void restartInHome(ActionEvent event) {
+        Args args = getRestartArgs();
+        File initialDir = null;
+        if(args.dir != null) {
+            initialDir = new File(args.dir);
+        }
+
+        Stage window = new Stage();
+        DirectoryChooser directoryChooser = new DirectoryChooser();
+        directoryChooser.setTitle("Choose Sparrow Home Folder");
+        directoryChooser.setInitialDirectory(initialDir == null || !initialDir.exists() ? Storage.getSparrowHome() : initialDir);
+        File newHome = directoryChooser.showDialog(window);
+
+        if(newHome != null) {
+            args.dir = newHome.getAbsolutePath();
+            restart(event, args);
+        }
+    }
+
+    public void restart(ActionEvent event, Network network) {
         if(System.getProperty(JPACKAGE_APP_PATH) == null) {
             throw new IllegalStateException("Property " + JPACKAGE_APP_PATH + " is not present");
         }
 
+        Args args = getRestartArgs();
+        args.network = network;
+        restart(event, args);
+    }
+
+    private static Args getRestartArgs() {
         Args args = new Args();
         ProcessHandle.current().info().arguments().ifPresent(argv -> {
             JCommander jCommander = JCommander.newBuilder().addObject(args).acceptUnknownOptions(true).build();
             jCommander.parse(argv);
         });
 
-        args.network = (Network.get() == Network.MAINNET ? Network.TESTNET : Network.MAINNET);
+        return args;
+    }
 
+    private void restart(ActionEvent event, Args args) {
         try {
             List<String> cmd = new ArrayList<>();
             cmd.add(System.getProperty(JPACKAGE_APP_PATH));
@@ -947,11 +1041,19 @@ public class AppController implements Initializable {
         }
     }
 
-    public void openFile(File file) {
-        if(isWalletFile(file)) {
-            openWalletFile(file, true);
-        } else {
-            openTransactionFile(file);
+    public void openFiles(List<File> files) {
+        boolean verifyOpened = false;
+        for(File file : files) {
+            if(isWalletFile(file)) {
+                openWalletFile(file, true);
+            } else if(isVerifyDownloadFile(file)) {
+                if(!verifyOpened) {
+                    verifyDownload(new ActionEvent(file, rootStack));
+                    verifyOpened = true;
+                }
+            } else {
+                openTransactionFile(file);
+            }
         }
     }
 
@@ -974,6 +1076,7 @@ public class AppController implements Initializable {
 
     public void newWallet(ActionEvent event) {
         WalletNameDialog dlg = new WalletNameDialog();
+        dlg.initOwner(rootStack.getScene().getWindow());
         Optional<WalletNameDialog.NameAndBirthDate> optNameAndBirthDate = dlg.showAndWait();
         if(optNameAndBirthDate.isPresent()) {
             WalletNameDialog.NameAndBirthDate nameAndBirthDate = optNameAndBirthDate.get();
@@ -995,9 +1098,11 @@ public class AppController implements Initializable {
         fileChooser.setInitialDirectory(Storage.getWalletsDir());
 
         AppServices.moveToActiveWindowScreen(window, 800, 450);
-        File file = fileChooser.showOpenDialog(window);
-        if(file != null) {
-            openWalletFile(file, forceSameWindow);
+        List<File> files = fileChooser.showOpenMultipleDialog(window);
+        if(files != null) {
+            for(File file : files) {
+                openWalletFile(file, forceSameWindow);
+            }
         }
     }
 
@@ -1023,6 +1128,7 @@ public class AppController implements Initializable {
                 loadWalletService.start();
             } else {
                 WalletPasswordDialog dlg = new WalletPasswordDialog(storage.getWalletName(null), WalletPasswordDialog.PasswordRequirement.LOAD);
+                dlg.initOwner(rootStack.getScene().getWindow());
                 Optional<SecureString> optionalPassword = dlg.showAndWait();
                 if(optionalPassword.isEmpty()) {
                     return;
@@ -1091,6 +1197,7 @@ public class AppController implements Initializable {
     public void importWallet(ActionEvent event) {
         List<WalletForm> selectedWalletForms = getSelectedWalletForms();
         WalletImportDialog dlg = new WalletImportDialog(selectedWalletForms);
+        dlg.initOwner(rootStack.getScene().getWindow());
         Optional<Wallet> optionalWallet = dlg.showAndWait();
         if(optionalWallet.isPresent()) {
             Wallet wallet = optionalWallet.get();
@@ -1128,6 +1235,7 @@ public class AppController implements Initializable {
             try(FileInputStream inputStream = new FileInputStream(file)) {
                 if(importer.isEncrypted(file) && password == null) {
                     WalletPasswordDialog dlg = new WalletPasswordDialog(file.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    dlg.initOwner(rootStack.getScene().getWindow());
                     Optional<SecureString> optionalPassword = dlg.showAndWait();
                     if(optionalPassword.isPresent()) {
                         password = optionalPassword.get();
@@ -1150,6 +1258,7 @@ public class AppController implements Initializable {
 
     private void addImportedWallet(Wallet wallet) {
         WalletNameDialog nameDlg = new WalletNameDialog(wallet.getName(), true, wallet.getBirthDate());
+        nameDlg.initOwner(rootStack.getScene().getWindow());
         Optional<WalletNameDialog.NameAndBirthDate> optNameAndBirthDate = nameDlg.showAndWait();
         if(optNameAndBirthDate.isPresent()) {
             WalletNameDialog.NameAndBirthDate nameAndBirthDate = optNameAndBirthDate.get();
@@ -1195,6 +1304,7 @@ public class AppController implements Initializable {
 
         Storage storage = new Storage(Storage.getWalletFile(wallet.getName()));
         WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getName(), WalletPasswordDialog.PasswordRequirement.UPDATE_NEW);
+        dlg.initOwner(rootStack.getScene().getWindow());
         Optional<SecureString> password = dlg.showAndWait();
         if(password.isPresent()) {
             if(password.get().length() == 0) {
@@ -1214,7 +1324,7 @@ public class AppController implements Initializable {
                     log.error("Error saving imported wallet", e);
                 }
             } else {
-                Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get());
+                keyDerivationService = new Storage.KeyDerivationService(storage, password.get());
                 keyDerivationService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(Storage.getWalletFile(wallet.getName()).getAbsolutePath(), TimedEvent.Action.END, "Done"));
                     ECKey encryptionFullKey = keyDerivationService.getValue();
@@ -1245,11 +1355,13 @@ public class AppController implements Initializable {
                         if(key != null) {
                             key.clear();
                         }
+                        keyDerivationService = null;
                     }
                 });
                 keyDerivationService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(Storage.getWalletFile(wallet.getName()).getAbsolutePath(), TimedEvent.Action.END, "Failed"));
                     showErrorDialog("Error encrypting wallet", keyDerivationService.getException().getMessage());
+                    keyDerivationService = null;
                 });
                 EventManager.get().post(new StorageEvent(Storage.getWalletFile(wallet.getName()).getAbsolutePath(), TimedEvent.Action.START, "Encrypting wallet..."));
                 keyDerivationService.start();
@@ -1260,7 +1372,8 @@ public class AppController implements Initializable {
     public void exportWallet(ActionEvent event) {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
-            WalletExportDialog dlg = new WalletExportDialog(selectedWalletForm.getWallet());
+            WalletExportDialog dlg = new WalletExportDialog(selectedWalletForm);
+            dlg.initOwner(rootStack.getScene().getWindow());
             Optional<Wallet> wallet = dlg.showAndWait();
             if(wallet.isPresent()) {
                 //Successful export
@@ -1278,6 +1391,7 @@ public class AppController implements Initializable {
 
     private void openPreferences(PreferenceGroup preferenceGroup) {
         PreferencesDialog preferencesDialog = new PreferencesDialog(preferenceGroup);
+        preferencesDialog.initOwner(rootStack.getScene().getWindow());
         preferencesDialog.showAndWait();
         configureSwitchServer();
         serverToggle.setDisable(!Config.get().hasServer());
@@ -1288,8 +1402,7 @@ public class AppController implements Initializable {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
             Wallet wallet = selectedWalletForm.getWallet();
-            if(wallet.getKeystores().size() == 1 &&
-                    (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
+            if(wallet.getKeystores().size() == 1) {
                 //Can sign and verify
                 messageSignDialog = new MessageSignDialog(wallet);
             }
@@ -1300,6 +1413,7 @@ public class AppController implements Initializable {
             messageSignDialog = new MessageSignDialog();
         }
 
+        messageSignDialog.initOwner(rootStack.getScene().getWindow());
         messageSignDialog.showAndWait();
     }
 
@@ -1340,6 +1454,7 @@ public class AppController implements Initializable {
         }
 
         PrivateKeySweepDialog dialog = new PrivateKeySweepDialog(wallet);
+        dialog.initOwner(rootStack.getScene().getWindow());
         Optional<Transaction> optTransaction = dialog.showAndWait();
         optTransaction.ifPresent(transaction -> addTransactionTab(null, null, transaction));
     }
@@ -1353,10 +1468,11 @@ public class AppController implements Initializable {
                 if(wallet.isEncrypted()) {
                     Wallet copy = wallet.copy();
                     WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    dlg.initOwner(rootStack.getScene().getWindow());
                     Optional<SecureString> password = dlg.showAndWait();
                     if(password.isPresent()) {
                         Storage storage = selectedWalletForm.getStorage();
-                        Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
+                        keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
                         keyDerivationService.setOnSucceeded(workerStateEvent -> {
                             EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Done"));
                             ECKey encryptionFullKey = keyDerivationService.getValue();
@@ -1366,6 +1482,7 @@ public class AppController implements Initializable {
                             try {
                                 soroban.setHDWallet(copy);
                                 CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
                                 if(Config.get().isSameAppMixing()) {
                                     counterpartyDialog.initModality(Modality.NONE);
                                 }
@@ -1373,7 +1490,7 @@ public class AppController implements Initializable {
                             } finally {
                                 key.clear();
                                 encryptionFullKey.clear();
-                                password.get().clear();
+                                keyDerivationService = null;
                             }
                         });
                         keyDerivationService.setOnFailed(workerStateEvent -> {
@@ -1386,6 +1503,7 @@ public class AppController implements Initializable {
                             } else {
                                 log.error("Error deriving wallet key", keyDerivationService.getException());
                             }
+                            keyDerivationService = null;
                         });
                         EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
                         keyDerivationService.start();
@@ -1393,6 +1511,7 @@ public class AppController implements Initializable {
                 } else {
                     soroban.setHDWallet(wallet);
                     CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                    counterpartyDialog.initOwner(rootStack.getScene().getWindow());
                     if(Config.get().isSameAppMixing()) {
                         counterpartyDialog.initModality(Modality.NONE);
                     }
@@ -1400,6 +1519,7 @@ public class AppController implements Initializable {
                 }
             } else {
                 CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
                 if(Config.get().isSameAppMixing()) {
                     counterpartyDialog.initModality(Modality.NONE);
                 }
@@ -1412,10 +1532,28 @@ public class AppController implements Initializable {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
             PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId());
+            payNymDialog.initOwner(rootStack.getScene().getWindow());
             payNymDialog.showAndWait();
         }
     }
 
+    public void verifyDownload(ActionEvent event) {
+        if(downloadVerifierDialog != null) {
+            Stage stage = (Stage)downloadVerifierDialog.getDialogPane().getScene().getWindow();
+            stage.setAlwaysOnTop(true);
+            stage.setAlwaysOnTop(false);
+            if(event.getSource() instanceof File file) {
+                downloadVerifierDialog.setSignatureFile(file);
+            }
+            return;
+        }
+
+        downloadVerifierDialog = new DownloadVerifierDialog(event.getSource() instanceof File file ? file : null);
+        downloadVerifierDialog.initOwner(rootStack.getScene().getWindow());
+        downloadVerifierDialog.showAndWait();
+        downloadVerifierDialog = null;
+    }
+
     public void minimizeToTray(ActionEvent event) {
         AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
     }
@@ -1457,13 +1595,85 @@ public class AppController implements Initializable {
                 TabPane subTabs = (TabPane) selectedTab.getContent();
                 List<WalletForm> walletForms = subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm()).collect(Collectors.toList());
                 if(!walletForms.isEmpty()) {
-                    SearchWalletDialog searchWalletDialog = new SearchWalletDialog(walletForms);
-                    Optional<Entry> optEntry = searchWalletDialog.showAndWait();
-                    if(optEntry.isPresent()) {
-                        Entry entry = optEntry.get();
-                        EventManager.get().post(new FunctionActionEvent(entry.getWalletFunction(), entry.getWallet()));
-                        Platform.runLater(() -> EventManager.get().post(new SelectEntryEvent(entry)));
-                    }
+                    searchWallets(walletForms);
+                }
+            }
+        }
+    }
+
+    public void searchAllWallets(ActionEvent event) {
+        List<WalletForm> allWalletForms = new ArrayList<>();
+        for(Tab tab : tabs.getTabs()) {
+            TabData tabData = (TabData)tab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane)tab.getContent();
+                allWalletForms.addAll(subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm())
+                        .filter(walletForm -> walletForm.getWallet().isValid() && !walletForm.isLocked()).collect(Collectors.toList()));
+            }
+        }
+
+        if(allWalletForms.isEmpty()) {
+            showErrorDialog("No wallets", "There are no open and unlocked wallets to search.");
+        } else {
+            searchWallets(allWalletForms);
+        }
+    }
+
+    private void searchWallets(List<WalletForm> walletForms) {
+        if(searchWalletDialog != null) {
+            if(!searchWalletDialog.getWalletForms().equals(walletForms)) {
+                searchWalletDialog.close();
+            } else {
+                Stage stage = (Stage)searchWalletDialog.getDialogPane().getScene().getWindow();
+                stage.setAlwaysOnTop(true);
+                stage.setAlwaysOnTop(false);
+                return;
+            }
+        }
+
+        Platform.runLater(() -> {
+            searchWalletDialog = new SearchWalletDialog(walletForms);
+            searchWalletDialog.initModality(Modality.NONE);
+            Optional<Entry> optEntry = searchWalletDialog.showAndWait();
+            if(optEntry.isPresent()) {
+                Entry entry = optEntry.get();
+                EventManager.get().post(new FunctionActionEvent(entry.getWalletFunction(), entry.getWallet()));
+                Platform.runLater(() -> EventManager.get().post(new SelectEntryEvent(entry)));
+            }
+            searchWalletDialog = null;
+        });
+    }
+
+    public void showAllWalletsSummary(ActionEvent event) {
+        List<List<WalletForm>> allWalletForms = new ArrayList<>();
+        for(Tab tab : tabs.getTabs()) {
+            if(tab.getUserData() instanceof WalletTabData) {
+                TabPane subTabs = (TabPane)tab.getContent();
+                allWalletForms.add(subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm())
+                        .filter(walletForm -> walletForm.getWallet().isValid() && !walletForm.isLocked()).collect(Collectors.toList()));
+            }
+        }
+
+        if(allWalletForms.isEmpty() || allWalletForms.stream().allMatch(List::isEmpty)) {
+            showErrorDialog("No wallets", "There are no open and unlocked wallets to summarize.");
+        } else {
+            WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(allWalletForms);
+            walletSummaryDialog.initOwner(rootStack.getScene().getWindow());
+            walletSummaryDialog.showAndWait();
+        }
+    }
+
+    public void showWalletSummary(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        if(selectedTab != null) {
+            TabData tabData = (TabData) selectedTab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane) selectedTab.getContent();
+                List<WalletForm> walletForms = subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm()).collect(Collectors.toList());
+                if(!walletForms.isEmpty()) {
+                    WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(List.of(walletForms));
+                    walletSummaryDialog.initOwner(rootStack.getScene().getWindow());
+                    walletSummaryDialog.showAndWait();
                 }
             }
         }
@@ -1635,6 +1845,9 @@ public class AppController implements Initializable {
             subTabLabel.setGraphic(getSubTabGlyph(wallet));
             subTabLabel.setContentDisplay(ContentDisplay.TOP);
             subTabLabel.setAlignment(Pos.TOP_CENTER);
+            if(isSubTabLabelTruncated(subTabLabel, label)) {
+                subTabLabel.setTooltip(new Tooltip(label));
+            }
             subTab.setGraphic(subTabLabel);
             FXMLLoader walletLoader = new FXMLLoader(getClass().getResource("wallet/wallet.fxml"));
             subTab.setContent(walletLoader.load());
@@ -1983,6 +2196,7 @@ public class AppController implements Initializable {
 
     private void renameWallet(WalletForm selectedWalletForm) {
         WalletNameDialog walletNameDialog = new WalletNameDialog(selectedWalletForm.getMasterWallet().getName(), false, null, true);
+        walletNameDialog.initOwner(rootStack.getScene().getWindow());
         Optional<WalletNameDialog.NameAndBirthDate> optName = walletNameDialog.showAndWait();
         if(optName.isPresent()) {
             File walletFile = Storage.getWalletFile(optName.get().getName() + "." + PersistenceType.DB.getExtension());
@@ -2011,9 +2225,10 @@ public class AppController implements Initializable {
             Storage storage = selectedWalletForm.getStorage();
             if(selectedWalletForm.getMasterWallet().isEncrypted()) {
                 WalletPasswordDialog dlg = new WalletPasswordDialog(selectedWalletForm.getWallet().getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                dlg.initOwner(rootStack.getScene().getWindow());
                 Optional<SecureString> password = dlg.showAndWait();
                 if(password.isPresent()) {
-                    Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
+                    keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
                     keyDerivationService.setOnSucceeded(workerStateEvent -> {
                         EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Done"));
                         ECKey encryptionFullKey = keyDerivationService.getValue();
@@ -2023,7 +2238,7 @@ public class AppController implements Initializable {
                             deleteStorage(storage, true);
                         } finally {
                             encryptionFullKey.clear();
-                            password.get().clear();
+                            keyDerivationService = null;
                         }
                     });
                     keyDerivationService.setOnFailed(workerStateEvent -> {
@@ -2036,6 +2251,7 @@ public class AppController implements Initializable {
                         } else {
                             log.error("Error deriving wallet key", keyDerivationService.getException());
                         }
+                        keyDerivationService = null;
                     });
                     EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
                     keyDerivationService.start();
@@ -2078,10 +2294,16 @@ public class AppController implements Initializable {
         rename.setOnAction(event -> {
             Label subTabLabel = (Label)subTab.getGraphic();
             WalletLabelDialog walletLabelDialog = new WalletLabelDialog(subTabLabel.getText());
+            walletLabelDialog.initOwner(rootStack.getScene().getWindow());
             Optional<String> optLabel = walletLabelDialog.showAndWait();
             if(optLabel.isPresent()) {
                 String label = optLabel.get();
                 subTabLabel.setText(label);
+                if(isSubTabLabelTruncated(subTabLabel, label)) {
+                    subTabLabel.setTooltip(new Tooltip(label));
+                } else {
+                    subTabLabel.setTooltip(null);
+                }
 
                 Wallet renamedWallet = AppServices.get().getWallet(walletId);
                 renamedWallet.setLabel(label);
@@ -2106,9 +2328,18 @@ public class AppController implements Initializable {
             contextMenu.getItems().add(delete);
         }
 
+        contextMenu.setOnShowing(event -> {
+            Wallet renameWallet = AppServices.get().getWallet(walletId);
+            rename.setDisable(!renameWallet.isValid());
+        });
+
         return contextMenu;
     }
 
+    private boolean isSubTabLabelTruncated(Label subTabLabel, String label) {
+        return TextUtils.computeTextWidth(subTabLabel.getFont(), label, 0.0D) > (90-6);
+    }
+
     private void configureSwitchServer() {
         switchServer.getItems().clear();
 
@@ -2603,7 +2834,7 @@ public class AppController implements Initializable {
     public void disconnection(DisconnectionEvent event) {
         serverToggle.setDisable(false);
         if(!AppServices.isConnecting() && !AppServices.isConnected() && !statusBar.getText().startsWith(CONNECTION_FAILED_PREFIX) && !statusBar.getText().contains(TRYING_ANOTHER_SERVER_MESSAGE)) {
-            statusUpdated(new StatusEvent("Disconnected"));
+            statusUpdated(new StatusEvent("Disconnected (click toggle on the right to connect)", 240));
         }
         if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
             statusBar.setProgress(0);
@@ -2918,6 +3149,13 @@ public class AppController implements Initializable {
         }
     }
 
+    @Subscribe
+    public void requestVerifyDownloadOpen(RequestVerifyDownloadEvent event) {
+        if(tabs.getScene().getWindow().equals(event.getWindow())) {
+            verifyDownload(new ActionEvent(event.getFile(), rootStack));
+        }
+    }
+
     @Subscribe
     public void functionAction(FunctionActionEvent event) {
         selectTab(event.getWallet());

src/main/java/com/sparrowwallet/sparrow/AppServices.java

@@ -24,7 +24,6 @@ import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
-import com.sparrowwallet.sparrow.paynym.PayNymService;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Application;
@@ -34,6 +33,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXMLLoader;
@@ -61,7 +61,6 @@ import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
 import java.net.*;
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
@@ -70,6 +69,8 @@ import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.control.DownloadVerifierDialog.*;
+
 public class AppServices {
     private static final Logger log = LoggerFactory.getLogger(AppServices.class);
 
@@ -80,13 +81,17 @@ public class AppServices {
     private static final int RATES_PERIOD_SECS = 5 * 60;
     private static final int VERSION_CHECK_PERIOD_HOURS = 24;
     private static final int CONNECTION_DELAY_SECS = 2;
+    private static final int RATES_DELAY_SECS_DEFAULT = 2;
+    private static final int RATES_DELAY_SECS_WINDOWS = 5;
     private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
     private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
     private static final String TOR_DEFAULT_PROXY_CIRCUIT_ID = "default";
 
     public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50);
-    public static final List<Long> FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L);
+    public static final List<Long> LONG_FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L, 2048L, 4096L, 8192L);
+    public static final List<Long> FEE_RATES_RANGE = LONG_FEE_RATES_RANGE.subList(0, LONG_FEE_RATES_RANGE.size() - 3);
     public static final double FALLBACK_FEE_RATE = 20000d / 1000;
+    public static final double TESTNET_FALLBACK_FEE_RATE = 1000d / 1000;
 
     private static AppServices INSTANCE;
 
@@ -96,7 +101,7 @@ public class AppServices {
 
     private InteractionServices interactionServices;
 
-    private static PayNymService payNymService;
+    private static HttpClientService httpClientService;
 
     private final Application application;
 
@@ -112,6 +117,8 @@ public class AppServices {
 
     private ElectrumServer.ConnectionService connectionService;
 
+    private ElectrumServer.FeeRatesService feeRatesService;
+
     private Hwi.ScheduledEnumerateService deviceEnumerateService;
 
     private VersionCheckService versionCheckService;
@@ -160,6 +167,11 @@ public class AppServices {
                 connectionService.cancel();
                 ratesService.cancel();
                 versionCheckService.cancel();
+
+                if(httpClientService != null) {
+                    HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
+                    shutdownService.start();
+                }
             }
         }
     };
@@ -183,6 +195,7 @@ public class AppServices {
     public void start() {
         Config config = Config.get();
         connectionService = createConnectionService();
+        feeRatesService = createFeeRatesService();
         ratesService = createRatesService(config.getExchangeSource(), config.getFiatCurrency());
         versionCheckService = createVersionCheckService();
         torService = createTorService();
@@ -196,6 +209,8 @@ public class AppServices {
             } else {
                 restartServices();
             }
+        } else {
+            EventManager.get().post(new DisconnectionEvent());
         }
 
         addURIHandlers();
@@ -247,8 +262,8 @@ public class AppServices {
             versionCheckService.cancel();
         }
 
-        if(payNymService != null) {
-            PayNymService.ShutdownService shutdownService = new PayNymService.ShutdownService(payNymService);
+        if(httpClientService != null) {
+            HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
             shutdownService.start();
         }
 
@@ -279,8 +294,15 @@ public class AppServices {
             onlineProperty.setValue(true);
             onlineProperty.addListener(onlineServicesListener);
 
-            if(connectionService.getValue() != null) {
-                EventManager.get().post(connectionService.getValue());
+            FeeRatesUpdatedEvent event = connectionService.getValue();
+            if(event != null) {
+                EventManager.get().post(event);
+            }
+
+            FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
+            feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
+            if(event instanceof ConnectionEvent && Network.get().equals(Network.MAINNET) && feeRatesSource.isExternal()) {
+                EventManager.get().post(new FeeRatesSourceChangedEvent(feeRatesSource));
             }
         });
         connectionService.setOnFailed(failEvent -> {
@@ -351,10 +373,21 @@ public class AppServices {
         return connectionService;
     }
 
+    private ElectrumServer.FeeRatesService createFeeRatesService() {
+        ElectrumServer.FeeRatesService feeRatesService = new ElectrumServer.FeeRatesService();
+        feeRatesService.setOnSucceeded(workerStateEvent -> {
+            EventManager.get().post(feeRatesService.getValue());
+        });
+
+        return feeRatesService;
+    }
+
     private ExchangeSource.RatesService createRatesService(ExchangeSource exchangeSource, Currency currency) {
         ExchangeSource.RatesService ratesService = new ExchangeSource.RatesService(
                 exchangeSource == null ? DEFAULT_EXCHANGE_SOURCE : exchangeSource,
                 currency == null ? DEFAULT_FIAT_CURRENCY : currency);
+        //Delay startup on first run, Windows requires a longer delay
+        ratesService.setDelay(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS ? Duration.seconds(RATES_DELAY_SECS_WINDOWS) : Duration.seconds(RATES_DELAY_SECS_DEFAULT));
         ratesService.setPeriod(Duration.seconds(RATES_PERIOD_SECS));
         ratesService.setRestartOnFailure(true);
 
@@ -469,7 +502,7 @@ public class AppServices {
     public static Proxy getProxy(String proxyCircuitId) {
         Config config = Config.get();
         Proxy proxy = null;
-        if(config.isUseProxy()) {
+        if(config.isUseProxy() && config.getProxyServer() != null) {
             HostAndPort proxyHostAndPort = HostAndPort.fromString(config.getProxyServer());
             InetSocketAddress proxyAddress = new InetSocketAddress(proxyHostAndPort.getHost(), proxyHostAndPort.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
             proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
@@ -513,18 +546,17 @@ public class AppServices {
         return get().interactionServices;
     }
 
-    public static PayNymService getPayNymService() {
-        if(payNymService == null) {
-            HostAndPort torProxy = getTorProxy();
-            payNymService = new PayNymService(torProxy);
+    public static HttpClientService getHttpClientService() {
+        HostAndPort torProxy = getTorProxy();
+        if(httpClientService == null) {
+            httpClientService = new HttpClientService(torProxy);
         } else {
-            HostAndPort torProxy = getTorProxy();
-            if(!Objects.equals(payNymService.getTorProxy(), torProxy)) {
-                payNymService.setTorProxy(getTorProxy());
+            if(!Objects.equals(httpClientService.getTorProxy(), torProxy)) {
+                httpClientService.setTorProxy(getTorProxy());
             }
         }
 
-        return payNymService;
+        return httpClientService;
     }
 
     public static HostAndPort getTorProxy() {
@@ -565,8 +597,17 @@ public class AppServices {
         return windowIcon;
     }
 
+    public static boolean isReducedWindowHeight() {
+        Window activeWindow = getActiveWindow();
+        return (activeWindow != null && activeWindow.getHeight() < getReducedWindowHeight());
+    }
+
     public static boolean isReducedWindowHeight(Node node) {
-        return (node.getScene() != null && node.getScene().getWindow().getHeight() < 768);
+        return (node.getScene() != null && node.getScene().getWindow().getHeight() < getReducedWindowHeight());
+    }
+
+    private static double getReducedWindowHeight() {
+        return org.controlsfx.tools.Platform.getCurrent() != org.controlsfx.tools.Platform.OSX ? 802d : 768d;  //Check for menu bar of ~34px
     }
 
     public Application getApplication() {
@@ -653,15 +694,19 @@ public class AppServices {
 
     public static Double getDefaultFeeRate() {
         int defaultTarget = TARGET_BLOCKS_RANGE.get((TARGET_BLOCKS_RANGE.size() / 2) - 1);
-        return getTargetBlockFeeRates() == null ? FALLBACK_FEE_RATE : getTargetBlockFeeRates().get(defaultTarget);
+        return getTargetBlockFeeRates() == null ? getFallbackFeeRate() : getTargetBlockFeeRates().get(defaultTarget);
     }
 
     public static Double getMinimumFeeRate() {
         Optional<Double> optMinFeeRate = getTargetBlockFeeRates().values().stream().min(Double::compareTo);
-        Double minRate = optMinFeeRate.orElse(FALLBACK_FEE_RATE);
+        Double minRate = optMinFeeRate.orElse(getFallbackFeeRate());
         return Math.max(minRate, Transaction.DUST_RELAY_TX_FEE);
     }
 
+    public static double getFallbackFeeRate() {
+        return Network.get() == Network.MAINNET ? FALLBACK_FEE_RATE : TESTNET_FALLBACK_FEE_RATE;
+    }
+
     public static Map<Integer, Double> getTargetBlockFeeRates() {
         return targetBlockFeeRates;
     }
@@ -767,7 +812,7 @@ public class AppServices {
     }
 
     public static Window getActiveWindow() {
-        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : null);
+        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : (Stage.getWindows().iterator().hasNext() ? Stage.getWindows().iterator().next() : null));
     }
 
     public static void moveToActiveWindowScreen(Dialog<?> dialog) {
@@ -840,6 +885,25 @@ public class AppServices {
         }
     }
 
+    public static void openFileUriArgumentsAfterWalletLoading(Window window) {
+        if(!argFiles.isEmpty() || !argUris.isEmpty()) {
+            Service<Void> service = new Service<>() {
+                @Override
+                protected Task<Void> createTask() {
+                    return new Task<>() {
+                        @Override
+                        protected Void call() {
+                            Platform.runLater(() -> openFileUriArguments(window));
+                            return null;
+                        }
+                    };
+                }
+            };
+            service.setExecutor(Storage.LoadWalletService.getSingleThreadedExecutor());
+            service.start();
+        }
+    }
+
     public static void openFileUriArguments(Window window) {
         openFiles(argFiles, window);
         argFiles.clear();
@@ -859,6 +923,7 @@ public class AppServices {
             }
 
             if(openWindow instanceof Stage) {
+                ((Stage)openWindow).setIconified(false);
                 ((Stage)openWindow).setAlwaysOnTop(true);
                 ((Stage)openWindow).setAlwaysOnTop(false);
             }
@@ -866,6 +931,8 @@ public class AppServices {
             for(File file : openFiles) {
                 if(isWalletFile(file)) {
                     EventManager.get().post(new RequestWalletOpenEvent(openWindow, file));
+                } else if(isVerifyDownloadFile(file)) {
+                    EventManager.get().post(new RequestVerifyDownloadEvent(openWindow, file));
                 } else {
                     EventManager.get().post(new RequestTransactionOpenEvent(openWindow, file));
                 }
@@ -949,6 +1016,7 @@ public class AppServices {
                     Storage storage = AppServices.get().getOpenWallets().get(wallet);
                     Wallet copy = wallet.copy();
                     WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    dlg.initOwner(getActiveWindow());
                     Optional<SecureString> password = dlg.showAndWait();
                     if(password.isPresent()) {
                         Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
@@ -1011,6 +1079,7 @@ public class AppServices {
             wallet = wallets.iterator().next();
         } else {
             ChoiceDialog<Wallet> walletChoiceDialog = new ChoiceDialog<>(wallets.iterator().next(), wallets);
+            walletChoiceDialog.initOwner(getActiveWindow());
             walletChoiceDialog.setTitle("Choose Wallet");
             walletChoiceDialog.setHeaderText("Choose a wallet to " + actionDescription);
             Image image = new Image("/image/sparrow-small.png");
@@ -1060,17 +1129,18 @@ public class AppServices {
 
     @Subscribe
     public void mempoolRateSizes(MempoolRateSizesUpdatedEvent event) {
-        addMempoolRateSizes(event.getMempoolRateSizes());
+        if(event.getMempoolRateSizes() != null) {
+            addMempoolRateSizes(event.getMempoolRateSizes());
+        }
     }
 
     @Subscribe
     public void feeRateSourceChanged(FeeRatesSourceChangedEvent event) {
-        ElectrumServer.FeeRatesService feeRatesService = new ElectrumServer.FeeRatesService();
-        feeRatesService.setOnSucceeded(workerStateEvent -> {
-            EventManager.get().post(feeRatesService.getValue());
-        });
         //Perform once-off fee rates retrieval to immediately change displayed rates
-        feeRatesService.start();
+        if(feeRatesService != null && !feeRatesService.isRunning() && Config.get().getMode() != Mode.OFFLINE) {
+            feeRatesService = createFeeRatesService();
+            feeRatesService.start();
+        }
     }
 
     @Subscribe

src/main/java/com/sparrowwallet/sparrow/BaseController.java

@@ -12,7 +12,12 @@ import org.fxmisc.richtext.event.MouseOverTextEvent;
 import org.fxmisc.richtext.model.TwoDimensional;
 
 import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import static com.sparrowwallet.drongo.protocol.ScriptType.*;
 import static org.fxmisc.richtext.model.TwoDimensional.Bias.Backward;
 
 public abstract class BaseController {
@@ -24,14 +29,11 @@ public abstract class BaseController {
 
         scriptArea.setMouseOverTextDelay(Duration.ofMillis(150));
         scriptArea.addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_BEGIN, e -> {
-            TwoDimensional.Position position = scriptArea.getParagraph(0).getStyleSpans().offsetToPosition(e.getCharacterIndex(), Backward);
-            if(position.getMajor() % 2 == 0 && scriptArea.getScript().getChunks().size() > position.getMajor() / 2) {
-                ScriptChunk hoverChunk = scriptArea.getScript().getChunks().get(position.getMajor()/2);
-                if(!hoverChunk.isOpCode()) {
-                    Point2D pos = e.getScreenPosition();
-                    popupMsg.setText(describeScriptChunk(hoverChunk));
-                    popup.show(scriptArea, pos.getX(), pos.getY() + 10);
-                }
+            ScriptChunk hoverChunk = getScriptChunk(scriptArea, e.getCharacterIndex());
+            if(hoverChunk != null) {
+                Point2D pos = e.getScreenPosition();
+                popupMsg.setText(describeScriptChunk(hoverChunk));
+                popup.show(scriptArea, pos.getX(), pos.getY() + 10);
             }
         });
         scriptArea.addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_END, e -> {
@@ -80,4 +82,26 @@ public abstract class BaseController {
 
         return "Invalid";
     }
+
+    public static ScriptChunk getScriptChunk(ScriptArea area, int characterIndex) {
+        TwoDimensional.Position position = area.getParagraph(0).getStyleSpans().offsetToPosition(characterIndex, Backward);
+        int ignoreCount = 0;
+        for(int i = 0; i < position.getMajor() && i < area.getParagraph(0).getStyleSpans().getSpanCount(); i++) {
+            Collection<String> styles = area.getParagraph(0).getStyleSpans().getStyleSpan(i).getStyle();
+            if(i < position.getMajor() && (styles.contains("") || styles.contains("script-nest"))) {
+                ignoreCount++;
+            }
+        }
+        boolean hashScripts = List.of(P2PKH, P2SH, P2WPKH, P2WSH).stream().anyMatch(type -> type.isScriptType(area.getScript()));
+        List<ScriptChunk> flatChunks = area.getScript().getChunks().stream().flatMap(chunk -> !hashScripts && chunk.isScript() ? chunk.getScript().getChunks().stream() : Stream.of(chunk)).collect(Collectors.toList());
+        int chunkIndex = position.getMajor() - ignoreCount;
+        if(chunkIndex < flatChunks.size()) {
+            ScriptChunk chunk = flatChunks.get(chunkIndex);
+            if(!chunk.isOpCode()) {
+                return chunk;
+            }
+        }
+
+        return null;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/DefaultInteractionServices.java

@@ -15,13 +15,13 @@ import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.sparrowwallet.sparrow.AppServices.moveToActiveWindowScreen;
-import static com.sparrowwallet.sparrow.AppServices.setStageIcon;
+import static com.sparrowwallet.sparrow.AppServices.*;
 
 public class DefaultInteractionServices implements InteractionServices {
     @Override
     public Optional<ButtonType> showAlert(String title, String content, Alert.AlertType alertType, Node graphic, ButtonType... buttons) {
         Alert alert = new Alert(alertType, content, buttons);
+        alert.initOwner(getActiveWindow());
         setStageIcon(alert.getDialogPane().getScene().getWindow());
         alert.getDialogPane().getScene().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         alert.setTitle(title);
@@ -62,6 +62,7 @@ public class DefaultInteractionServices implements InteractionServices {
     @Override
     public Optional<String> requestPassphrase(String walletName, Keystore keystore) {
         KeystorePassphraseDialog passphraseDialog = new KeystorePassphraseDialog(walletName, keystore);
+        passphraseDialog.initOwner(getActiveWindow());
         return passphraseDialog.showAndWait();
     }
 }

src/main/java/com/sparrowwallet/sparrow/SparrowDesktop.java

@@ -45,6 +45,7 @@ public class SparrowDesktop extends Application {
         GlyphFontRegistry.register(new FontAwesome5());
         GlyphFontRegistry.register(new FontAwesome5Brands());
         Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
+        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Italic.ttf"), 11);
         URL.setURLStreamHandlerFactory(protocol -> WalletIcon.PROTOCOL.equals(protocol) ? new WalletIcon.WalletIconStreamHandler() : null);
 
         AppServices.initialize(this);
@@ -79,6 +80,7 @@ public class SparrowDesktop extends Application {
         }
 
         System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
+        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
 
         if(Config.get().getAppHeight() != null && Config.get().getAppWidth() != null) {
             mainStage.setWidth(Config.get().getAppWidth());
@@ -106,7 +108,7 @@ public class SparrowDesktop extends Application {
             }
         }
 
-        AppServices.openFileUriArguments(stage);
+        AppServices.openFileUriArgumentsAfterWalletLoading(stage);
 
         AppServices.get().start();
     }

src/main/java/com/sparrowwallet/sparrow/SparrowWallet.java

@@ -16,9 +16,9 @@ import java.io.File;
 import java.util.*;
 
 public class SparrowWallet {
-    public static final String APP_ID = "com.sparrowwallet.sparrow";
+    public static final String APP_ID = "sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.7.8";
+    public static final String APP_VERSION = "1.8.6";
     public static final String APP_VERSION_SUFFIX = "";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";
@@ -79,7 +79,7 @@ public class SparrowWallet {
 
         try {
             instance = new Instance(fileUriArguments);
-            instance.acquireLock(); //If fileUriArguments is not empty, will exit app after sending fileUriArguments if lock cannot be acquired
+            instance.acquireLock(!fileUriArguments.isEmpty()); //If fileUriArguments is not empty, will exit app after sending fileUriArguments if lock cannot be acquired
         } catch(InstanceException e) {
             getLogger().error("Could not access application lock", e);
         }
@@ -130,13 +130,13 @@ public class SparrowWallet {
         private final List<String> fileUriArguments;
 
         public Instance(List<String> fileUriArguments) {
-            super(SparrowWallet.APP_ID + "." + Network.get(), !fileUriArguments.isEmpty());
+            super(SparrowWallet.APP_ID, true);
             this.fileUriArguments = fileUriArguments;
         }
 
         @Override
         protected void receiveMessageList(List<String> messageList) {
-            if(messageList != null && !messageList.isEmpty()) {
+            if(messageList != null) {
                 AppServices.parseFileUriArguments(messageList);
                 AppServices.openFileUriArguments(null);
             }

src/main/java/com/sparrowwallet/sparrow/UnitFormat.java

@@ -12,6 +12,7 @@ public enum UnitFormat {
         private final DecimalFormat satsFormat = new DecimalFormat("#,##0", getDecimalFormatSymbols());
         private final DecimalFormat tableBtcFormat = new DecimalFormat("0.00000000", getDecimalFormatSymbols());
         private final DecimalFormat currencyFormat = new DecimalFormat("#,##0.00", getDecimalFormatSymbols());
+        private final DecimalFormat tableCurrencyFormat = new DecimalFormat("0.00", getDecimalFormatSymbols());
 
         public DecimalFormat getBtcFormat() {
             btcFormat.setMaximumFractionDigits(8);
@@ -30,6 +31,10 @@ public enum UnitFormat {
             return currencyFormat;
         }
 
+        public DecimalFormat getTableCurrencyFormat() {
+            return tableCurrencyFormat;
+        }
+
         public DecimalFormatSymbols getDecimalFormatSymbols() {
             DecimalFormatSymbols symbols = new DecimalFormatSymbols();
             symbols.setDecimalSeparator('.');
@@ -42,6 +47,7 @@ public enum UnitFormat {
         private final DecimalFormat satsFormat = new DecimalFormat("#,##0", getDecimalFormatSymbols());
         private final DecimalFormat tableBtcFormat = new DecimalFormat("0.00000000", getDecimalFormatSymbols());
         private final DecimalFormat currencyFormat = new DecimalFormat("#,##0.00", getDecimalFormatSymbols());
+        private final DecimalFormat tableCurrencyFormat = new DecimalFormat("0.00", getDecimalFormatSymbols());
 
         public DecimalFormat getBtcFormat() {
             btcFormat.setMaximumFractionDigits(8);
@@ -60,6 +66,10 @@ public enum UnitFormat {
             return currencyFormat;
         }
 
+        public DecimalFormat getTableCurrencyFormat() {
+            return tableCurrencyFormat;
+        }
+
         public DecimalFormatSymbols getDecimalFormatSymbols() {
             DecimalFormatSymbols symbols = new DecimalFormatSymbols();
             symbols.setDecimalSeparator(',');
@@ -78,6 +88,8 @@ public enum UnitFormat {
 
     public abstract DecimalFormat getCurrencyFormat();
 
+    public abstract DecimalFormat getTableCurrencyFormat();
+
     public String formatBtcValue(Long amount) {
         return getBtcFormat().format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);
     }
@@ -94,6 +106,10 @@ public enum UnitFormat {
         return getCurrencyFormat().format(amount);
     }
 
+    public String tableFormatCurrencyValue(double amount) {
+        return getTableCurrencyFormat().format(amount);
+    }
+
     public String getGroupingSeparator() {
         return Character.toString(getDecimalFormatSymbols().getGroupingSeparator());
     }

src/main/java/com/sparrowwallet/sparrow/WelcomeDialog.java

@@ -22,6 +22,7 @@ public class WelcomeDialog extends Dialog<Mode> {
 
             dialogPane.setPrefWidth(600);
             dialogPane.setPrefHeight(520);
+            dialogPane.setMinHeight(dialogPane.getPrefHeight());
             AppServices.moveToActiveWindowScreen(this);
 
             dialogPane.getStylesheets().add(AppServices.class.getResource("welcome.css").toExternalForm());

src/main/java/com/sparrowwallet/sparrow/control/AddAccountDialog.java

@@ -14,10 +14,13 @@ import javafx.scene.layout.VBox;
 import javafx.util.StringConverter;
 import org.controlsfx.glyphfont.Glyph;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
+
+import static com.sparrowwallet.drongo.wallet.StandardAccount.*;
 
 public class AddAccountDialog extends Dialog<List<StandardAccount>> {
+    private static final int MAX_SHOWN_ACCOUNTS = 8;
+
     private final ComboBox<StandardAccount> standardAccountCombo;
     private boolean discoverAccounts = false;
 
@@ -42,29 +45,32 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {
         standardAccountCombo = new ComboBox<>();
         standardAccountCombo.setMaxWidth(Double.MAX_VALUE);
 
-        List<Integer> existingIndexes = new ArrayList<>();
+        Set<Integer> existingIndexes = new LinkedHashSet<>();
         Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
         existingIndexes.add(masterWallet.getAccountIndex());
         for(Wallet childWallet : masterWallet.getChildWallets()) {
             if(!childWallet.isNested()) {
                 existingIndexes.add(childWallet.getAccountIndex());
+                Optional<StandardAccount> optStdAcc = Arrays.stream(StandardAccount.values()).filter(stdacc -> stdacc.getName().equals(childWallet.getName())).findFirst();
+                optStdAcc.ifPresent(standardAccount -> existingIndexes.add(standardAccount.getAccountNumber()));
             }
         }
 
         List<StandardAccount> availableAccounts = new ArrayList<>();
         for(StandardAccount standardAccount : StandardAccount.values()) {
-            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(standardAccount)) {
+            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.isWhirlpoolAccount(standardAccount) && availableAccounts.size() <= MAX_SHOWN_ACCOUNTS) {
                 availableAccounts.add(standardAccount);
             }
         }
 
         if(WhirlpoolServices.canWalletMix(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
-            availableAccounts.add(StandardAccount.WHIRLPOOL_PREMIX);
+            availableAccounts.add(WHIRLPOOL_PREMIX);
+        } else if(WhirlpoolServices.canWatchPostmix(masterWallet) && !existingIndexes.contains(WHIRLPOOL_POSTMIX.getAccountNumber())) {
+            availableAccounts.add(WHIRLPOOL_POSTMIX);
         }
 
         final ButtonType discoverButtonType = new javafx.scene.control.ButtonType("Discover", ButtonBar.ButtonData.LEFT);
-        if(!availableAccounts.isEmpty() && Config.get().getServerType() != ServerType.BITCOIN_CORE &&
-                (masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.SW_SEED)
+        if(!availableAccounts.isEmpty() && (masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.SW_SEED)
                         || (masterWallet.getKeystores().size() == 1 && masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.HW_USB)))) {
             dialogPane.getButtonTypes().add(discoverButtonType);
             Button discoverButton = (Button)dialogPane.lookupButton(discoverButtonType);
@@ -82,10 +88,14 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {
                     return "None Available";
                 }
 
-                if(StandardAccount.WHIRLPOOL_ACCOUNTS.contains(account)) {
+                if(account == WHIRLPOOL_PREMIX) {
                     return "Whirlpool Accounts";
                 }
 
+                if(account == WHIRLPOOL_POSTMIX) {
+                    return "Whirlpool Postmix (No mixing)";
+                }
+
                 return account.getName();
             }
 

src/main/java/com/sparrowwallet/sparrow/control/AddressCell.java

@@ -40,7 +40,7 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
             if(utxoEntry != null) {
                 Address address = addressStatus.getAddress();
                 setText(address.toString());
-                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode()), false));
+                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode()), false, getTreeTableView()));
                 Tooltip tooltip = new Tooltip();
                 tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate(), addressStatus.isDustAttack()));

src/main/java/com/sparrowwallet/sparrow/control/CardImportPane.java

@@ -4,8 +4,7 @@ import com.google.common.base.Throwables;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
-import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
@@ -36,6 +35,7 @@ import org.slf4j.LoggerFactory;
 import javax.smartcardio.CardException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Optional;
 
 import static com.sparrowwallet.sparrow.io.CardApi.isReaderAvailable;
 
@@ -74,21 +74,21 @@ public class CardImportPane extends TitledDescriptionPane {
             return;
         }
 
-        if(pin.get().length() < 6) {
-            setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
-            setContent(getPinAndDerivationEntry());
-            showHideLink.setVisible(false);
-            setExpanded(true);
-            importButton.setDisable(false);
-            return;
-        }
-
         StringProperty messageProperty = new SimpleStringProperty();
         messageProperty.addListener((observable, oldValue, newValue) -> {
             Platform.runLater(() -> setDescription(newValue));
         });
 
         try {
+            if(pin.get().length() < importer.getWalletModel().getMinPinLength()) {
+                setDescription(pin.get().isEmpty() ? (!importer.getWalletModel().hasDefaultPin() && !importer.isInitialized() ? "Choose a PIN code" : "Enter PIN code") : "PIN code too short");
+                setContent(getPinAndDerivationEntry());
+                showHideLink.setVisible(false);
+                setExpanded(true);
+                importButton.setDisable(false);
+                return;
+            }
+
             if(!importer.isInitialized()) {
                 setDescription("Card not initialized");
                 setContent(getInitializationPanel(messageProperty));
@@ -121,6 +121,75 @@ public class CardImportPane extends TitledDescriptionPane {
     }
 
     private Node getInitializationPanel(StringProperty messageProperty) {
+        if(importer.getWalletModel().requiresSeedInitialization()) {
+            return getSeedInitializationPanel(messageProperty);
+        }
+
+        return getEntropyInitializationPanel(messageProperty);
+    }
+
+    private Node getSeedInitializationPanel(StringProperty messageProperty) {
+        VBox confirmationBox = new VBox(5);
+        CustomPasswordField confirmationPin = new ViewPasswordField();
+        confirmationPin.setPromptText("Re-enter chosen PIN");
+        confirmationBox.getChildren().add(confirmationPin);
+
+        Button initializeButton = new Button("Initialize");
+        initializeButton.setDefaultButton(true);
+        initializeButton.setOnAction(event -> {
+            initializeButton.setDisable(true);
+            if(!pin.get().equals(confirmationPin.getText())) {
+                setError("PIN Error", "The confirmation PIN did not match");
+                return;
+            }
+            int pinSize = pin.get().length();
+            if(pinSize < importer.getWalletModel().getMinPinLength() || pinSize > importer.getWalletModel().getMaxPinLength()) {
+                setError("PIN Error", "PIN length must be between " + importer.getWalletModel().getMinPinLength() + " and " + importer.getWalletModel().getMaxPinLength() + " characters");
+                return;
+            }
+
+            SeedEntryDialog seedEntryDialog = new SeedEntryDialog(importer.getWalletModel().toDisplayString() + " Seed Words", 12);
+            seedEntryDialog.initOwner(this.getScene().getWindow());
+            Optional<List<String>> optWords = seedEntryDialog.showAndWait();
+            if(optWords.isPresent()) {
+                try {
+                    List<String> mnemonicWords = optWords.get();
+                    Bip39MnemonicCode.INSTANCE.check(mnemonicWords);
+                    DeterministicSeed seed = new DeterministicSeed(mnemonicWords, "", System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
+                    byte[] seedBytes = seed.getSeedBytes();
+
+                    CardInitializationService cardInitializationService = new CardInitializationService(importer, pin.get(), seedBytes, messageProperty);
+                    cardInitializationService.setOnSucceeded(successEvent -> {
+                        AppServices.showSuccessDialog("Card Initialized", "The card was successfully initialized.\n\nYou can now import the keystore.");
+                        setDescription("Leave card on reader");
+                        setExpanded(false);
+                        importButton.setDisable(false);
+                    });
+                    cardInitializationService.setOnFailed(failEvent -> {
+                        log.error("Error initializing card", failEvent.getSource().getException());
+                        AppServices.showErrorDialog("Card Initialization Failed", "The card was not initialized.\n\n" + failEvent.getSource().getException().getMessage());
+                        initializeButton.setDisable(false);
+                    });
+                    cardInitializationService.start();
+                } catch(MnemonicException e) {
+                    log.error("Invalid seed entered", e);
+                    AppServices.showErrorDialog("Invalid seed entered", "The seed was invalid.\n\n" + e.getMessage());
+                    initializeButton.setDisable(false);
+                }
+            } else {
+                initializeButton.setDisable(false);
+            }
+        });
+
+        HBox contentBox = new HBox(20);
+        contentBox.getChildren().addAll(confirmationBox, initializeButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        HBox.setHgrow(confirmationBox, Priority.ALWAYS);
+
+        return contentBox;
+    }
+
+    private Node getEntropyInitializationPanel(StringProperty messageProperty) {
         VBox initTypeBox = new VBox(5);
         RadioButton automatic = new RadioButton("Automatic (Recommended)");
         RadioButton advanced = new RadioButton("Advanced");

src/main/java/com/sparrowwallet/sparrow/control/CardPinDialog.java

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.wallet.WalletModel;
 import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -22,7 +23,7 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
     private final CheckBox backupFirst;
     private final ButtonType okButtonType;
 
-    public CardPinDialog(boolean backupOnly) {
+    public CardPinDialog(WalletModel walletModel, boolean backupOnly) {
         this.existingPin = new ViewPasswordField();
         this.newPin = new ViewPasswordField();
         this.newPinConfirm = new ViewPasswordField();
@@ -71,7 +72,11 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
         if(backupOnly) {
             fieldset.getChildren().addAll(currentField);
         } else {
-            fieldset.getChildren().addAll(currentField, newField, confirmField, backupField);
+            fieldset.getChildren().addAll(currentField, newField, confirmField);
+        }
+
+        if(walletModel.supportsBackup()) {
+            fieldset.getChildren().add(backupField);
         }
 
         form.getChildren().add(fieldset);
@@ -80,8 +85,8 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
         ValidationSupport validationSupport = new ValidationSupport();
         Platform.runLater( () -> {
             validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
-            validationSupport.registerValidator(existingPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", existingPin.getText().length() < 6 || existingPin.getText().length() > 32));
-            validationSupport.registerValidator(newPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", newPin.getText().length() < 6 || newPin.getText().length() > 32));
+            validationSupport.registerValidator(existingPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", existingPin.getText().length() < walletModel.getMinPinLength() || existingPin.getText().length() > walletModel.getMaxPinLength()));
+            validationSupport.registerValidator(newPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", newPin.getText().length() < walletModel.getMinPinLength() || newPin.getText().length() > walletModel.getMaxPinLength()));
             validationSupport.registerValidator(newPinConfirm, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "PIN confirmation does not match", !newPinConfirm.getText().equals(newPin.getText())));
         });
 
@@ -89,8 +94,8 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
         dialogPane.getButtonTypes().addAll(okButtonType);
         Button okButton = (Button) dialogPane.lookupButton(okButtonType);
         okButton.setPrefWidth(130);
-        BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> existingPin.getText().length() < 6 || existingPin.getText().length() > 32
-                        || newPin.getText().length() < 6 || newPin.getText().length() > 32
+        BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> existingPin.getText().length() < walletModel.getMinPinLength() || existingPin.getText().length() > walletModel.getMaxPinLength()
+                        || newPin.getText().length() < walletModel.getMinPinLength() || newPin.getText().length() > walletModel.getMaxPinLength()
                         || !newPin.getText().equals(newPinConfirm.getText()),
                 existingPin.textProperty(), newPin.textProperty(), newPinConfirm.textProperty());
         okButton.disableProperty().bind(isInvalid);

src/main/java/com/sparrowwallet/sparrow/control/CoinCell.java

@@ -70,7 +70,7 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             setContextMenu(contextMenu);
 
             if(entry instanceof TransactionEntry transactionEntry) {
-                tooltip.showConfirmations(transactionEntry.confirmationsProperty());
+                tooltip.showConfirmations(transactionEntry.confirmationsProperty(), transactionEntry.isCoinbase());
 
                 if(transactionEntry.isConfirming()) {
                     ConfirmationProgressIndicator arc = new ConfirmationProgressIndicator(transactionEntry.getConfirmations());
@@ -119,6 +119,7 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
     private static final class CoinTooltip extends Tooltip {
         private final IntegerProperty confirmationsProperty = new SimpleIntegerProperty();
         private boolean showConfirmations;
+        private boolean isCoinbase;
         private String value;
 
         public void setValue(String value) {
@@ -126,8 +127,9 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             setTooltipText();
         }
 
-        public void showConfirmations(IntegerProperty txEntryConfirmationsProperty) {
+        public void showConfirmations(IntegerProperty txEntryConfirmationsProperty, boolean coinbase) {
             showConfirmations = true;
+            isCoinbase = coinbase;
 
             int confirmations = txEntryConfirmationsProperty.get();
             if(confirmations < BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM) {
@@ -155,7 +157,7 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             if(confirmations == 0) {
                 return "Unconfirmed in mempool";
             } else if(confirmations < BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM) {
-                return confirmations + " confirmation" + (confirmations == 1 ? "" : "s");
+                return confirmations + " confirmation" + (confirmations == 1 ? "" : "s") + (isCoinbase ? ", immature coinbase" : "");
             } else {
                 return BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM + "+ confirmations";
             }

src/main/java/com/sparrowwallet/sparrow/control/CoinTreeTable.java

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
@@ -17,6 +18,7 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
+import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
 import javafx.scene.layout.StackPane;
 
@@ -28,6 +30,7 @@ import java.util.Optional;
 public class CoinTreeTable extends TreeTableView<Entry> {
     private BitcoinUnit bitcoinUnit;
     private UnitFormat unitFormat;
+    private CurrencyRate currencyRate;
 
     public BitcoinUnit getBitcoinUnit() {
         return bitcoinUnit;
@@ -64,6 +67,18 @@ public class CoinTreeTable extends TreeTableView<Entry> {
         }
     }
 
+    public CurrencyRate getCurrencyRate() {
+        return currencyRate;
+    }
+
+    public void setCurrencyRate(CurrencyRate currencyRate) {
+        this.currencyRate = currencyRate;
+
+        if(!getChildren().isEmpty()) {
+            refresh();
+        }
+    }
+
     public void updateHistoryStatus(WalletHistoryStatusEvent event) {
         if(getRoot() != null) {
             Entry entry = getRoot().getValue();
@@ -94,6 +109,7 @@ public class CoinTreeTable extends TreeTableView<Entry> {
             hyperlink.setTranslateY(30);
             hyperlink.setOnAction(event -> {
                 WalletBirthDateDialog dlg = new WalletBirthDateDialog(wallet.getBirthDate(), false);
+                dlg.initOwner(this.getScene().getWindow());
                 Optional<Date> optDate = dlg.showAndWait();
                 if(optDate.isPresent()) {
                     Storage storage = AppServices.get().getOpenWallets().get(wallet);
@@ -119,4 +135,12 @@ public class CoinTreeTable extends TreeTableView<Entry> {
         stackPane.setAlignment(Pos.CENTER);
         return stackPane;
     }
+
+    public void setSortColumn(int columnIndex, TreeTableColumn.SortType sortType) {
+        if(columnIndex >= 0 && columnIndex < getColumns().size() && getSortOrder().isEmpty() && !getRoot().getChildren().isEmpty()) {
+            TreeTableColumn<Entry, ?> column = getColumns().get(columnIndex);
+            column.setSortType(sortType == null ? TreeTableColumn.SortType.DESCENDING : sortType);
+            getSortOrder().add(column);
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/control/CopyableCoinLabel.java

@@ -10,12 +10,16 @@ import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.event.EventHandler;
+import javafx.scene.input.MouseEvent;
 
 public class CopyableCoinLabel extends CopyableLabel {
     private final LongProperty valueProperty = new SimpleLongProperty(-1);
     private final Tooltip tooltip;
     private final CoinContextMenu contextMenu;
 
+    private BitcoinUnit bitcoinUnit;
+
     public CopyableCoinLabel() {
         this("Unknown");
     }
@@ -23,6 +27,21 @@ public class CopyableCoinLabel extends CopyableLabel {
     public CopyableCoinLabel(String text) {
         super(text);
         valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getUnitFormat(), Config.get().getBitcoinUnit()));
+
+        setOnMouseClicked(event -> {
+            if(bitcoinUnit == null) {
+                bitcoinUnit = Config.get().getBitcoinUnit();
+            }
+
+            if(bitcoinUnit == BitcoinUnit.SATOSHIS) {
+                bitcoinUnit = BitcoinUnit.BTC;
+            } else {
+                bitcoinUnit = BitcoinUnit.SATOSHIS;
+            }
+
+            refresh(Config.get().getUnitFormat(), bitcoinUnit);
+        });
+
         tooltip = new Tooltip();
         contextMenu = new CoinContextMenu();
     }
@@ -63,6 +82,8 @@ public class CopyableCoinLabel extends CopyableLabel {
             unit = (value >= BitcoinUnit.getAutoThreshold() ? BitcoinUnit.BTC : BitcoinUnit.SATOSHIS);
         }
 
+        this.bitcoinUnit = unit;
+
         if(unit.equals(BitcoinUnit.BTC)) {
             tooltip.setText(satsValue);
             setText(btcValue);

src/main/java/com/sparrowwallet/sparrow/control/CopyableTextField.java

@@ -10,6 +10,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.event.EventHandler;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -52,6 +53,7 @@ public class CopyableTextField extends CustomTextField {
                 selectedTextProperty().removeListener(selectionListener);
             }
         });
+        setContextMenu(new ContextMenu());
     }
 
     private void setupCopyButtonField(ObjectProperty<Node> rightProperty) {

src/main/java/com/sparrowwallet/sparrow/control/DeviceDialog.java

@@ -91,6 +91,7 @@ public abstract class DeviceDialog<R> extends Dialog<R> {
 
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(360);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
         AppServices.moveToActiveWindowScreen(this);
 
         setResultConverter(dialogButton -> dialogButton == cancelButtonType ? null : getResult());

src/main/java/com/sparrowwallet/sparrow/control/DevicePane.java

@@ -673,8 +673,8 @@ public class DevicePane extends TitledDescriptionPane {
             try {
                 CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
                 if(!cardApi.isInitialized()) {
-                    if(pin.get().length() < 6) {
-                        setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
+                    if(pin.get().length() < device.getModel().getMinPinLength()) {
+                        setDescription(pin.get().isEmpty() ? (device.getModel().hasDefaultPin() ? "Enter PIN code" : "Choose a PIN code") : "PIN code too short");
                         setContent(getCardPinEntry(importButton));
                         showHideLink.setVisible(false);
                         setExpanded(true);
@@ -795,7 +795,7 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void handleCardOperation(Service<?> service, ButtonBase operationButton, String operationDescription, boolean pinRequired, EventHandler<WorkerStateEvent> successHandler) {
-        if(pinRequired && pin.get().length() < 6) {
+        if(pinRequired && pin.get().length() < device.getModel().getMinPinLength()) {
             setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
             setContent(getCardPinEntry(operationButton));
             showHideLink.setVisible(false);
@@ -940,7 +940,7 @@ public class DevicePane extends TitledDescriptionPane {
             try {
                 CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
                 if(!cardApi.isInitialized()) {
-                    if(pin.get().length() < 6) {
+                    if(pin.get().length() < device.getModel().getMinPinLength()) {
                         setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
                         setContent(getCardPinEntry(getAddressButton));
                         showHideLink.setVisible(false);
@@ -1047,6 +1047,75 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private Node getCardInitializationPanel(CardApi cardApi, ButtonBase operationButton, DeviceOperation deviceOperation) {
+        if(device.getModel().requiresSeedInitialization()) {
+            return getCardSeedInitializationPanel(cardApi, operationButton, deviceOperation);
+        }
+
+        return getCardEntropyInitializationPanel(cardApi, operationButton, deviceOperation);
+    }
+
+    private Node getCardSeedInitializationPanel(CardApi cardApi, ButtonBase operationButton, DeviceOperation deviceOperation) {
+        VBox confirmationBox = new VBox(5);
+        CustomPasswordField confirmationPin = new ViewPasswordField();
+        confirmationPin.setPromptText("Re-enter chosen PIN");
+        confirmationBox.getChildren().add(confirmationPin);
+
+        Button initializeButton = new Button("Initialize");
+        initializeButton.setDefaultButton(true);
+        initializeButton.setOnAction(event -> {
+            initializeButton.setDisable(true);
+            if(!pin.get().equals(confirmationPin.getText())) {
+                setError("PIN Error", "The confirmation PIN did not match");
+                return;
+            }
+            int pinSize = pin.get().length();
+            if(pinSize < device.getModel().getMinPinLength() || pinSize > device.getModel().getMaxPinLength()) {
+                setError("PIN Error", "PIN length must be between " + device.getModel().getMinPinLength() + " and " + device.getModel().getMaxPinLength() + " characters");
+                return;
+            }
+
+            SeedEntryDialog seedEntryDialog = new SeedEntryDialog(device.getModel().toDisplayString() + " Seed Words", 12);
+            seedEntryDialog.initOwner(this.getScene().getWindow());
+            Optional<List<String>> optWords = seedEntryDialog.showAndWait();
+            if(optWords.isPresent()) {
+                try {
+                    List<String> mnemonicWords = optWords.get();
+                    Bip39MnemonicCode.INSTANCE.check(mnemonicWords);
+                    DeterministicSeed seed = new DeterministicSeed(mnemonicWords, "", System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
+                    byte[] seedBytes = seed.getSeedBytes();
+
+                    Service<Void> cardInitializationService = cardApi.getInitializationService(seedBytes, messageProperty);
+                    cardInitializationService.setOnSucceeded(successEvent -> {
+                        AppServices.showSuccessDialog("Card Initialized", "The card was successfully initialized.\n\nYou can now import the keystore.");
+                        operationButton.setDisable(false);
+                        setDefaultStatus();
+                        setExpanded(false);
+                    });
+                    cardInitializationService.setOnFailed(failEvent -> {
+                        log.error("Error initializing card", failEvent.getSource().getException());
+                        AppServices.showErrorDialog("Card Initialization Failed", "The card was not initialized.\n\n" + failEvent.getSource().getException().getMessage());
+                        initializeButton.setDisable(false);
+                    });
+                    cardInitializationService.start();
+                } catch(MnemonicException e) {
+                    log.error("Invalid seed entered", e);
+                    AppServices.showErrorDialog("Invalid seed entered", "The seed was invalid.\n\n" + e.getMessage());
+                    initializeButton.setDisable(false);
+                }
+            } else {
+                initializeButton.setDisable(false);
+            }
+        });
+
+        HBox contentBox = new HBox(20);
+        contentBox.getChildren().addAll(confirmationBox, initializeButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        HBox.setHgrow(confirmationBox, Priority.ALWAYS);
+
+        return contentBox;
+    }
+
+    private Node getCardEntropyInitializationPanel(CardApi cardApi, ButtonBase operationButton, DeviceOperation deviceOperation) {
         VBox initTypeBox = new VBox(5);
         RadioButton automatic = new RadioButton("Automatic (Recommended)");
         RadioButton advanced = new RadioButton("Advanced");

src/main/java/com/sparrowwallet/sparrow/control/DownloadVerifierDialog.java

@@ -0,0 +1,750 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.pgp.PGPKeySource;
+import com.sparrowwallet.drongo.pgp.PGPUtils;
+import com.sparrowwallet.drongo.pgp.PGPVerificationException;
+import com.sparrowwallet.drongo.pgp.PGPVerificationResult;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
+import com.sparrowwallet.sparrow.net.VersionCheckService;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.input.Dragboard;
+import javafx.scene.input.TransferMode;
+import javafx.scene.layout.*;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.controlsfx.tools.Platform;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tornadofx.control.Field;
+import tornadofx.control.Fieldset;
+import tornadofx.control.Form;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import static com.sparrowwallet.sparrow.AppController.DRAG_OVER_CLASS;
+
+public class DownloadVerifierDialog extends Dialog<ButtonBar.ButtonData> {
+    private static final Logger log = LoggerFactory.getLogger(DownloadVerifierDialog.class);
+
+    private static final DateFormat signatureDateFormat = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy z");
+
+    private static final long MAX_VALID_MANIFEST_SIZE = 100 * 1024;
+    private static final String SHA256SUMS_MANIFEST_PREFIX = "sha256sums";
+
+    private static final List<String> SIGNATURE_EXTENSIONS = List.of("asc", "sig", "gpg");
+    private static final List<String> MANIFEST_EXTENSIONS = List.of("txt");
+    private static final List<String> PUBLIC_KEY_EXTENSIONS = List.of("asc");
+    private static final List<String> MACOS_RELEASE_EXTENSIONS = List.of("dmg");
+    private static final List<String> WINDOWS_RELEASE_EXTENSIONS = List.of("exe", "zip");
+    private static final List<String> LINUX_RELEASE_EXTENSIONS = List.of("deb", "rpm", "tar.gz");
+    private static final List<String> DISK_IMAGE_EXTENSIONS = List.of("img", "bin", "dfu");
+    private static final List<String> ARCHIVE_EXTENSIONS = List.of("zip", "tar.gz", "tar.bz2", "tar.xz", "rar", "7z");
+
+    private static final String SPARROW_RELEASE_PREFIX = "sparrow-";
+    private static final String SPARROW_SIGNATURE_SUFFIX = "-manifest.txt.asc";
+    private static final Pattern SPARROW_RELEASE_VERSION = Pattern.compile("[0-9]+(\\.[0-9]+)*");
+    private static final long MIN_VALID_SPARROW_RELEASE_SIZE = 10 * 1024 * 1024;
+
+    private final ObjectProperty<File> signature = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> manifest = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> publicKey = new SimpleObjectProperty<>();
+    private final ObjectProperty<File> release = new SimpleObjectProperty<>();
+
+    private final BooleanProperty manifestDisabled = new SimpleBooleanProperty();
+    private final BooleanProperty publicKeyDisabled = new SimpleBooleanProperty();
+
+    private final Label signedBy;
+    private final Label releaseHash;
+    private final Label releaseVerified;
+    private final Hyperlink releaseLink;
+
+    private static File lastFileParent;
+
+    public DownloadVerifierDialog(File initialSignatureFile) {
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.setHeader(new Header());
+        setupDrag(dialogPane);
+
+        VBox vBox = new VBox();
+        vBox.setSpacing(20);
+        vBox.setPadding(new Insets(20, 10, 10, 20));
+
+        Form form = new Form();
+        Fieldset filesFieldset = new Fieldset();
+        filesFieldset.setText("Files");
+        filesFieldset.setSpacing(10);
+
+        String version = VersionCheckService.getVersion() != null ? VersionCheckService.getVersion() : "x.x.x";
+
+        Field signatureField = setupField(signature, "Signature", SIGNATURE_EXTENSIONS, false, "sparrow-" + version + "-manifest.txt", null);
+        Field manifestField = setupField(manifest, "Manifest", MANIFEST_EXTENSIONS, false, "sparrow-" + version + "-manifest", manifestDisabled);
+        Field publicKeyField = setupField(publicKey, "Public Key", PUBLIC_KEY_EXTENSIONS, true, "pgp_keys", publicKeyDisabled);
+        Field releaseFileField = setupField(release, "Release File", getReleaseFileExtensions(), false, getReleaseFileExample(version), null);
+
+        filesFieldset.getChildren().addAll(signatureField, manifestField, publicKeyField, releaseFileField);
+        form.getChildren().add(filesFieldset);
+
+        Fieldset resultsFieldset = new Fieldset();
+        resultsFieldset.setText("Results");
+        resultsFieldset.setSpacing(10);
+
+        signedBy = new Label();
+        Field signedByField = setupResultField(signedBy, "Signed By");
+
+        releaseHash = new Label();
+        Field hashMatchedField = setupResultField(releaseHash, "Release Hash");
+
+        releaseVerified = new Label();
+        Field releaseVerifiedField = setupResultField(releaseVerified, "Verified");
+
+        releaseLink = new Hyperlink("");
+        releaseVerifiedField.getInputs().add(releaseLink);
+        releaseLink.setOnAction(event -> {
+            if(release.get() != null && release.get().exists()) {
+                if(release.get().getName().toLowerCase(Locale.ROOT).startsWith("sparrow")) {
+                    Optional<ButtonType> optType = AppServices.showAlertDialog("Exit Sparrow?", "Sparrow must be closed before installation. Exit?", Alert.AlertType.CONFIRMATION, ButtonType.NO, ButtonType.YES);
+                    if(optType.isPresent() && optType.get() == ButtonType.YES) {
+                        javafx.application.Platform.exit();
+                        AppServices.get().getApplication().getHostServices().showDocument("file://" + release.get().getAbsolutePath());
+                    }
+                } else {
+                    AppServices.get().getApplication().getHostServices().showDocument("file://" + release.get().getAbsolutePath());
+                }
+            }
+        });
+
+        resultsFieldset.getChildren().addAll(signedByField, hashMatchedField, releaseVerifiedField);
+        form.getChildren().add(resultsFieldset);
+
+        vBox.getChildren().addAll(form);
+        dialogPane.setContent(vBox);
+
+        ButtonType clearButtonType = new javafx.scene.control.ButtonType("Clear", ButtonBar.ButtonData.CANCEL_CLOSE);
+        ButtonType closeButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(clearButtonType, closeButtonType);
+
+        setOnCloseRequest(event -> {
+            if(ButtonBar.ButtonData.CANCEL_CLOSE.equals(getResult())) {
+                signature.set(null);
+                manifest.set(null);
+                publicKey.set(null);
+                release.set(null);
+                signedBy.setText("");
+                signedBy.setGraphic(null);
+                signedBy.setTooltip(null);
+                releaseHash.setText("");
+                releaseHash.setGraphic(null);
+                releaseVerified.setText("");
+                releaseVerified.setGraphic(null);
+                releaseLink.setText("");
+                event.consume();
+            }
+        });
+        setResultConverter(ButtonType::getButtonData);
+
+        AppServices.moveToActiveWindowScreen(this);
+        dialogPane.setPrefWidth(900);
+        setResizable(true);
+
+        signature.addListener((observable, oldValue, signatureFile) -> {
+            if(signatureFile != null) {
+                boolean verify = true;
+                File actualSignatureFile = findSignatureFile(signatureFile);
+                if(actualSignatureFile != null  && !actualSignatureFile.equals(signature.get())) {
+                    signature.set(actualSignatureFile);
+                    verify = false;
+                } else if(PGPUtils.signatureContainsManifest(signatureFile)) {
+                    manifest.set(signatureFile);
+                    verify = false;
+                } else {
+                    File manifestFile = findManifestFile(signatureFile);
+                    if(manifestFile != null && !manifestFile.equals(manifest.get())) {
+                        manifest.set(manifestFile);
+                        verify = false;
+                    }
+                }
+
+                if(verify) {
+                    verify();
+                }
+            }
+        });
+
+        manifest.addListener((observable, oldValue, manifestFile) -> {
+            if(manifestFile != null) {
+                boolean verify = true;
+                try {
+                    Map<File, String> manifestMap = getManifest(manifestFile);
+                    File releaseFile = findReleaseFile(manifestFile, manifestMap);
+                    if(releaseFile != null && !releaseFile.equals(release.get())) {
+                        release.set(releaseFile);
+                        verify = false;
+                    }
+                } catch(IOException e) {
+                    log.debug("Error reading manifest file", e);
+                    verify = false;
+                } catch(InvalidManifestException e) {
+                    release.set(manifestFile);
+                    verify = false;
+                }
+
+                if(verify) {
+                    verify();
+                }
+            }
+        });
+
+        publicKey.addListener((observable, oldValue, newValue) -> {
+            verify();
+        });
+
+        release.addListener((observable, oldValue, releaseFile) -> {
+            verify();
+        });
+
+        if(initialSignatureFile != null) {
+            javafx.application.Platform.runLater(() -> signature.set(initialSignatureFile));
+        }
+    }
+
+    private void setupDrag(DialogPane dialogPane) {
+        dialogPane.setOnDragOver(event -> {
+            if(event.getGestureSource() != dialogPane && event.getDragboard().hasFiles()) {
+                event.acceptTransferModes(TransferMode.LINK);
+            }
+            event.consume();
+        });
+
+        dialogPane.setOnDragDropped(event -> {
+            Dragboard db = event.getDragboard();
+            boolean success = false;
+            if(db.hasFiles()) {
+                for(File file : db.getFiles()) {
+                    if(isVerifyDownloadFile(file)) {
+                        signature.set(file);
+                        break;
+                    }
+                }
+                success = true;
+            }
+            event.setDropCompleted(success);
+            event.consume();
+        });
+
+        dialogPane.setOnDragEntered(event -> {
+            dialogPane.getStyleClass().add(DRAG_OVER_CLASS);
+        });
+
+        dialogPane.setOnDragExited(event -> {
+            dialogPane.getStyleClass().removeAll(DRAG_OVER_CLASS);
+        });
+    }
+
+    private void verify() {
+        manifestDisabled.set(false);
+        publicKeyDisabled.set(false);
+
+        if(signature.get() == null || manifest.get() == null) {
+            clearReleaseFields();
+            return;
+        }
+
+        PGPVerifyService pgpVerifyService = new PGPVerifyService(signature.get(), manifest.get(), publicKey.get());
+        pgpVerifyService.setOnRunning(event -> {
+            signedBy.setText("Verifying...");
+            signedBy.setGraphic(GlyphUtils.getBusyGlyph());
+            signedBy.setTooltip(null);
+            clearReleaseFields();
+        });
+        pgpVerifyService.setOnSucceeded(event -> {
+            PGPVerificationResult result = pgpVerifyService.getValue();
+
+            String message = result.userId() + " on " + signatureDateFormat.format(result.signatureTimestamp()) + (result.expired() ? " (key expired)" : "");
+            signedBy.setText(message);
+            signedBy.setGraphic(result.expired() ? GlyphUtils.getWarningGlyph() : GlyphUtils.getSuccessGlyph());
+            signedBy.setTooltip(new Tooltip(result.fingerprint()));
+
+            if(!result.expired() && result.keySource() != PGPKeySource.USER) {
+                publicKeyDisabled.set(true);
+            }
+
+            if(manifest.get().equals(release.get())) {
+                manifestDisabled.set(true);
+                releaseHash.setText("No hash required, signature signs release file directly");
+                releaseHash.setGraphic(GlyphUtils.getSuccessGlyph());
+                releaseHash.setTooltip(null);
+                releaseVerified.setText("Ready to install ");
+                releaseVerified.setGraphic(GlyphUtils.getSuccessGlyph());
+                releaseLink.setText(release.get().getName());
+            } else {
+                verifyManifest();
+            }
+        });
+        pgpVerifyService.setOnFailed(event -> {
+            Throwable e = event.getSource().getException();
+            signedBy.setText(getDisplayMessage(e));
+            signedBy.setGraphic(GlyphUtils.getFailureGlyph());
+            signedBy.setTooltip(null);
+            clearReleaseFields();
+        });
+
+        pgpVerifyService.start();
+    }
+
+    private void clearReleaseFields() {
+        releaseHash.setText("");
+        releaseHash.setGraphic(null);
+        releaseHash.setTooltip(null);
+        releaseVerified.setText("");
+        releaseVerified.setGraphic(null);
+        releaseLink.setText("");
+    }
+
+    private void verifyManifest() {
+        File releaseFile = release.get();
+        if(releaseFile != null && releaseFile.exists()) {
+            FileSha256Service hashService = new FileSha256Service(releaseFile);
+            hashService.setOnRunning(event -> {
+                releaseHash.setText("Calculating...");
+                releaseHash.setGraphic(GlyphUtils.getBusyGlyph());
+                releaseHash.setTooltip(null);
+                releaseVerified.setText("");
+                releaseVerified.setGraphic(null);
+                releaseLink.setText("");
+            });
+            hashService.setOnSucceeded(event -> {
+                String calculatedHash = hashService.getValue();
+                try {
+                    Map<File, String> manifestMap = getManifest(manifest.get());
+                    String manifestHash = getManifestHash(releaseFile.getName(), manifestMap);
+                    if(calculatedHash.equalsIgnoreCase(manifestHash)) {
+                        releaseHash.setText("Matched manifest hash");
+                        releaseHash.setGraphic(GlyphUtils.getSuccessGlyph());
+                        releaseHash.setTooltip(new Tooltip(calculatedHash));
+                        releaseVerified.setText("Ready to install ");
+                        releaseVerified.setGraphic(GlyphUtils.getSuccessGlyph());
+                        releaseLink.setText(releaseFile.getName());
+                    } else if(manifestHash == null) {
+                        releaseHash.setText("Could not find manifest hash for " + releaseFile.getName());
+                        releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseHash.setTooltip(new Tooltip("Manifest hashes provided for:\n" + manifestMap.keySet().stream().map(File::getName).collect(Collectors.joining("\n"))));
+                        releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                        releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseLink.setText("");
+                    } else {
+                        releaseHash.setText("Did not match manifest hash");
+                        releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseHash.setTooltip(new Tooltip("Calculated Hash: " + calculatedHash + "\nManifest Hash: " + manifestHash));
+                        releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                        releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                        releaseLink.setText("");
+                    }
+                } catch(IOException | InvalidManifestException e) {
+                    releaseHash.setText("Could not read manifest");
+                    releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                    releaseHash.setTooltip(new Tooltip(e.getMessage()));
+                    releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                    releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                    releaseLink.setText("");
+                }
+            });
+            hashService.setOnFailed(event -> {
+                releaseHash.setText("Could not calculate manifest");
+                releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+                releaseHash.setTooltip(new Tooltip(event.getSource().getException().getMessage()));
+                releaseVerified.setText("Cannot verify " + releaseFile.getName());
+                releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+                releaseLink.setText("");
+            });
+            hashService.start();
+        } else {
+            releaseHash.setText("No release file");
+            releaseHash.setGraphic(GlyphUtils.getFailureGlyph());
+            releaseHash.setTooltip(null);
+            releaseVerified.setText("Not verified");
+            releaseVerified.setGraphic(GlyphUtils.getFailureGlyph());
+            releaseLink.setText("");
+        }
+    }
+
+    private Field setupField(ObjectProperty<File> fileProperty, String title, List<String> extensions, boolean optional, String example, BooleanProperty disabledProperty) {
+        Field field = new Field();
+        field.setText(title + ":");
+        FileField fileField = new FileField(fileProperty, title, extensions, optional, example, disabledProperty);
+        field.getInputs().add(fileField);
+        return field;
+    }
+
+    private Field setupResultField(Label label, String title) {
+        Field field = new Field();
+        field.setText(title + ":");
+        field.getInputs().add(label);
+        label.setGraphicTextGap(8);
+        return field;
+    }
+
+    public static Map<File, String> getManifest(File manifest) throws IOException, InvalidManifestException {
+        if(manifest.length() > MAX_VALID_MANIFEST_SIZE) {
+            throw new InvalidManifestException();
+        }
+
+        try(InputStream manifestStream = new FileInputStream(manifest)) {
+            return getManifest(manifestStream);
+        }
+    }
+
+    public static Map<File, String> getManifest(InputStream manifestStream) throws IOException {
+        Map<File, String> manifest = new HashMap<>();
+
+        BufferedReader reader = new BufferedReader(new InputStreamReader(manifestStream, StandardCharsets.UTF_8));
+        String line;
+        while((line = reader.readLine()) != null) {
+            String[] parts = line.split("\\s+");
+            if(parts.length > 1 && parts[0].length() == 64) {
+                String manifestHash = parts[0];
+                String manifestFileName = parts[1];
+                if(manifestFileName.startsWith("*") || manifestFileName.startsWith("U") || manifestFileName.startsWith("^")) {
+                    manifestFileName = manifestFileName.substring(1);
+                }
+                manifest.put(new File(manifestFileName), manifestHash);
+            }
+        }
+
+        return manifest;
+    }
+
+    private String getManifestHash(String contentFileName, Map<File, String> manifest) {
+        for(Map.Entry<File, String> entry : manifest.entrySet()) {
+            if(contentFileName.equalsIgnoreCase(entry.getKey().getName())) {
+                return entry.getValue();
+            }
+        }
+
+        return null;
+    }
+
+    private File findSignatureFile(File providedFile) {
+        for(String extension : SIGNATURE_EXTENSIONS) {
+            File signatureFile = new File(providedFile.getParentFile(), providedFile.getName() + "." + extension);
+            if(signatureFile.exists()) {
+                return signatureFile;
+            }
+        }
+
+        if(providedFile.getName().toLowerCase(Locale.ROOT).startsWith(SPARROW_RELEASE_PREFIX)) {
+            Matcher matcher = SPARROW_RELEASE_VERSION.matcher(providedFile.getName());
+            if(matcher.find()) {
+                String version = matcher.group();
+                File signatureFile = new File(providedFile.getParentFile(), SPARROW_RELEASE_PREFIX + version + SPARROW_SIGNATURE_SUFFIX);
+                if(signatureFile.exists()) {
+                    return signatureFile;
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private File findManifestFile(File providedFile) {
+        String signatureName = providedFile.getName();
+        if(signatureName.length() > 4 && SIGNATURE_EXTENSIONS.stream().anyMatch(ext -> signatureName.toLowerCase(Locale.ROOT).endsWith("." + ext))) {
+            File manifestFile = new File(providedFile.getParent(), signatureName.substring(0, signatureName.length() - 4));
+            if(manifestFile.exists()) {
+                return manifestFile;
+            }
+        }
+
+        return null;
+    }
+
+    private File findReleaseFile(File manifestFile, Map<File, String> manifestMap) {
+        List<String> releaseExtensions = getReleaseFileExtensions();
+        List<List<String>> extensionLists = List.of(releaseExtensions, DISK_IMAGE_EXTENSIONS, ARCHIVE_EXTENSIONS, List.of(""));
+
+        for(List<String> extensions : extensionLists) {
+            for(File file : manifestMap.keySet()) {
+                if(extensions.stream().anyMatch(ext -> file.getName().toLowerCase(Locale.ROOT).endsWith(ext))) {
+                    File releaseFile = new File(manifestFile.getParent(), file.getName());
+                    if(releaseFile.exists()) {
+                        return releaseFile;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private List<String> getReleaseFileExtensions() {
+        Platform platform = Platform.getCurrent();
+        switch(platform) {
+            case OSX -> {
+                return MACOS_RELEASE_EXTENSIONS;
+            }
+            case WINDOWS -> {
+                return WINDOWS_RELEASE_EXTENSIONS;
+            }
+            default -> {
+                return LINUX_RELEASE_EXTENSIONS;
+            }
+        }
+    }
+
+    private String getReleaseFileExample(String version) {
+        Platform platform = Platform.getCurrent();
+        String arch = System.getProperty("os.arch");
+        switch(platform) {
+            case OSX -> {
+                return "Sparrow-" + version + "-" + arch;
+            }
+            case WINDOWS -> {
+                return "Sparrow-" + version;
+            }
+            default ->  {
+                return "sparrow_" + version + "-1_" + (arch.equals("aarch64") ? "arm64" : arch);
+            }
+        }
+    }
+
+    private String getDisplayMessage(Throwable e) {
+        String message = e.getMessage();
+        message = message.substring(0, 1).toUpperCase(Locale.ROOT) + message.substring(1);
+
+        if(message.endsWith(".")) {
+            message = message.substring(0, message.length() - 1);
+        }
+
+        if(message.equals("Invalid header encountered")) {
+            message += ", not a valid signature file";
+        }
+
+        if(message.startsWith("Malformed message")) {
+            message = "Not a valid signature file";
+        }
+
+        return message;
+    }
+
+    public static boolean isVerifyDownloadFile(File file) {
+        if(file != null) {
+            String name = file.getName().toLowerCase(Locale.ROOT);
+            if(name.length() > 4 && SIGNATURE_EXTENSIONS.stream().anyMatch(ext -> name.endsWith("." + ext))) {
+                return true;
+            }
+
+            if(MANIFEST_EXTENSIONS.stream().anyMatch(ext -> name.endsWith("." + ext)) || name.startsWith(SHA256SUMS_MANIFEST_PREFIX)) {
+                try {
+                    Map<File, String> manifest = getManifest(file);
+                    return !manifest.isEmpty();
+                } catch(Exception e) {
+                    //ignore
+                }
+            }
+
+            if(name.startsWith(SPARROW_RELEASE_PREFIX) && file.length() >= MIN_VALID_SPARROW_RELEASE_SIZE) {
+                Matcher matcher = SPARROW_RELEASE_VERSION.matcher(name);
+                return matcher.find();
+            }
+        }
+
+        return false;
+    }
+
+    public void setSignatureFile(File signatureFile) {
+        signature.set(signatureFile);
+    }
+
+    private static class Header extends GridPane {
+        public Header() {
+            setMaxWidth(Double.MAX_VALUE);
+            getStyleClass().add("header-panel");
+
+            VBox vBox = new VBox();
+            vBox.setPadding(new Insets(10, 0, 0, 0));
+
+            Label headerLabel = new Label("Verify Download");
+            headerLabel.setWrapText(true);
+            headerLabel.setAlignment(Pos.CENTER_LEFT);
+            headerLabel.setMaxWidth(Double.MAX_VALUE);
+            headerLabel.setMaxHeight(Double.MAX_VALUE);
+
+            CopyableLabel descriptionLabel = new CopyableLabel("Download the release file, GPG signature and optional manifest of a project to verify the download integrity");
+            descriptionLabel.setAlignment(Pos.CENTER_LEFT);
+
+            vBox.getChildren().addAll(headerLabel, descriptionLabel);
+            add(vBox, 0, 0);
+
+            StackPane graphicContainer = new StackPane();
+            graphicContainer.getStyleClass().add("graphic-container");
+            Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
+            if (!image.isError()) {
+                ImageView imageView = new ImageView();
+                imageView.setSmooth(false);
+                imageView.setImage(image);
+                graphicContainer.getChildren().add(imageView);
+            }
+            add(graphicContainer, 1, 0);
+
+            ColumnConstraints textColumn = new ColumnConstraints();
+            textColumn.setFillWidth(true);
+            textColumn.setHgrow(Priority.ALWAYS);
+            ColumnConstraints graphicColumn = new ColumnConstraints();
+            graphicColumn.setFillWidth(false);
+            graphicColumn.setHgrow(Priority.NEVER);
+            getColumnConstraints().setAll(textColumn , graphicColumn);
+        }
+    }
+
+    private static class FileField extends HBox {
+        private final ObjectProperty<File> fileProperty;
+
+        public FileField(ObjectProperty<File> fileProperty, String title, List<String> extensions, boolean optional, String example, BooleanProperty disabledProperty) {
+            super(10);
+            this.fileProperty = fileProperty;
+            TextField textField = new TextField();
+            textField.setEditable(false);
+            textField.setPromptText("e.g. " + example + formatExtensionsList(extensions) + (optional ? " (optional)" : ""));
+            textField.setOnMouseClicked(event -> browseForFile(title, extensions));
+            Button browseButton = new Button("Browse...");
+            browseButton.setOnAction(event -> browseForFile(title, extensions));
+            getChildren().addAll(textField, browseButton);
+            HBox.setHgrow(textField, Priority.ALWAYS);
+
+            fileProperty.addListener((observable, oldValue, file) -> {
+                textField.setText(file == null ? "" : file.getAbsolutePath());
+                if(file != null) {
+                    lastFileParent = file.getParentFile();
+                }
+            });
+
+            if(disabledProperty != null) {
+                disabledProperty.addListener((observable, oldValue, disabled) -> {
+                    textField.setDisable(disabled);
+                    browseButton.setDisable(disabled);
+                });
+            }
+        }
+
+        private void browseForFile(String title, List<String> extensions) {
+            Stage window = new Stage();
+            FileChooser fileChooser = new FileChooser();
+            fileChooser.setTitle("Open File");
+            File userDir = new File(System.getProperty("user.home"));
+            File downloadsDir = new File(userDir, "Downloads");
+            fileChooser.setInitialDirectory(lastFileParent != null ? lastFileParent : (downloadsDir.exists() ? downloadsDir : userDir));
+            fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(title + " files", extensions));
+
+            AppServices.moveToActiveWindowScreen(window, 800, 450);
+            File file = fileChooser.showOpenDialog(window);
+            if(file != null) {
+                fileProperty.set(file);
+            }
+        }
+
+        public String formatExtensionsList(List<String> items) {
+            StringBuilder result = new StringBuilder();
+            for(int i = 0; i < items.size(); i++) {
+                result.append(".").append(items.get(i));
+
+                if (i < items.size() - 1) {
+                    result.append(", ");
+                }
+
+                if (i == items.size() - 2) {
+                    result.append("or ");
+                }
+            }
+
+            return result.toString();
+        }
+    }
+
+    private static class PGPVerifyService extends Service<PGPVerificationResult> {
+        private final File signature;
+        private final File manifest;
+        private final File publicKey;
+
+        public PGPVerifyService(File signature, File manifest, File publicKey) {
+            this.signature = signature;
+            this.manifest = manifest;
+            this.publicKey = publicKey;
+        }
+
+        @Override
+        protected Task<PGPVerificationResult> createTask() {
+            return new Task<>() {
+                protected PGPVerificationResult call() throws IOException, PGPVerificationException {
+                    boolean detachedSignature = !manifest.equals(signature);
+
+                    try(InputStream publicKeyStream = publicKey == null ? null : new FileInputStream(publicKey);
+                        InputStream contentStream = new BufferedInputStream(new FileInputStream(manifest));
+                        InputStream detachedSignatureStream = detachedSignature ? new FileInputStream(signature) : null) {
+                        return PGPUtils.verify(publicKeyStream, contentStream, detachedSignatureStream);
+                    }
+                }
+            };
+        }
+    }
+
+    private static class FileSha256Service extends Service<String> {
+        private final File file;
+
+        public FileSha256Service(File file) {
+            this.file = file;
+        }
+
+        @Override
+        protected Task<String> createTask() {
+            return new Task<>() {
+                protected String call() throws IOException {
+                    try(InputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
+                        return sha256(inputStream);
+                    }
+                }
+            };
+        }
+
+        private String sha256(InputStream stream) throws IOException {
+            try {
+                final byte[] buffer = new byte[1024 * 1024];
+                final MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+                int bytesRead = 0;
+                while((bytesRead = stream.read(buffer)) >= 0) {
+                    if (bytesRead > 0) {
+                        sha256.update(buffer, 0, bytesRead);
+                    }
+                }
+
+                return Utils.bytesToHex(sha256.digest());
+            } catch(NoSuchAlgorithmException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    private static class InvalidManifestException extends Exception { }
+}

src/main/java/com/sparrowwallet/sparrow/control/EntryCell.java

@@ -100,7 +100,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 actionBox.getChildren().add(viewTransactionButton);
 
                 BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
-                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() &&
+                if(blockTransaction.getHeight() <= 0 && canRBF(blockTransaction) &&
                         Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                     Button increaseFeeButton = new Button("");
                     increaseFeeButton.setGraphic(getIncreaseFeeRBFGlyph());
@@ -124,7 +124,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 NodeEntry nodeEntry = (NodeEntry)entry;
                 Address address = nodeEntry.getAddress();
                 setText(address.toString());
-                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry, true));
+                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry, true, getTreeTableView()));
                 Tooltip tooltip = new Tooltip();
                 tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(nodeEntry.getNode().toString());
@@ -149,6 +149,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                     signMessageButton.setGraphic(getSignMessageGlyph());
                     signMessageButton.setOnAction(event -> {
                         MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                        messageSignDialog.initOwner(getTreeTableView().getScene().getWindow());
                         messageSignDialog.showAndWait();
                     });
                     actionBox.getChildren().add(signMessageButton);
@@ -216,7 +217,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 .map(e -> (HashIndexEntry)e)
                 .filter(e -> e.getType().equals(HashIndexEntry.Type.INPUT) && e.isSpendable())
                 .map(e -> blockTransaction.getTransaction().getInputs().get((int)e.getHashIndex().getIndex()))
-                .filter(TransactionInput::isReplaceByFeeEnabled)
+                .filter(i -> Config.get().isMempoolFullRbf() || i.isReplaceByFeeEnabled())
                 .map(txInput -> walletTxos.keySet().stream().filter(txo -> txo.getHash().equals(txInput.getOutpoint().getHash()) && txo.getIndex() == txInput.getOutpoint().getIndex()).findFirst().get())
                 .collect(Collectors.toList());
 
@@ -230,16 +231,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 .filter(e -> e instanceof HashIndexEntry)
                 .map(e -> (HashIndexEntry)e)
                 .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT))
-                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
+                .map(e -> blockTransaction.getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                 .collect(Collectors.toList());
 
         List<TransactionOutput> consolidationOutputs = transactionEntry.getChildren().stream()
                 .filter(e -> e instanceof HashIndexEntry)
                 .map(e -> (HashIndexEntry)e)
                 .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.getKeyPurpose() == KeyPurpose.RECEIVE)
-                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
+                .map(e -> blockTransaction.getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                 .collect(Collectors.toList());
 
+        boolean consolidationTransaction = consolidationOutputs.size() == blockTransaction.getTransaction().getOutputs().size() && consolidationOutputs.size() == 1;
         long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum() - consolidationOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
         Transaction tx = blockTransaction.getTransaction();
         double vSize = tx.getVirtualSize();
@@ -254,7 +256,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
                 .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
         Collections.shuffle(outputGroups);
-        while((double)changeTotal / vSize < getMaxFeeRate() && !outputGroups.isEmpty() && !cancelTransaction) {
+        while((double)changeTotal / vSize < getMaxFeeRate() && !outputGroups.isEmpty() && !cancelTransaction && !consolidationTransaction) {
             //If there is insufficient change output, include another random output group so the fee can be increased
             OutputGroup outputGroup = outputGroups.remove(0);
             for(BlockTransactionHashIndex utxo : outputGroup.getUtxos()) {
@@ -350,12 +352,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         List<BlockTransactionHashIndex> ourOutputs = transactionEntry.getChildren().stream()
                 .filter(e -> e instanceof HashIndexEntry)
                 .map(e -> (HashIndexEntry)e)
-                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT))
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.isSpendable())
                 .map(HashIndexEntry::getHashIndex)
                 .collect(Collectors.toList());
 
         if(ourOutputs.isEmpty()) {
-            throw new IllegalStateException("Cannot create CPFP without any wallet outputs to spend");
+            AppServices.showErrorDialog("No spendable outputs", "None of the outputs on this transaction are spendable.\n\nEnsure that the outputs are not frozen" +
+                    (transactionEntry.getConfirmations() <= 0 ? ", and spending unconfirmed UTXOs is allowed." : "."));
+            return;
         }
 
         BlockTransactionHashIndex cpfpUtxo = ourOutputs.get(0);
@@ -392,11 +396,13 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, List.of(payment), null, blockTransaction.getFee(), true, null)));
     }
 
+    private static boolean canRBF(BlockTransaction blockTransaction) {
+        return Config.get().isMempoolFullRbf() || blockTransaction.getTransaction().isReplaceByFee();
+    }
+
     private static boolean canSignMessage(WalletNode walletNode) {
         Wallet wallet = walletNode.getWallet();
-        return wallet.getKeystores().size() == 1 &&
-                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB || wallet.getKeystores().get(0).getWalletModel().isCard()) &&
-                (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
+        return wallet.getKeystores().size() == 1 && (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
     }
 
     private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
@@ -469,7 +475,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB";
             }
 
-            tooltip += "\nRBF: " + (transactionEntry.getBlockTransaction().getTransaction().isReplaceByFee() ? "Enabled" : "Disabled");
+            tooltip += "\nRBF: " + (canRBF(transactionEntry.getBlockTransaction()) ? "Enabled" : "Disabled");
         }
 
         return tooltip;
@@ -546,7 +552,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
             });
             getItems().add(viewTransaction);
 
-            if(blockTransaction.getTransaction().isReplaceByFee() && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+            if(canRBF(blockTransaction) && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                 MenuItem increaseFee = new MenuItem("Increase Fee (RBF)");
                 increaseFee.setGraphic(getIncreaseFeeRBFGlyph());
                 increaseFee.setOnAction(AE -> {
@@ -557,7 +563,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 getItems().add(increaseFee);
             }
 
-            if(blockTransaction.getTransaction().isReplaceByFee() && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+            if(canRBF(blockTransaction) && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                 MenuItem cancelTx = new MenuItem("Cancel Transaction (RBF)");
                 cancelTx.setGraphic(getCancelTransactionRBFGlyph());
                 cancelTx.setOnAction(AE -> {
@@ -579,12 +585,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 getItems().add(createCpfp);
             }
 
-            MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
-            openBlockExplorer.setOnAction(AE -> {
-                hide();
-                AppServices.openBlockExplorer(blockTransaction.getHashAsString());
-            });
-            getItems().add(openBlockExplorer);
+            if(!Config.get().isBlockExplorerDisabled()) {
+                MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
+                openBlockExplorer.setOnAction(AE -> {
+                    hide();
+                    AppServices.openBlockExplorer(blockTransaction.getHashAsString());
+                });
+                getItems().add(openBlockExplorer);
+            }
 
             MenuItem copyTxid = new MenuItem("Copy Transaction ID");
             copyTxid.setOnAction(AE -> {
@@ -598,7 +606,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         }
     }
 
-    private static class TransactionContextMenu extends ContextMenu {
+    protected static class TransactionContextMenu extends ContextMenu {
         public TransactionContextMenu(String date, BlockTransaction blockTransaction) {
             MenuItem viewTransaction = new MenuItem("View Transaction");
             viewTransaction.setGraphic(getViewTransactionGlyph());
@@ -606,12 +614,16 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 hide();
                 EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
             });
+            getItems().add(viewTransaction);
 
-            MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
-            openBlockExplorer.setOnAction(AE -> {
-                hide();
-                AppServices.openBlockExplorer(blockTransaction.getHashAsString());
-            });
+            if(!Config.get().isBlockExplorerDisabled()) {
+                MenuItem openBlockExplorer = new MenuItem("Open in Block Explorer");
+                openBlockExplorer.setOnAction(AE -> {
+                    hide();
+                    AppServices.openBlockExplorer(blockTransaction.getHashAsString());
+                });
+                getItems().add(openBlockExplorer);
+            }
 
             MenuItem copyDate = new MenuItem("Copy Date");
             copyDate.setOnAction(AE -> {
@@ -620,6 +632,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 content.putString(date);
                 Clipboard.getSystemClipboard().setContent(content);
             });
+            getItems().add(copyDate);
 
             MenuItem copyTxid = new MenuItem("Copy Transaction ID");
             copyTxid.setOnAction(AE -> {
@@ -628,6 +641,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 content.putString(blockTransaction.getHashAsString());
                 Clipboard.getSystemClipboard().setContent(content);
             });
+            getItems().add(copyTxid);
 
             MenuItem copyHeight = new MenuItem("Copy Block Height");
             copyHeight.setOnAction(AE -> {
@@ -636,13 +650,12 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 content.putString(blockTransaction.getHeight() > 0 ? Integer.toString(blockTransaction.getHeight()) : "Mempool");
                 Clipboard.getSystemClipboard().setContent(content);
             });
-
-            getItems().addAll(viewTransaction, openBlockExplorer, copyDate, copyTxid, copyHeight);
+            getItems().add(copyHeight);
         }
     }
 
     public static class AddressContextMenu extends ContextMenu {
-        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry, boolean addUtxoItems) {
+        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry, boolean addUtxoItems, TreeTableView<Entry> treetable) {
             if(nodeEntry == null || !nodeEntry.getWallet().isBip47()) {
                 MenuItem receiveToAddress = new MenuItem("Receive To");
                 receiveToAddress.setGraphic(getReceiveGlyph());
@@ -660,6 +673,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 signVerifyMessage.setOnAction(AE -> {
                     hide();
                     MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                    messageSignDialog.initOwner(treetable.getScene().getWindow());
                     messageSignDialog.showAndWait();
                 });
                 getItems().add(signVerifyMessage);
@@ -789,6 +803,8 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         cell.getStyleClass().remove("transaction-row");
         cell.getStyleClass().remove("node-row");
         cell.getStyleClass().remove("utxo-row");
+        cell.getStyleClass().remove("unconfirmed-row");
+        cell.getStyleClass().remove("summary-row");
         cell.getStyleClass().remove("address-cell");
         cell.getStyleClass().remove("hashindex-row");
         cell.getStyleClass().remove("confirming");
@@ -823,6 +839,10 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                 if(hashIndexEntry.isSpent()) {
                     cell.getStyleClass().add("spent");
                 }
+            } else if(entry instanceof WalletSummaryDialog.UnconfirmedEntry) {
+                cell.getStyleClass().add("unconfirmed-row");
+            } else if(entry instanceof WalletSummaryDialog.SummaryEntry) {
+                cell.getStyleClass().add("summary-row");
             }
         }
     }

src/main/java/com/sparrowwallet/sparrow/control/FeeRangeSlider.java

@@ -0,0 +1,146 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.net.FeeRatesSource;
+import javafx.application.Platform;
+import javafx.scene.Node;
+import javafx.scene.control.Slider;
+import javafx.util.StringConverter;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.sparrowwallet.sparrow.AppServices.*;
+
+public class FeeRangeSlider extends Slider {
+    private static final double FEE_RATE_SCROLL_INCREMENT = 0.01;
+
+    public FeeRangeSlider() {
+        super(0, FEE_RATES_RANGE.size() - 1, 0);
+        setMajorTickUnit(1);
+        setMinorTickCount(0);
+        setSnapToTicks(false);
+        setShowTickLabels(true);
+        setShowTickMarks(true);
+        setBlockIncrement(Math.log(1.02) / Math.log(2));
+
+        setLabelFormatter(new StringConverter<>() {
+            @Override
+            public String toString(Double object) {
+                Long feeRate = LONG_FEE_RATES_RANGE.get(object.intValue());
+                if(isLongFeeRange() && feeRate >= 1000) {
+                    return feeRate / 1000 + "k";
+                }
+                return Long.toString(feeRate);
+            }
+
+            @Override
+            public Double fromString(String string) {
+                return null;
+            }
+        });
+
+        updateTrackHighlight();
+
+        valueProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                updateMaxFeeRange(newValue.doubleValue());
+            }
+        });
+
+        setOnScroll(event -> {
+            if(event.getDeltaY() != 0) {
+                double newFeeRate = getFeeRate() + (event.getDeltaY() > 0 ? FEE_RATE_SCROLL_INCREMENT : -FEE_RATE_SCROLL_INCREMENT);
+                if(newFeeRate < LONG_FEE_RATES_RANGE.get(0)) {
+                    newFeeRate = LONG_FEE_RATES_RANGE.get(0);
+                } else if(newFeeRate > LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1)) {
+                    newFeeRate = LONG_FEE_RATES_RANGE.get(LONG_FEE_RATES_RANGE.size() - 1);
+                }
+                setFeeRate(newFeeRate);
+            }
+        });
+    }
+
+    public double getFeeRate() {
+        return Math.pow(2.0, getValue());
+    }
+
+    public void setFeeRate(double feeRate) {
+        double value = Math.log(feeRate) / Math.log(2);
+        updateMaxFeeRange(value);
+        setValue(value);
+    }
+
+    private void updateMaxFeeRange(double value) {
+        if(value >= getMax() && !isLongFeeRange()) {
+            setMax(LONG_FEE_RATES_RANGE.size() - 1);
+            updateTrackHighlight();
+        } else if(value == getMin() && isLongFeeRange()) {
+            setMax(FEE_RATES_RANGE.size() - 1);
+            updateTrackHighlight();
+        }
+    }
+
+    private boolean isLongFeeRange() {
+        return getMax() > FEE_RATES_RANGE.size() - 1;
+    }
+
+    public void updateTrackHighlight() {
+        addFeeRangeTrackHighlight(0);
+    }
+
+    private void addFeeRangeTrackHighlight(int count) {
+        Platform.runLater(() -> {
+            Node track = lookup(".track");
+            if(track != null) {
+                Map<Integer, Double> targetBlocksFeeRates = getTargetBlocksFeeRates();
+                String highlight = "";
+                if(targetBlocksFeeRates.get(Integer.MAX_VALUE) != null) {
+                    highlight += "#a0a1a766 " + getPercentageOfFeeRange(targetBlocksFeeRates.get(Integer.MAX_VALUE)) + "%, ";
+                }
+                highlight += "#41a9c966 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_TWO_HOURS - 1) + "%, ";
+                highlight += "#fba71b66 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_HOUR - 1) + "%, ";
+                highlight += "#c8416466 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_HALF_HOUR - 1) + "%";
+
+                track.setStyle("-fx-background-color: " +
+                        "-fx-shadow-highlight-color, " +
+                        "linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), " +
+                        "linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)), " +
+                        "linear-gradient(to right, " + highlight + ")");
+            } else if(count < 20) {
+                addFeeRangeTrackHighlight(count+1);
+            }
+        });
+    }
+
+    private Map<Integer, Double> getTargetBlocksFeeRates() {
+        Map<Integer, Double> retrievedFeeRates = AppServices.getTargetBlockFeeRates();
+        if(retrievedFeeRates == null) {
+            retrievedFeeRates = TARGET_BLOCKS_RANGE.stream().collect(Collectors.toMap(java.util.function.Function.identity(), v -> getFallbackFeeRate(),
+                    (u, v) -> { throw new IllegalStateException("Duplicate target blocks"); },
+                    LinkedHashMap::new));
+        }
+
+        return retrievedFeeRates;
+    }
+
+    private int getPercentageOfFeeRange(Map<Integer, Double> targetBlocksFeeRates, Integer minTargetBlocks) {
+        List<Integer> rates = new ArrayList<>(targetBlocksFeeRates.keySet());
+        Collections.reverse(rates);
+        for(Integer targetBlocks : rates) {
+            if(targetBlocks < minTargetBlocks) {
+                return getPercentageOfFeeRange(targetBlocksFeeRates.get(targetBlocks));
+            }
+        }
+
+        return 100;
+    }
+
+    private int getPercentageOfFeeRange(Double feeRate) {
+        double index = Math.log(feeRate) / Math.log(2);
+        if(isLongFeeRange()) {
+            index *= ((double)FEE_RATES_RANGE.size() / (LONG_FEE_RATES_RANGE.size())) * 0.99;
+        }
+        return (int)Math.round(index * 10.0);
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/FiatCell.java

@@ -0,0 +1,94 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.CurrencyRate;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import org.controlsfx.tools.Platform;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+
+public class FiatCell extends TreeTableCell<Entry, Number> {
+    private final Tooltip tooltip;
+    private final FiatContextMenu contextMenu;
+
+    public FiatCell() {
+        super();
+        tooltip = new Tooltip();
+        contextMenu = new FiatContextMenu();
+        getStyleClass().add("coin-cell");
+        if(Platform.getCurrent() == Platform.OSX) {
+            getStyleClass().add("number-field");
+        }
+    }
+
+    @Override
+    protected void updateItem(Number amount, boolean empty) {
+        super.updateItem(amount, empty);
+
+        if(empty || amount == null) {
+            setText(null);
+            setGraphic(null);
+            setTooltip(null);
+            setContextMenu(null);
+        } else {
+            Entry entry = getTreeTableView().getTreeItem(getIndex()).getValue();
+            EntryCell.applyRowStyles(this, entry);
+
+            CoinTreeTable coinTreeTable = (CoinTreeTable) getTreeTableView();
+            UnitFormat format = coinTreeTable.getUnitFormat();
+            CurrencyRate currencyRate = coinTreeTable.getCurrencyRate();
+
+            if(currencyRate != null && currencyRate.isAvailable()) {
+                Currency currency = currencyRate.getCurrency();
+                double btcRate = currencyRate.getBtcRate();
+
+                BigDecimal satsBalance = BigDecimal.valueOf(amount.longValue());
+                BigDecimal btcBalance = satsBalance.divide(BigDecimal.valueOf(Transaction.SATOSHIS_PER_BITCOIN));
+                BigDecimal fiatBalance = btcBalance.multiply(BigDecimal.valueOf(btcRate));
+
+                String label = format.formatCurrencyValue(fiatBalance.doubleValue());
+                tooltip.setText("1 BTC = " + currency.getSymbol() + " " + format.formatCurrencyValue(btcRate));
+
+                setText(label);
+                setGraphic(null);
+                setTooltip(tooltip);
+                setContextMenu(contextMenu);
+            } else {
+                setText(null);
+                setGraphic(null);
+                setTooltip(null);
+                setContextMenu(null);
+            }
+        }
+    }
+
+    private class FiatContextMenu extends ContextMenu {
+        public FiatContextMenu() {
+            MenuItem copyValue = new MenuItem("Copy Value");
+            copyValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(getText());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            MenuItem copyRate = new MenuItem("Copy Rate");
+            copyRate.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(getTooltip().getText());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            getItems().addAll(copyValue, copyRate);
+        }
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/FileImportPane.java

@@ -150,6 +150,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
 
     private void importQR() {
         QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(this.getScene().getWindow());
         Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
         if(optionalResult.isPresent()) {
             QRScanDialog.Result result = optionalResult.get();
@@ -239,6 +240,8 @@ public abstract class FileImportPane extends TitledDescriptionPane {
         contentBox.setPadding(new Insets(10, 30, 10, 30));
         contentBox.setPrefHeight(60);
 
+        javafx.application.Platform.runLater(passwordField::requestFocus);
+
         return contentBox;
     }
 }

src/main/java/com/sparrowwallet/sparrow/control/FileKeystoreExportPane.java

@@ -4,12 +4,14 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.hummingbird.registry.RegistryType;
+import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -116,6 +118,7 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {
 
                 if(keystore.getSource() == KeystoreSource.HW_USB || keystore.getWalletModel().isCard()) {
                     TextAreaDialog dialog = new TextAreaDialog(message, false);
+                    dialog.initOwner(this.getScene().getWindow());
                     dialog.setTitle("Sign " + exporter.getName() + " Export");
                     dialog.getDialogPane().setHeaderText("The following text needs to be signed by the device.\nClick OK to continue.");
                     dialog.showAndWait();
@@ -126,6 +129,7 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {
                     List<String> operationFingerprints = List.of(keystore.getKeyDerivation().getMasterFingerprint());
 
                     DeviceSignMessageDialog deviceSignMessageDialog = new DeviceSignMessageDialog(operationFingerprints, wallet, message, keystore.getKeyDerivation());
+                    deviceSignMessageDialog.initOwner(this.getScene().getWindow());
                     Optional<String> optSignature = deviceSignMessageDialog.showAndWait();
                     if(optSignature.isPresent()) {
                         exporter.addSignature(keystore, optSignature.get(), baos);
@@ -151,10 +155,13 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {
             } else {
                 QRDisplayDialog qrDisplayDialog;
                 if(exporter instanceof Bip129) {
-                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), baos.toByteArray(), false);
+                    UR ur = UR.fromBytes(baos.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, baos.toByteArray());
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, true, false);
                 } else {
                     qrDisplayDialog = new QRDisplayDialog(baos.toString(StandardCharsets.UTF_8));
                 }
+                qrDisplayDialog.initOwner(buttonBox.getScene().getWindow());
                 qrDisplayDialog.showAndWait();
             }
         } catch(Exception e) {

src/main/java/com/sparrowwallet/sparrow/control/FileKeystoreImportPane.java

@@ -29,7 +29,7 @@ public class FileKeystoreImportPane extends FileImportPane {
         }
 
         if(requiredDerivation != null && !requiredDerivation.getDerivation().equals(keystore.getKeyDerivation().getDerivation())) {
-            setError("Incorrect derivation", "This account requires a derivation of " + requiredDerivation.getDerivationPath() + ", but the imported keystore has a derivation of " + keystore.getKeyDerivation().getDerivationPath() + ".");
+            setError("Incorrect derivation", "This account requires a derivation of " + requiredDerivation.getDerivationPath() + ", but the imported keystore has a derivation of " + KeyDerivation.writePath(keystore.getKeyDerivation().getDerivation()) + ".");
         } else {
             EventManager.get().post(new KeystoreImportEvent(keystore));
         }

src/main/java/com/sparrowwallet/sparrow/control/FileWalletExportPane.java

@@ -1,7 +1,11 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.hummingbird.UR;
+import com.sparrowwallet.hummingbird.registry.CryptoOutput;
 import com.sparrowwallet.hummingbird.registry.RegistryType;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
@@ -10,6 +14,10 @@ import com.sparrowwallet.sparrow.event.TimedEvent;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Control;
@@ -24,6 +32,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.Optional;
 
+import static com.sparrowwallet.sparrow.wallet.SettingsController.getCryptoOutput;
+
 public class FileWalletExportPane extends TitledDescriptionPane {
     private final Wallet wallet;
     private final WalletExport exporter;
@@ -111,19 +121,16 @@ public class FileWalletExportPane extends TitledDescriptionPane {
         if(wallet.isEncrypted() && exporter.walletExportRequiresDecryption()) {
             Wallet copy = wallet.copy();
             WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+            dlg.initOwner(buttonBox.getScene().getWindow());
             Optional<SecureString> password = dlg.showAndWait();
             if(password.isPresent()) {
                 final String walletId = AppServices.get().getOpenWallets().get(wallet).getWalletId(wallet);
+                String walletPassword = password.get().asString();
                 Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(copy, password.get());
                 decryptWalletService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Done"));
                     Wallet decryptedWallet = decryptWalletService.getValue();
-
-                    try {
-                        exportWallet(file, decryptedWallet);
-                    } finally {
-                        decryptedWallet.clearPrivate();
-                    }
+                    exportWallet(file, decryptedWallet, walletPassword);
                 });
                 decryptWalletService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Failed"));
@@ -133,28 +140,46 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 decryptWalletService.start();
             }
         } else {
-            exportWallet(file, wallet);
+            exportWallet(file, wallet, null);
         }
     }
 
-    private void exportWallet(File file, Wallet exportWallet) {
+    private void exportWallet(File file, Wallet exportWallet, String password) {
         try {
             if(file != null) {
-                try(OutputStream outputStream = new FileOutputStream(file)) {
-                    exporter.exportWallet(exportWallet, outputStream);
+                FileWalletExportService fileWalletExportService = new FileWalletExportService(exporter, file, exportWallet, password);
+                fileWalletExportService.setOnSucceeded(event -> {
                     EventManager.get().post(new WalletExportEvent(exportWallet));
-                }
+                });
+                fileWalletExportService.setOnFailed(event -> {
+                    Throwable e = event.getSource().getException();
+                    String errorMessage = e.getMessage();
+                    if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                        errorMessage = e.getCause().getMessage();
+                    }
+                    setError("Export Error", errorMessage);
+                });
+                fileWalletExportService.start();
             } else {
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                exporter.exportWallet(exportWallet, outputStream);
+                exporter.exportWallet(exportWallet, outputStream, password);
                 QRDisplayDialog qrDisplayDialog;
                 if(exporter instanceof CoboVaultMultisig) {
                     qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
-                } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig || exporter instanceof Bip129) {
+                } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig) {
                     qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), false);
+                } else if(exporter instanceof Bip129) {
+                    UR ur = UR.fromBytes(outputStream.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, outputStream.toByteArray());
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, true, false);
+                } else if(exporter instanceof Descriptor) {
+                    OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(exportWallet, KeyPurpose.DEFAULT_PURPOSES, null);
+                    CryptoOutput cryptoOutput = getCryptoOutput(exportWallet);
+                    qrDisplayDialog = new DescriptorQRDisplayDialog(exportWallet.getFullDisplayName(), outputDescriptor.toString(true), cryptoOutput.toUR());
                 } else {
                     qrDisplayDialog = new QRDisplayDialog(outputStream.toString(StandardCharsets.UTF_8));
                 }
+                qrDisplayDialog.initOwner(buttonBox.getScene().getWindow());
                 qrDisplayDialog.showAndWait();
             }
         } catch(Exception e) {
@@ -163,6 +188,42 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 errorMessage = e.getCause().getMessage();
             }
             setError("Export Error", errorMessage);
+        } finally {
+            if(file == null && password != null) {
+                exportWallet.clearPrivate();
+            }
+        }
+    }
+
+    public static class FileWalletExportService extends Service<Void> {
+        private final WalletExport exporter;
+        private final File file;
+        private final Wallet wallet;
+        private final String password;
+
+        public FileWalletExportService(WalletExport exporter, File file, Wallet wallet, String password) {
+            this.exporter = exporter;
+            this.file = file;
+            this.wallet = wallet;
+            this.password = password;
+        }
+
+        @Override
+        protected Task<Void> createTask() {
+            return new Task<>() {
+                @Override
+                protected Void call() throws Exception {
+                    try(OutputStream outputStream = new FileOutputStream(file)) {
+                        exporter.exportWallet(wallet, outputStream, password);
+                    } finally {
+                        if(password != null) {
+                            wallet.clearPrivate();
+                        }
+                    }
+
+                    return null;
+                }
+            };
         }
     }
 }

src/main/java/com/sparrowwallet/sparrow/control/FileWalletImportPane.java

@@ -12,7 +12,7 @@ public class FileWalletImportPane extends FileImportPane {
     private final WalletImport importer;
 
     public FileWalletImportPane(WalletImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable(), true);
+        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable(), importer.isWalletImportFileFormatAvailable());
         this.importer = importer;
     }
 

src/main/java/com/sparrowwallet/sparrow/control/FileWalletKeystoreImportPane.java

@@ -12,6 +12,7 @@ import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletImportEvent;
 import com.sparrowwallet.sparrow.io.ImportException;
 import com.sparrowwallet.sparrow.io.KeystoreFileImport;
+import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -38,6 +39,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
     private final KeystoreFileImport importer;
     private String fileName;
     private byte[] fileBytes;
+    private String password;
 
     public FileWalletKeystoreImportPane(KeystoreFileImport importer) {
         super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
@@ -46,6 +48,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
 
     protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
         this.fileName = fileName;
+        this.password = password;
 
         List<ScriptType> scriptTypes = ScriptType.getAddressableScriptTypes(PolicyType.SINGLE);
         if(wallets != null && !wallets.isEmpty()) {
@@ -83,7 +86,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
             EventManager.get().post(new WalletImportEvent(wallet));
         } else {
             ByteArrayInputStream bais = new ByteArrayInputStream(fileBytes);
-            Keystore keystore = importer.getKeystore(scriptType, bais, "");
+            Keystore keystore = importer.getKeystore(scriptType, bais, password);
 
             Wallet wallet = new Wallet();
             wallet.setName(Files.getNameWithoutExtension(fileName));
@@ -151,6 +154,8 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
         contentBox.setPadding(new Insets(10, 30, 10, 30));
         contentBox.setPrefHeight(60);
 
+        Platform.runLater(scriptTypeComboBox::requestFocus);
+
         return contentBox;
     }
 }

src/main/java/com/sparrowwallet/sparrow/control/MessageSignDialog.java

@@ -12,10 +12,9 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.event.OpenWalletsEvent;
-import com.sparrowwallet.sparrow.event.RequestOpenWalletsEvent;
-import com.sparrowwallet.sparrow.event.StorageEvent;
-import com.sparrowwallet.sparrow.event.TimedEvent;
+import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Storage;
 import javafx.application.Platform;
 import javafx.scene.control.*;
@@ -23,6 +22,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.SegmentedButton;
+import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
@@ -38,6 +38,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+
 public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     private static final Logger log = LoggerFactory.getLogger(MessageSignDialog.class);
 
@@ -50,6 +52,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     private final ToggleButton formatBip322;
     private final Wallet wallet;
     private WalletNode walletNode;
+    private boolean canSign;
     private boolean closed;
 
     /**
@@ -90,10 +93,12 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     public MessageSignDialog(Wallet wallet, WalletNode walletNode, String title, String msg, ButtonType... buttons) {
         if(walletNode != null) {
             checkWalletSigning(walletNode.getWallet());
+            this.canSign = canSign(walletNode.getWallet());
         }
 
         if(wallet != null) {
             checkWalletSigning(wallet);
+            this.canSign = canSign(wallet);
         }
 
         this.wallet = wallet;
@@ -148,6 +153,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         signature.setPrefRowCount(4);
         signature.setStyle("-fx-pref-height: 80px");
         signature.setWrapText(true);
+        signature.setOnMouseClicked(event -> signature.selectAll());
         signatureField.getInputs().add(signature);
 
         Field formatField = new Field();
@@ -172,6 +178,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             formatButtons.setDisable(true);
         }
 
+        ButtonType showQrButtonType = new javafx.scene.control.ButtonType("Sign by QR", ButtonBar.ButtonData.LEFT);
         ButtonType signButtonType = new javafx.scene.control.ButtonType("Sign", ButtonBar.ButtonData.BACK_PREVIOUS);
         ButtonType verifyButtonType = new javafx.scene.control.ButtonType("Verify", ButtonBar.ButtonData.NEXT_FORWARD);
         ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -190,10 +197,20 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                 });
             }
         } else {
-            dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);
+            dialogPane.getButtonTypes().addAll(showQrButtonType, signButtonType, verifyButtonType, doneButtonType);
+
+            Button showQrButton = (Button) dialogPane.lookupButton(showQrButtonType);
+            showQrButton.setDisable(wallet == null);
+            showQrButton.setGraphic(getGlyph(new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QRCODE)));
+            showQrButton.setGraphicTextGap(5);
+            showQrButton.setOnAction(event -> {
+                showQr();
+            });
 
             Button signButton = (Button) dialogPane.lookupButton(signButtonType);
-            signButton.setDisable(wallet == null);
+            signButton.setDisable(!canSign);
+            signButton.setGraphic(getGlyph(getSignGlyph()));
+            signButton.setGraphicTextGap(5);
             signButton.setOnAction(event -> {
                 signMessage();
             });
@@ -205,7 +222,8 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             });
 
             boolean validAddress = isValidAddress();
-            signButton.setDisable(!validAddress || (wallet == null));
+            showQrButton.setDisable(!validAddress || (wallet == null));
+            signButton.setDisable(!validAddress || !canSign);
             verifyButton.setDisable(!validAddress);
 
             ValidationSupport validationSupport = new ValidationSupport();
@@ -216,7 +234,8 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
 
             address.textProperty().addListener((observable, oldValue, newValue) -> {
                 boolean valid = isValidAddress();
-                signButton.setDisable(!valid || (wallet == null));
+                showQrButton.setDisable(!valid || (wallet == null));
+                signButton.setDisable(!valid || !canSign);
                 verifyButton.setDisable(!valid);
 
                 if(valid) {
@@ -248,7 +267,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
 
         AppServices.onEscapePressed(dialogPane.getScene(), () -> setResult(ButtonBar.ButtonData.CANCEL_CLOSE));
         AppServices.moveToActiveWindowScreen(this);
-        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
+        setResultConverter(dialogButton -> dialogButton == showQrButtonType || dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
 
         Platform.runLater(() -> {
             if(address.getText().isEmpty()) {
@@ -269,9 +288,12 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         if(wallet.getKeystores().size() != 1) {
             throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
         }
-        if(!wallet.getKeystores().get(0).hasPrivateKey() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB && !wallet.getKeystores().get(0).getWalletModel().isCard()) {
-            throw new IllegalArgumentException("Cannot sign messages using a wallet without private keys or a connected keystore");
-        }
+    }
+
+    private boolean canSign(Wallet wallet) {
+        return wallet.getKeystores().get(0).hasPrivateKey()
+                || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB
+                || wallet.getKeystores().get(0).getWalletModel().isCard();
     }
 
     private Address getAddress()throws InvalidAddressException {
@@ -320,6 +342,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             return;
         }
 
+        if(!canSign) {
+            AppServices.showErrorDialog("Wallet can't sign", "This wallet cannot sign a message.");
+            return;
+        }
+
         //Note we can expect a single keystore due to the check in the constructor
         Wallet signingWallet = walletNode.getWallet();
         if(signingWallet.getKeystores().get(0).hasPrivateKey()) {
@@ -358,6 +385,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         List<String> fingerprints = List.of(deviceWallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint());
         KeyDerivation fullDerivation = deviceWallet.getKeystores().get(0).getKeyDerivation().extend(walletNode.getDerivation());
         DeviceSignMessageDialog deviceSignMessageDialog = new DeviceSignMessageDialog(fingerprints, deviceWallet, message.getText().trim(), fullDerivation);
+        deviceSignMessageDialog.initOwner(getDialogPane().getScene().getWindow());
         Optional<String> optSignature = deviceSignMessageDialog.showAndWait();
         if(optSignature.isPresent()) {
             signature.clear();
@@ -430,6 +458,60 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         return providedAddress.equals(signedMessageAddress);
     }
 
+    private void showQr() {
+        if(walletNode == null) {
+            AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
+            return;
+        }
+
+        //Note we can expect a single keystore due to the check in the constructor
+        KeyDerivation firstDerivation = walletNode.getWallet().getKeystores().get(0).getKeyDerivation();
+        String derivationPath = KeyDerivation.writePath(firstDerivation.extend(walletNode.getDerivation()).getDerivation(), false);
+
+        String qrText = "signmessage " + derivationPath + " ascii:" + message.getText().trim();
+        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(qrText, true);
+        qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
+        Optional<ButtonType> optButtonType = qrDisplayDialog.showAndWait();
+        if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+            scanQr();
+        }
+    }
+
+    private void scanQr() {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
+        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
+        if(optionalResult.isPresent()) {
+            QRScanDialog.Result result = optionalResult.get();
+            if(result.payload != null) {
+                signature.clear();
+                signature.appendText(result.payload);
+            } else if(result.exception != null) {
+                log.error("Error scanning QR", result.exception);
+                showErrorDialog("Error scanning QR", result.exception.getMessage());
+            } else {
+                AppServices.showErrorDialog("Invalid QR Code", "Cannot parse QR code into a signature.");
+            }
+        }
+    }
+
+    protected Glyph getSignGlyph() {
+        if(wallet != null) {
+            if(wallet.containsSource(KeystoreSource.HW_USB)) {
+                return new Glyph(FontAwesome5Brands.FONT_NAME, FontAwesome5Brands.Glyph.USB);
+            } else if(wallet.getKeystores().get(0).getWalletModel().isCard()) {
+                return new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WIFI);
+            }
+        }
+
+        return new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
+    }
+
+    private static Glyph getGlyph(Glyph glyph) {
+        glyph.setFontSize(11);
+        return glyph;
+    }
+
     @Subscribe
     public void openWallets(OpenWalletsEvent event) {
         Storage storage = event.getStorage(wallet);
@@ -439,6 +521,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         }
 
         WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+        dlg.initOwner(getDialogPane().getScene().getWindow());
         Optional<SecureString> password = dlg.showAndWait();
         if(password.isPresent()) {
             Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(walletNode.getWallet().copy(), password.get());

src/main/java/com/sparrowwallet/sparrow/control/MixStatusCell.java

@@ -70,7 +70,7 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
     }
 
     private void setMixFail(MixFailReason mixFailReason, String mixError, Long mixErrorTimestamp) {
-        if(mixFailReason != MixFailReason.CANCEL) {
+        if(mixFailReason.isError()) {
             long elapsed = mixErrorTimestamp == null ? 0L : System.currentTimeMillis() - mixErrorTimestamp;
             if(elapsed >= ERROR_DISPLAY_MILLIS) {
                 //Old error, don't set again.
@@ -116,22 +116,15 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
             progressIndicator.setProgress(mixProgress.getMixStep().getProgressPercent() == 100 ? -1 : mixProgress.getMixStep().getProgressPercent() / 100.0);
             setGraphic(progressIndicator);
             Tooltip tt = new Tooltip();
-            String status = mixProgress.getMixStep().getMessage().substring(0, 1).toUpperCase(Locale.ROOT) + mixProgress.getMixStep().getMessage().substring(1);
+            String status = mixProgress.getMixStep().getMessage().replaceAll("_", " ");
+            status = status.substring(0, 1).toUpperCase(Locale.ROOT) + status.substring(1).toLowerCase(Locale.ROOT);
+            if(mixProgress.getMixStep() == MixStep.REGISTER_INPUT) {
+                status += "\n\nThis progress is normal for one mixing UTXO per pool while waiting to be randomly selected for a mix.\n" +
+                        "This may take hours or days, and time in the pool is generally more important than individual number of mixes.\n" +
+                        "Each UTXO's anonymity set is dependent not only on its own mix count, but that of its peers as well.";
+            }
             tt.setText(status);
             setTooltip(tt);
-
-            if(mixProgress.getMixStep() == MixStep.REGISTERED_INPUT) {
-                tt.setOnShowing(event -> {
-                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-                    Whirlpool.RegisteredInputsService registeredInputsService = new Whirlpool.RegisteredInputsService(whirlpool, mixProgress.getPoolId());
-                    registeredInputsService.setOnSucceeded(eventStateHandler -> {
-                        if(registeredInputsService.getValue() != null) {
-                            tt.setText(status + " (1 of " + registeredInputsService.getValue() + ")");
-                        }
-                    });
-                    registeredInputsService.start();
-                });
-            }
         } else {
             setGraphic(null);
             setTooltip(null);

src/main/java/com/sparrowwallet/sparrow/control/MnemonicGridDialog.java

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -138,6 +139,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
 
         dialogPane.setPrefWidth(952);
         dialogPane.setPrefHeight(500);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         AppServices.moveToActiveWindowScreen(this);
     }
@@ -169,20 +171,31 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
         List<String> abbreviations = selectedCells.stream()
                 .map(position -> (String)spreadsheetView.getGrid().getRows().get(position.getRow()).get(position.getColumn()).getItem()).collect(Collectors.toList());
 
+        boolean isInteger = abbreviations.stream().allMatch(Utils::isNumber);
+        boolean isHex = abbreviations.stream().allMatch(Utils::isHex);
+
         List<String> words = new ArrayList<>();
         for(String abbreviation : abbreviations) {
-            for(String word : Bip39MnemonicCode.INSTANCE.getWordList()) {
-                if((abbreviation.length() == 3 && word.equals(abbreviation)) || (abbreviation.length() >= 4 && word.startsWith(abbreviation))) {
-                    words.add(word);
-                    break;
+            if(isInteger) {
+                try {
+                    int index = Integer.parseInt(abbreviation);
+                    words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
+                } catch(NumberFormatException e) {
+                    //ignore
+                }
+            } else if(isHex) {
+                try {
+                    int index = Integer.parseInt(abbreviation, 16);
+                    words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
+                } catch(NumberFormatException e) {
+                    //ignore
+                }
+            } else {
+                for(String word : Bip39MnemonicCode.INSTANCE.getWordList()) {
+                    if((abbreviation.length() == 3 && word.equals(abbreviation)) || (abbreviation.length() >= 4 && word.startsWith(abbreviation))) {
+                        words.add(word);
+                    }
                 }
-            }
-
-            try {
-                int index = Integer.parseInt(abbreviation);
-                words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
-            } catch(NumberFormatException e) {
-                //ignore
             }
         }
 
@@ -269,6 +282,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                 ButtonBar.setButtonData(generateButton, buttonData);
                 generateButton.setOnAction(event -> {
                     SeedEntryDialog seedEntryDialog = new SeedEntryDialog("Border Wallets Entropy Grid Recovery Seed", 12);
+                    seedEntryDialog.initOwner(getDialogPane().getScene().getWindow());
                     Optional<List<String>> optWords = seedEntryDialog.showAndWait();
                     if(optWords.isPresent()) {
                         List<String> mnemonicWords = optWords.get();

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystoreImportPane.java

@@ -33,6 +33,7 @@ import java.util.Optional;
 public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
     protected final Wallet wallet;
     private final KeystoreMnemonicImport importer;
+    private final KeyDerivation defaultDerivation;
 
     private SplitMenuButton importButton;
 
@@ -43,10 +44,11 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
     private Button confirmButton;
     private List<String> generatedMnemonicCode;
 
-    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer) {
+    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer, KeyDerivation defaultDerivation) {
         super(importer.getName(), "Create or enter seed", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.importer = importer;
+        this.defaultDerivation = defaultDerivation;
 
         createImportButton();
         buttonBox.getChildren().add(importButton);
@@ -59,7 +61,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
         importButton.getStyleClass().add("default-button");
         importButton.setOnAction(event -> {
             importButton.setDisable(true);
-            importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
+            importKeystore(getDefaultDerivation(), false);
         });
         String[] accounts = new String[] {"Import Default Account #0", "Import Account #1", "Import Account #2", "Import Account #3", "Import Account #4", "Import Account #5", "Import Account #6", "Import Account #7", "Import Account #8", "Import Account #9"};
         int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
@@ -77,6 +79,10 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
         importButton.setVisible(false);
     }
 
+    private List<ChildNumber> getDefaultDerivation() {
+        return defaultDerivation == null || defaultDerivation.getDerivation().isEmpty() ? wallet.getScriptType().getDefaultDerivation() : defaultDerivation.getDerivation();
+    }
+
     protected void enterMnemonic(int numWords) {
         generatedMnemonicCode = null;
         super.enterMnemonic(numWords);
@@ -243,7 +249,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
             setDescription("Ready to import");
             showHideLink.setText("Show Derivation...");
             showHideLink.setVisible(false);
-            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+            setContent(getDerivationEntry(getDefaultDerivation()));
         }
     }
 
@@ -254,6 +260,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
             if(!dryrun) {
                 if(passphraseProperty.get() != null && !passphraseProperty.get().isEmpty()) {
                     KeystorePassphraseDialog keystorePassphraseDialog = new KeystorePassphraseDialog(null, keystore, true);
+                    keystorePassphraseDialog.initOwner(this.getScene().getWindow());
                     Optional<String> optPassphrase = keystorePassphraseDialog.showAndWait();
                     if(optPassphrase.isEmpty() || !optPassphrase.get().equals(passphraseProperty.get())) {
                         throw new ImportException("Re-entered passphrase did not match");

src/main/java/com/sparrowwallet/sparrow/control/MnemonicKeystorePane.java

@@ -97,6 +97,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
     protected void showGrid() {
         MnemonicGridDialog mnemonicGridDialog = new MnemonicGridDialog();
+        mnemonicGridDialog.initOwner(this.getScene().getWindow());
         Optional<List<String>> optWords = mnemonicGridDialog.showAndWait();
         if(optWords.isPresent()) {
             List<String> words = optWords.get();
@@ -134,6 +135,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
     protected void scanQR() {
         QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(this.getScene().getWindow());
         Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
         if(optionalResult.isPresent()) {
             QRScanDialog.Result result = optionalResult.get();

src/main/java/com/sparrowwallet/sparrow/control/MnemonicWalletKeystoreImportPane.java

@@ -109,6 +109,7 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
 
         List<List<ChildNumber>> derivations = ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE).stream().map(ScriptType::getDefaultDerivation).collect(Collectors.toList());
         derivations.add(List.of(new ChildNumber(0, true)));
+        derivations.add(ScriptType.P2PKH.getDefaultDerivation(1)); //Bisq segwit misderivation
 
         for(ScriptType scriptType : ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE)) {
             for(List<ChildNumber> derivation : derivations) {

src/main/java/com/sparrowwallet/sparrow/control/PayNymCell.java

@@ -110,6 +110,7 @@ public class PayNymCell extends ListCell<PayNym> {
             MenuItem rename = new MenuItem("Rename Contact...");
             rename.setOnAction(event -> {
                 WalletLabelDialog walletLabelDialog = new WalletLabelDialog(payNym.nymName(), "Contact");
+                walletLabelDialog.initOwner(PayNymCell.this.getScene().getWindow());
                 Optional<String> optLabel = walletLabelDialog.showAndWait();
                 if(optLabel.isPresent()) {
                     int index = getListView().getItems().indexOf(payNym);

src/main/java/com/sparrowwallet/sparrow/control/PrivateKeySweepDialog.java

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.google.common.base.Throwables;
+import com.google.common.eventbus.Subscribe;
 import com.google.common.io.Files;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.address.Address;
@@ -14,6 +15,9 @@ import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTInput;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.event.FeeRatesUpdatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.CardApi;
 import com.sparrowwallet.sparrow.io.Config;
@@ -46,10 +50,7 @@ import tornadofx.control.Form;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.drongo.protocol.ScriptType.P2TR;
@@ -62,6 +63,8 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
     private final CopyableLabel keyAddress;
     private final ComboBoxTextField toAddress;
     private final ComboBox<Wallet> toWallet;
+    private final FeeRangeSlider feeRange;
+    private final CopyableLabel feeRate;
 
     public PrivateKeySweepDialog(Wallet wallet) {
         final DialogPane dialogPane = getDialogPane();
@@ -146,7 +149,24 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         stackPane.getChildren().addAll(toWallet, toAddress);
         toAddressField.getInputs().add(stackPane);
 
-        fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField);
+        Field feeRangeField = new Field();
+        feeRangeField.setText("Fee range:");
+        feeRange = new FeeRangeSlider();
+        feeRange.setMaxWidth(320);
+        feeRangeField.getInputs().add(feeRange);
+
+        Field feeRateField = new Field();
+        feeRateField.setText("Fee rate:");
+        feeRate = new CopyableLabel();
+        feeRateField.getInputs().add(feeRate);
+
+        feeRange.valueProperty().addListener((observable, oldValue, newValue) -> {
+            updateFeeRate();
+        });
+        feeRange.setFeeRate(AppServices.getDefaultFeeRate());
+        updateFeeRate();
+
+        fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField, feeRangeField, feeRateField);
         form.getChildren().add(fieldset);
         dialogPane.setContent(form);
 
@@ -170,6 +190,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
 
             boolean isValidKey = isValidKey();
             createButton.setDisable(!isValidKey || !isValidToAddress());
+            setScriptTypes(isValidKey);
             if(isValidKey) {
                 setFromAddress();
             }
@@ -201,6 +222,11 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         setResultConverter(dialogButton -> null);
         dialogPane.setPrefWidth(680);
 
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+
         ValidationSupport validationSupport = new ValidationSupport();
         Platform.runLater(() -> {
             validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
@@ -224,6 +250,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
 
     private void decryptKey() {
         PassphraseDialog passphraseDialog = new PassphraseDialog();
+        passphraseDialog.initOwner(getDialogPane().getScene().getWindow());
         Optional<String> optPassphrase = passphraseDialog.showAndWait();
         if(optPassphrase.isPresent()) {
             try {
@@ -263,8 +290,19 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         keyAddress.setText(address.toString());
     }
 
+    private void setScriptTypes(boolean isValidKey) {
+        boolean compressed = !isValidKey || getPrivateKey().getKey().isCompressed();
+        if(compressed && !keyScriptType.getItems().equals(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE))) {
+            keyScriptType.getItems().addAll(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE).stream().filter(s -> !keyScriptType.getItems().contains(s)).collect(Collectors.toList()));
+        } else if(!compressed && !keyScriptType.getItems().equals(List.of(ScriptType.P2PKH))) {
+            keyScriptType.getSelectionModel().select(0);
+            keyScriptType.getItems().removeIf(scriptType -> scriptType != ScriptType.P2PKH);
+        }
+    }
+
     private void scanPrivateKey() {
         QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
         Optional<QRScanDialog.Result> result = qrScanDialog.showAndWait();
         if(result.isPresent() && result.get().payload != null) {
             key.setText(result.get().payload);
@@ -294,6 +332,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
 
     private void unsealPrivateKey() {
         DeviceUnsealDialog deviceUnsealDialog = new DeviceUnsealDialog(Collections.emptyList());
+        deviceUnsealDialog.initOwner(getDialogPane().getScene().getWindow());
         Optional<DeviceUnsealDialog.DevicePrivateKey> optPrivateKey = deviceUnsealDialog.showAndWait();
         if(optPrivateKey.isPresent()) {
             DeviceUnsealDialog.DevicePrivateKey devicePrivateKey = optPrivateKey.get();
@@ -312,6 +351,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
             Date since = null;
             if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
                 WalletBirthDateDialog addressScanDateDialog = new WalletBirthDateDialog(null, true);
+                addressScanDateDialog.initOwner(getDialogPane().getScene().getWindow());
                 Optional<Date> optSince = addressScanDateDialog.showAndWait();
                 if(optSince.isPresent()) {
                     since = optSince.get();
@@ -330,6 +370,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
 
             if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
                 ServiceProgressDialog serviceProgressDialog = new ServiceProgressDialog("Address Scan", "Scanning address for transactions...", "/image/sparrow.png", addressUtxosService);
+                serviceProgressDialog.initOwner(getDialogPane().getScene().getWindow());
                 AppServices.moveToActiveWindowScreen(serviceProgressDialog);
             }
 
@@ -352,7 +393,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         TransactionOutput sweepOutput = new TransactionOutput(noFeeTransaction, total, destAddress.getOutputScript());
         noFeeTransaction.addOutput(sweepOutput);
 
-        Double feeRate = AppServices.getDefaultFeeRate();
+        double feeRate = feeRange.getFeeRate();
         long fee = (long)Math.ceil(noFeeTransaction.getVirtualSize() * feeRate);
         if(feeRate == Transaction.DEFAULT_MIN_RELAY_FEE) {
             fee++;
@@ -420,6 +461,16 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         return glyph;
     }
 
+    private void updateFeeRate() {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        feeRate.setText(format.getCurrencyFormat().format(feeRange.getFeeRate()) + " sats/vB");
+    }
+
+    @Subscribe
+    public void feeRatesUpdated(FeeRatesUpdatedEvent event) {
+        feeRange.updateTrackHighlight();
+    }
+
     public class PassphraseDialog extends Dialog<String> {
         private final CustomPasswordField passphrase;
 

src/main/java/com/sparrowwallet/sparrow/control/QRDensity.java

@@ -1,22 +1,28 @@
 package com.sparrowwallet.sparrow.control;
 
 public enum QRDensity {
-    NORMAL("Normal", 250),
-    LOW("Low", 80);
+    NORMAL("Normal", 400, 2000),
+    LOW("Low", 80, 1000);
 
     private final String name;
-    private final int maxFragmentLength;
+    private final int maxUrFragmentLength;
+    private final int maxBbqrFragmentLength;
 
-    QRDensity(String name, int maxFragmentLength) {
+    QRDensity(String name, int maxUrFragmentLength, int maxBbqrFragmentLength) {
         this.name = name;
-        this.maxFragmentLength = maxFragmentLength;
+        this.maxUrFragmentLength = maxUrFragmentLength;
+        this.maxBbqrFragmentLength = maxBbqrFragmentLength;
     }
 
     public String getName() {
         return name;
     }
 
-    public int getMaxFragmentLength() {
-        return maxFragmentLength;
+    public int getMaxUrFragmentLength() {
+        return maxUrFragmentLength;
+    }
+
+    public int getMaxBbqrFragmentLength() {
+        return maxBbqrFragmentLength;
     }
 }

src/main/java/com/sparrowwallet/sparrow/control/QRDisplayDialog.java

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.client.j2se.MatrixToImageConfig;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
@@ -13,6 +14,9 @@ import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.ImportException;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.UREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoding;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
@@ -29,21 +33,30 @@ import org.slf4j.LoggerFactory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;
 
 @SuppressWarnings("deprecation")
-public class QRDisplayDialog extends Dialog<UR> {
+public class QRDisplayDialog extends Dialog<ButtonType> {
     private static final Logger log = LoggerFactory.getLogger(QRDisplayDialog.class);
 
     private static final int MIN_FRAGMENT_LENGTH = 10;
 
-    private static final int ANIMATION_PERIOD_MILLIS = 200;
+    private static final double ANIMATION_PERIOD_MILLIS = 200d;
 
-    private static final int QR_WIDTH = 480;
-    private static final int QR_HEIGHT = 480;
+    private static final int DEFAULT_QR_SIZE = 580;
+    private static final int REDUCED_QR_SIZE = 520;
+
+    private static final BBQREncoding DEFAULT_BBQR_ENCODING = BBQREncoding.ZLIB;
+
+    private final int qrSize = getQRSize();
 
     private final UR ur;
-    private UREncoder encoder;
+    private UREncoder urEncoder;
+
+    private final BBQR bbqr;
+    private BBQREncoder bbqrEncoder;
+    private boolean useBbqrEncoding;
 
     private final ImageView qrImageView;
 
@@ -58,17 +71,92 @@ public class QRDisplayDialog extends Dialog<UR> {
     private static boolean initialDensityChange;
 
     public QRDisplayDialog(String type, byte[] data, boolean addLegacyEncodingOption) throws UR.URException {
-        this(UR.fromBytes(type, data), addLegacyEncodingOption);
+        this(UR.fromBytes(type, data), null, addLegacyEncodingOption, false, false);
     }
 
     public QRDisplayDialog(UR ur) {
-        this(ur, false);
+        this(ur, null, false, false, false);
     }
 
-    public QRDisplayDialog(UR ur, boolean addLegacyEncodingOption) {
+    public QRDisplayDialog(UR ur, BBQR bbqr, boolean addLegacyEncodingOption, boolean addScanButton, boolean selectBbqrButton) {
         this.ur = ur;
-        this.addLegacyEncodingOption = addLegacyEncodingOption;
-        this.encoder = new UREncoder(ur, Config.get().getQrDensity().getMaxFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+        this.bbqr = bbqr;
+        this.addLegacyEncodingOption = bbqr == null && addLegacyEncodingOption;
+
+        this.urEncoder = new UREncoder(ur, Config.get().getQrDensity().getMaxUrFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+
+        if(bbqr != null) {
+            this.bbqrEncoder = new BBQREncoder(bbqr.type(), DEFAULT_BBQR_ENCODING, bbqr.data(), Config.get().getQrDensity().getMaxBbqrFragmentLength(), 0);
+            if(selectBbqrButton) {
+                useBbqrEncoding = true;
+            }
+        }
+
+        final DialogPane dialogPane = new QRDisplayDialogPane();
+        setDialogPane(dialogPane);
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        StackPane stackPane = new StackPane();
+        qrImageView = new ImageView();
+        stackPane.getChildren().add(qrImageView);
+
+        qrImageView.setOnScroll(scrollEvent -> {
+            if(animateQRService != null && animateQRService.isRunning() && scrollEvent.getDeltaY() != 0) {
+                Duration duration = animateQRService.getPeriod();
+                Duration newDuration = scrollEvent.getDeltaY() > 0 ? duration.multiply(1.1) : duration.multiply(0.9);
+                if(newDuration.lessThan(Duration.millis(ANIMATION_PERIOD_MILLIS*10)) && newDuration.greaterThan(Duration.millis(ANIMATION_PERIOD_MILLIS/2))) {
+                    animateQRService.setPeriod(newDuration);
+                }
+            }
+        });
+
+        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
+
+        nextPart();
+        if(isSinglePart()) {
+            qrImageView.setImage(getQrCode(currentPart));
+        } else {
+            createAnimateQRService();
+        }
+
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialogPane.getButtonTypes().add(cancelButtonType);
+
+        if(this.addLegacyEncodingOption) {
+            final ButtonType legacyEncodingButtonType = new javafx.scene.control.ButtonType("Use Legacy Encoding (Cobo Vault)", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(legacyEncodingButtonType);
+        } else {
+            final ButtonType densityButtonType = new javafx.scene.control.ButtonType("Change Density", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(densityButtonType);
+        }
+
+        if(bbqr != null) {
+            final ButtonType bbqrButtonType = new javafx.scene.control.ButtonType("Show BBQr", ButtonBar.ButtonData.BACK_PREVIOUS);
+            dialogPane.getButtonTypes().add(bbqrButtonType);
+        }
+
+        if(addScanButton) {
+            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.OK_DONE);
+            dialogPane.getButtonTypes().add(scanButtonType);
+        }
+
+        dialogPane.setPrefWidth(40 + qrSize + 40);
+        dialogPane.setPrefHeight(40 + qrSize + 85);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
+        AppServices.moveToActiveWindowScreen(this);
+
+        setResultConverter(dialogButton -> dialogButton);
+    }
+
+    public QRDisplayDialog(String data) {
+        this(data, false);
+    }
+
+    public QRDisplayDialog(String data, boolean addScanButton) {
+        this.ur = null;
+        this.bbqr = null;
+        this.urEncoder = null;
+        this.bbqrEncoder = null;
 
         final DialogPane dialogPane = new QRDisplayDialogPane();
         setDialogPane(dialogPane);
@@ -78,54 +166,27 @@ public class QRDisplayDialog extends Dialog<UR> {
         qrImageView = new ImageView();
         stackPane.getChildren().add(qrImageView);
 
-        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
-
-        nextPart();
-        if(encoder.isSinglePart()) {
-            qrImageView.setImage(getQrCode(currentPart));
-        } else {
-            createAnimateQRService();
-        }
-
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().add(cancelButtonType);
-
-        if(addLegacyEncodingOption) {
-            final ButtonType legacyEncodingButtonType = new javafx.scene.control.ButtonType("Use Legacy Encoding (Cobo Vault)", ButtonBar.ButtonData.LEFT);
-            dialogPane.getButtonTypes().add(legacyEncodingButtonType);
-        } else {
-            final ButtonType densityButtonType = new javafx.scene.control.ButtonType("Change Density", ButtonBar.ButtonData.LEFT);
-            dialogPane.getButtonTypes().add(densityButtonType);
-        }
-
-        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
-        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
-        AppServices.moveToActiveWindowScreen(this);
-
-        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
-    }
-
-    public QRDisplayDialog(String data) {
-        this.ur = null;
-        this.encoder = null;
-
-        final DialogPane dialogPane = getDialogPane();
-        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-
-        StackPane stackPane = new StackPane();
-        qrImageView = new ImageView();
-        stackPane.getChildren().add(qrImageView);
-
         dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
         qrImageView.setImage(getQrCode(data));
 
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
         dialogPane.getButtonTypes().addAll(cancelButtonType);
-        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
-        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
+
+        if(addScanButton) {
+            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.OK_DONE);
+            dialogPane.getButtonTypes().add(scanButtonType);
+        }
+
+        dialogPane.setPrefWidth(40 + qrSize + 40);
+        dialogPane.setPrefHeight(40 + qrSize + 85);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
         AppServices.moveToActiveWindowScreen(this);
 
-        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
+        setResultConverter(dialogButton -> dialogButton);
+    }
+
+    private int getQRSize() {
+        return AppServices.isReducedWindowHeight() ? REDUCED_QR_SIZE : DEFAULT_QR_SIZE;
     }
 
     private void createAnimateQRService() {
@@ -137,9 +198,22 @@ public class QRDisplayDialog extends Dialog<UR> {
         });
     }
 
+    private boolean isSinglePart() {
+        if(useBbqrEncoding) {
+            return bbqrEncoder.isSinglePart();
+        } else if(!useLegacyEncoding) {
+            return urEncoder.isSinglePart();
+        } else {
+            return legacyParts.length == 1;
+        }
+    }
+
     private void nextPart() {
-        if(!useLegacyEncoding) {
-            String fragment = encoder.nextPart();
+        if(useBbqrEncoding) {
+            String fragment = bbqrEncoder.nextPart();
+            currentPart = fragment.toUpperCase(Locale.ROOT);
+        } else if(!useLegacyEncoding) {
+            String fragment = urEncoder.nextPart();
             currentPart = fragment.toUpperCase(Locale.ROOT);
         } else {
             currentPart = legacyParts[legacyPartIndex];
@@ -153,7 +227,7 @@ public class QRDisplayDialog extends Dialog<UR> {
     protected Image getQrCode(String fragment) {
         try {
             QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT);
+            BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, qrSize, qrSize, Map.of(EncodeHintType.MARGIN, "2"));
 
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             MatrixToImageWriter.writeToStream(qrMatrix, "PNG", baos, new MatrixToImageConfig());
@@ -175,37 +249,23 @@ public class QRDisplayDialog extends Dialog<UR> {
                 this.legacyParts = legacyEncoder.encode();
                 this.useLegacyEncoding = true;
 
-                if(legacyParts.length == 1) {
-                    if(animateQRService != null) {
-                        animateQRService.cancel();
-                    }
-
-                    nextPart();
-                    qrImageView.setImage(getQrCode(currentPart));
-                } else if(animateQRService == null) {
-                    createAnimateQRService();
-                } else if(!animateQRService.isRunning()) {
-                    animateQRService.reset();
-                    animateQRService.start();
-                }
+                restartAnimation();
             } catch(UR.InvalidTypeException e) {
                 //Can't happen
             }
         } else {
             this.useLegacyEncoding = false;
+            restartAnimation();
+        }
+    }
 
-            if(encoder.isSinglePart()) {
-                if(animateQRService != null) {
-                    animateQRService.cancel();
-                }
-
-                qrImageView.setImage(getQrCode(currentPart));
-            } else if(animateQRService == null) {
-                createAnimateQRService();
-            } else if(!animateQRService.isRunning()) {
-                animateQRService.reset();
-                animateQRService.start();
-            }
+    private void setUseBbqrEncoding(boolean useBbqrEncoding) {
+        if(useBbqrEncoding) {
+            this.useBbqrEncoding = true;
+            restartAnimation();
+        } else {
+            this.useBbqrEncoding = false;
+            restartAnimation();
         }
     }
 
@@ -214,12 +274,28 @@ public class QRDisplayDialog extends Dialog<UR> {
             animateQRService.cancel();
         }
 
-        this.encoder = new UREncoder(ur, Config.get().getQrDensity().getMaxFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
-        nextPart();
-        if(encoder.isSinglePart()) {
+        if(bbqr != null) {
+            this.bbqrEncoder = new BBQREncoder(bbqr.type(), DEFAULT_BBQR_ENCODING, bbqr.data(), Config.get().getQrDensity().getMaxBbqrFragmentLength(), 0);
+        }
+
+        this.urEncoder = new UREncoder(ur, Config.get().getQrDensity().getMaxUrFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+
+        restartAnimation();
+    }
+
+    private void restartAnimation() {
+        if(isSinglePart()) {
+            if(animateQRService != null) {
+                animateQRService.cancel();
+            }
+
+            nextPart();
             qrImageView.setImage(getQrCode(currentPart));
-        } else {
+        } else if(animateQRService == null) {
             createAnimateQRService();
+        } else if(!animateQRService.isRunning()) {
+            animateQRService.reset();
+            animateQRService.start();
         }
     }
 
@@ -264,7 +340,7 @@ public class QRDisplayDialog extends Dialog<UR> {
                     final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                     ButtonBar.setButtonData(density, buttonData);
                     density.setOnAction(event -> {
-                        if(!initialDensityChange && !encoder.isSinglePart()) {
+                        if(!initialDensityChange && !isSinglePart()) {
                             Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Discard progress?", "Changing the QR code density means any progress on the receiving device must be discarded. Proceed?", ButtonType.NO, ButtonType.YES);
                             if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
                                 initialDensityChange = true;
@@ -280,6 +356,25 @@ public class QRDisplayDialog extends Dialog<UR> {
 
                     return density;
                 }
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+                Button scanButton = (Button)super.createButton(buttonType);
+                scanButton.setGraphicTextGap(5);
+                scanButton.setGraphic(getGlyph(FontAwesome5.Glyph.CAMERA));
+
+                return scanButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.BACK_PREVIOUS) {
+                ToggleButton bbqr = new ToggleButton(buttonType.getText());
+                bbqr.setGraphicTextGap(5);
+                bbqr.setGraphic(getGlyph(FontAwesome5.Glyph.QRCODE));
+                bbqr.setSelected(useBbqrEncoding);
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(bbqr, buttonData);
+
+                bbqr.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    setUseBbqrEncoding(newValue);
+                });
+
+                return bbqr;
             }
 
             return super.createButton(buttonType);

src/main/java/com/sparrowwallet/sparrow/control/QRScanDialog.java

@@ -30,6 +30,9 @@ import com.sparrowwallet.hummingbird.registry.pathcomponent.PathComponent;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRDecoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRException;
+import com.sparrowwallet.sparrow.wallet.KeystoreController;
 import javafx.application.Platform;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
@@ -63,8 +66,9 @@ import java.util.stream.IntStream;
 public class QRScanDialog extends Dialog<QRScanDialog.Result> {
     private static final Logger log = LoggerFactory.getLogger(QRScanDialog.class);
 
-    private final URDecoder decoder;
-    private final LegacyURDecoder legacyDecoder;
+    private final URDecoder urDecoder;
+    private final LegacyURDecoder legacyUrDecoder;
+    private final BBQRDecoder bbqrDecoder;
     private final WebcamService webcamService;
     private List<String> parts;
 
@@ -80,8 +84,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
     private final ObjectProperty<WebcamDevice> webcamDeviceProperty = new SimpleObjectProperty<>();
 
     public QRScanDialog() {
-        this.decoder = new URDecoder();
-        this.legacyDecoder = new LegacyURDecoder();
+        this.urDecoder = new URDecoder();
+        this.legacyUrDecoder = new LegacyURDecoder();
+        this.bbqrDecoder = new BBQRDecoder();
 
         if(Config.get().isHdCapture()) {
             webcamResolutionProperty.set(WebcamResolution.HD);
@@ -167,12 +172,13 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             Platform.runLater(() -> webcamResolutionProperty.set(null));
         });
 
-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
         final ButtonType hdButtonType = new javafx.scene.control.ButtonType("Use HD Capture", ButtonBar.ButtonData.LEFT);
         final ButtonType camButtonType = new javafx.scene.control.ButtonType("Default Camera", ButtonBar.ButtonData.HELP_2);
         dialogPane.getButtonTypes().addAll(hdButtonType, camButtonType, cancelButtonType);
         dialogPane.setPrefWidth(646);
         dialogPane.setPrefHeight(webcamResolutionProperty.get() == WebcamResolution.HD ? 490 : 590);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
         AppServices.moveToActiveWindowScreen(this);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? result : null);
@@ -191,23 +197,23 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
             if(qrtext.toLowerCase(Locale.ROOT).startsWith(UR.UR_PREFIX)) {
                 if(LegacyURDecoder.isLegacyURFragment(qrtext)) {
-                    legacyDecoder.receivePart(qrtext);
-                    Platform.runLater(() -> percentComplete.setValue(legacyDecoder.getPercentComplete()));
+                    legacyUrDecoder.receivePart(qrtext);
+                    Platform.runLater(() -> percentComplete.setValue(legacyUrDecoder.getPercentComplete()));
 
-                    if(legacyDecoder.isComplete()) {
+                    if(legacyUrDecoder.isComplete()) {
                         try {
-                            UR ur = legacyDecoder.decode();
+                            UR ur = legacyUrDecoder.decode();
                             result = extractResultFromUR(ur);
                         } catch(Exception e) {
                             result = new Result(new URException(e.getMessage()));
                         }
                     }
                 } else {
-                    decoder.receivePart(qrtext);
-                    Platform.runLater(() -> percentComplete.setValue(decoder.getProcessedPartsCount() > 0 ? decoder.getEstimatedPercentComplete() : 0));
+                    urDecoder.receivePart(qrtext);
+                    Platform.runLater(() -> percentComplete.setValue(urDecoder.getProcessedPartsCount() > 0 ? urDecoder.getEstimatedPercentComplete() : 0));
 
-                    if(decoder.getResult() != null) {
-                        URDecoder.Result urResult = decoder.getResult();
+                    if(urDecoder.getResult() != null) {
+                        URDecoder.Result urResult = urDecoder.getResult();
                         if(urResult.type == ResultType.SUCCESS) {
                             result = extractResultFromUR(urResult.ur);
                             Platform.runLater(() -> setResult(result));
@@ -216,6 +222,19 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                         }
                     }
                 }
+            } else if(BBQRDecoder.isBBQRFragment(qrtext)) {
+                bbqrDecoder.receivePart(qrtext);
+                Platform.runLater(() -> percentComplete.setValue(bbqrDecoder.getPercentComplete()));
+
+                if(bbqrDecoder.getResult() != null) {
+                    BBQRDecoder.Result bbqrResult = bbqrDecoder.getResult();
+                    if(bbqrResult.getResultType() == BBQRDecoder.ResultType.SUCCESS) {
+                        result = extractResultFromBBQR(bbqrResult);
+                        Platform.runLater(() -> setResult(result));
+                    } else {
+                        result = new Result(new BBQRException(bbqrResult.getError()));
+                    }
+                }
             } else if(partMatcher.matches()) {
                 int m = Integer.parseInt(partMatcher.group(1));
                 int n = Integer.parseInt(partMatcher.group(2));
@@ -441,6 +460,39 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     CryptoBip39 cryptoBip39 = (CryptoBip39)ur.decodeFromRegistry();
                     DeterministicSeed seed = getSeed(cryptoBip39);
                     return new Result(seed);
+                } else if(urRegistryType.equals(RegistryType.PSBT)) {
+                    URPSBT urPSBT = (URPSBT)ur.decodeFromRegistry();
+                    try {
+                        PSBT psbt = new PSBT(urPSBT.getPsbt(), false);
+                        return new Result(psbt);
+                    } catch(Exception e) {
+                        log.error("Error parsing PSBT from UR type " + urRegistryType, e);
+                        return new Result(new URException("Error parsing PSBT from UR type " + urRegistryType, e));
+                    }
+                } else if(urRegistryType.equals(RegistryType.ADDRESS)) {
+                    URAddress urAddress = (URAddress)ur.decodeFromRegistry();
+                    Address address = getAddress(urAddress);
+                    if(address != null) {
+                        return new Result(BitcoinURI.fromAddress(address));
+                    } else {
+                        return new Result(new URException("Unknown " + urRegistryType + " type of " + urAddress.getType()));
+                    }
+                } else if(urRegistryType.equals(RegistryType.HDKEY)) {
+                    URHDKey urHDKey = (URHDKey)ur.decodeFromRegistry();
+                    ExtendedKey extendedKey = getExtendedKey(urHDKey);
+                    return new Result(extendedKey, urHDKey.getName());
+                } else if(urRegistryType.equals(RegistryType.OUTPUT_DESCRIPTOR)) {
+                    UROutputDescriptor urOutputDescriptor = (UROutputDescriptor)ur.decodeFromRegistry();
+                    OutputDescriptor outputDescriptor = getOutputDescriptor(urOutputDescriptor);
+                    return new Result(outputDescriptor);
+                } else if(urRegistryType.equals(RegistryType.ACCOUNT_DESCRIPTOR)) {
+                    URAccountDescriptor urAccountDescriptor = (URAccountDescriptor)ur.decodeFromRegistry();
+                    List<Wallet> wallets = getWallets(urAccountDescriptor);
+                    return new Result(wallets);
+                } else if(urRegistryType.equals(RegistryType.SEED)) {
+                    URSeed urSeed = (URSeed)ur.decodeFromRegistry();
+                    DeterministicSeed seed = getSeed(urSeed);
+                    return new Result(seed);
                 } else {
                     log.error("Unsupported UR type " + urRegistryType);
                     return new Result(new URException("UR type " + urRegistryType + " is not supported"));
@@ -502,18 +554,22 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             if(cryptoOutput.getMultiKey() != null) {
                 MultiKey multiKey = cryptoOutput.getMultiKey();
                 Map<ExtendedKey, KeyDerivation> extendedPublicKeys = new LinkedHashMap<>();
+                Map<ExtendedKey, String> extendedPublicKeyLabels = new LinkedHashMap<>();
                 for(CryptoHDKey cryptoHDKey : multiKey.getHdKeys()) {
                     ExtendedKey extendedKey = getExtendedKey(cryptoHDKey);
                     KeyDerivation keyDerivation = getKeyDerivation(cryptoHDKey.getOrigin());
                     extendedPublicKeys.put(extendedKey, keyDerivation);
+                    if(cryptoHDKey.getName() != null) {
+                        extendedPublicKeyLabels.put(extendedKey, cryptoHDKey.getName());
+                    }
                 }
-                return new OutputDescriptor(scriptType, multiKey.getThreshold(), extendedPublicKeys);
+                return new OutputDescriptor(scriptType, multiKey.getThreshold(), extendedPublicKeys, new LinkedHashMap<>(), extendedPublicKeyLabels);
             } else if(cryptoOutput.getEcKey() != null) {
                 throw new IllegalArgumentException("EC keys are currently unsupported");
             } else if(cryptoOutput.getHdKey() != null) {
                 ExtendedKey extendedKey = getExtendedKey(cryptoOutput.getHdKey());
                 KeyDerivation keyDerivation = getKeyDerivation(cryptoOutput.getHdKey().getOrigin());
-                return new OutputDescriptor(scriptType, extendedKey, keyDerivation);
+                return new OutputDescriptor(scriptType, extendedKey, keyDerivation, cryptoOutput.getHdKey().getName());
             }
 
             throw new IllegalStateException("CryptoOutput did not contain sufficient information");
@@ -566,7 +622,8 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
                 List<ChildNumber> path = cryptoKeypath.getComponents().stream().map(comp -> (IndexPathComponent)comp)
                         .map(comp -> new ChildNumber(comp.getIndex(), comp.isHardened())).collect(Collectors.toList());
-                return new KeyDerivation(Utils.bytesToHex(cryptoKeypath.getSourceFingerprint()), KeyDerivation.writePath(path));
+                String fingerprint = cryptoKeypath.getSourceFingerprint() == null ? KeystoreController.DEFAULT_WATCH_ONLY_FINGERPRINT : Utils.bytesToHex(cryptoKeypath.getSourceFingerprint());
+                return new KeyDerivation(fingerprint, KeyDerivation.writePath(path));
             }
 
             return null;
@@ -579,6 +636,53 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         private DeterministicSeed getSeed(CryptoBip39 cryptoBip39) {
             return new DeterministicSeed(cryptoBip39.getWords(), null, System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
         }
+
+        private OutputDescriptor getOutputDescriptor(UROutputDescriptor urOutputDescriptor) {
+            String source = urOutputDescriptor.getSource();
+            List<RegistryItem> keys = urOutputDescriptor.getKeys();
+            Map<ExtendedKey, String> mapExtendedPublicKeyLabels = new LinkedHashMap<>();
+
+            for(int i = 0; i < keys.size(); i++) {
+                RegistryItem key = keys.get(i);
+                if(key instanceof URHDKey urhdKey) {
+                    ExtendedKey extendedKey = getExtendedKey(urhdKey);
+                    KeyDerivation keyDerivation = getKeyDerivation(urhdKey.getOrigin());
+                    source = source.replaceAll("@" + i, OutputDescriptor.writeKey(extendedKey, keyDerivation, null, true, true));
+                    if(urhdKey.getName() != null) {
+                        mapExtendedPublicKeyLabels.put(extendedKey, urhdKey.getName());
+                    }
+                } else {
+                    throw new IllegalArgumentException("Only extended HD keys are supported in output descriptors");
+                }
+            }
+
+            return OutputDescriptor.getOutputDescriptor(source, mapExtendedPublicKeyLabels);
+        }
+
+        private List<Wallet> getWallets(URAccountDescriptor urAccountDescriptor) {
+            List<Wallet> wallets = new ArrayList<>();
+            String masterFingerprint = Utils.bytesToHex(urAccountDescriptor.getMasterFingerprint());
+            for(UROutputDescriptor urOutputDescriptor : urAccountDescriptor.getOutputDescriptors()) {
+                OutputDescriptor outputDescriptor = getOutputDescriptor(urOutputDescriptor);
+                Wallet wallet = outputDescriptor.toKeystoreWallet(masterFingerprint);
+                wallets.add(wallet);
+            }
+
+            return wallets;
+        }
+
+        private Result extractResultFromBBQR(BBQRDecoder.Result result) {
+            if(result.getPsbt() != null) {
+                return new Result(result.getPsbt());
+            } else if(result.getTransaction() != null) {
+                return new Result(result.getTransaction());
+            } else if(result.toString() != null) {
+                return new Result(result.toString());
+            } else {
+                log.error("Unsupported BBQR type " + result.getBbqrType());
+                return new Result(new URException("BBQR type " + result.getBbqrType() + " is not supported"));
+            }
+        }
     }
 
     private class QRScanListener implements WebcamListener {

src/main/java/com/sparrowwallet/sparrow/control/ScriptArea.java

@@ -54,10 +54,12 @@ public class ScriptArea extends CodeArea {
                 ScriptChunk chunk = script.getChunks().get(i);
                 if(chunk.isOpCode()) {
                     append(chunk.toString(), "script-opcode");
-                } else if(chunk.isSignature()) {
-                    append("<signature" + signatureCount++ + ">", "script-signature");
                 } else if(chunk.isPubKey()) {
                     append("<pubkey" + pubKeyCount++ + ">", "script-pubkey");
+                } else if(chunk.isSignature()) {
+                    append("<signature" + signatureCount++ + ">", "script-signature");
+                } else if(chunk.isTaprootControlBlock()) {
+                    append("<controlblock>", "script-controlblock");
                 } else if(chunk.isString()) {
                     append(chunk.toString(), "script-other");
                 } else if(chunk.isScript()) {

src/main/java/com/sparrowwallet/sparrow/control/ScriptContextMenu.java

@@ -2,25 +2,22 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.protocol.Script;
 import com.sparrowwallet.drongo.protocol.ScriptChunk;
+import com.sparrowwallet.sparrow.BaseController;
 import javafx.geometry.Point2D;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.ContextMenuEvent;
-import org.fxmisc.richtext.CodeArea;
-import org.fxmisc.richtext.model.TwoDimensional;
 
 import java.util.OptionalInt;
 
-import static org.fxmisc.richtext.model.TwoDimensional.Bias.Backward;
-
 public class ScriptContextMenu extends ContextMenu {
     private Script script;
     private MenuItem copyvalue;
     private ScriptChunk hoverChunk;
 
-    public ScriptContextMenu(CodeArea area, Script script)
+    public ScriptContextMenu(ScriptArea area, Script script)
     {
         this.script = script;
 
@@ -40,12 +37,9 @@ public class ScriptContextMenu extends ContextMenu {
             Point2D point = area.screenToLocal(event.getScreenX(), event.getScreenY());
             OptionalInt characterIndex = area.hit(point.getX(), point.getY()).getCharacterIndex();
             if(characterIndex.isPresent()) {
-                TwoDimensional.Position position = area.getParagraph(0).getStyleSpans().offsetToPosition(characterIndex.getAsInt(), Backward);
-                if(position.getMajor() % 2 == 0) {
-                    ScriptChunk chunk = script.getChunks().get(position.getMajor() / 2);
-                    if(!chunk.isOpCode()) {
-                        this.hoverChunk = chunk;
-                    }
+                ScriptChunk chunk = BaseController.getScriptChunk(area, characterIndex.getAsInt());
+                if(chunk != null) {
+                    this.hoverChunk = chunk;
                 }
             }
             copyvalue.setDisable(hoverChunk == null);

src/main/java/com/sparrowwallet/sparrow/control/SearchWalletDialog.java

@@ -1,16 +1,27 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.csvreader.CsvWriter;
+import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
 import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import org.controlsfx.control.textfield.TextFields;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,9 +29,11 @@ import tornadofx.control.Field;
 import tornadofx.control.Fieldset;
 import tornadofx.control.Form;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
 public class SearchWalletDialog extends Dialog<Entry> {
     private static final Logger log = LoggerFactory.getLogger(SearchWalletDialog.class);
@@ -36,13 +49,16 @@ public class SearchWalletDialog extends Dialog<Entry> {
             throw new IllegalArgumentException("No wallets selected to search");
         }
 
+        boolean showWallet = walletForms.stream().map(WalletForm::getMasterWallet).distinct().limit(2).count() > 1;
+        boolean showAccount = walletForms.stream().anyMatch(walletForm -> !walletForm.getWallet().isMasterWallet() || !walletForm.getNestedWalletForms().isEmpty());
+
         final DialogPane dialogPane = getDialogPane();
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("search.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setHeaderText("Search Wallet");
+        dialogPane.setHeaderText(showWallet ? "Search All Wallets" : "Search Wallet " + walletForms.get(0).getMasterWallet().getName());
 
         Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
         if(!image.isError()) {
@@ -69,23 +85,30 @@ public class SearchWalletDialog extends Dialog<Entry> {
         fieldset.getChildren().addAll(searchField);
         form.getChildren().add(fieldset);
 
-        boolean showWallet = walletForms.size() > 1 || walletForms.stream().anyMatch(walletForm -> !walletForm.getNestedWalletForms().isEmpty());
-
         results = new CoinTreeTable();
         results.setShowRoot(false);
-        results.setPrefWidth(showWallet ? 950 : 850);
+        results.setPrefWidth(showWallet || showAccount ? 950 : 850);
         results.setUnitFormat(walletForms.iterator().next().getWallet());
         results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
         results.setPlaceholder(new Label("No results"));
+        results.setEditable(true);
 
         if(showWallet) {
             TreeTableColumn<Entry, String> walletColumn = new TreeTableColumn<>("Wallet");
             walletColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
-                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getDisplayName());
+                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getMasterName());
             });
             results.getColumns().add(walletColumn);
         }
 
+        if(showAccount) {
+            TreeTableColumn<Entry, String> accountColumn = new TreeTableColumn<>("Account");
+            accountColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
+                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getDisplayName());
+            });
+            results.getColumns().add(accountColumn);
+        }
+
         TreeTableColumn<Entry, String> typeColumn = new TreeTableColumn<>("Type");
         typeColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
             return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getEntryType());
@@ -105,7 +128,7 @@ public class SearchWalletDialog extends Dialog<Entry> {
         labelCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
             return param.getValue().getValue().labelProperty();
         });
-        labelCol.setCellFactory(p -> new SearchLabelCell());
+        labelCol.setCellFactory(p -> new LabelCell());
         results.getColumns().add(labelCol);
 
         TreeTableColumn<Entry, Number> amountCol = new TreeTableColumn<>("Value");
@@ -118,12 +141,20 @@ public class SearchWalletDialog extends Dialog<Entry> {
         vBox.getChildren().addAll(form, results);
         dialogPane.setContent(vBox);
 
+        ButtonType exportButtonType = new ButtonType("Export CSV", ButtonBar.ButtonData.LEFT);
         ButtonType showButtonType = new javafx.scene.control.ButtonType("Show", ButtonBar.ButtonData.APPLY);
         ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
 
-        dialogPane.getButtonTypes().addAll(cancelButtonType, showButtonType);
+        dialogPane.getButtonTypes().addAll(exportButtonType, cancelButtonType, showButtonType);
 
-        Button showButton = (Button) dialogPane.lookupButton(showButtonType);
+        Button exportButton = (Button)dialogPane.lookupButton(exportButtonType);
+        exportButton.setGraphic(GlyphUtils.getDownArrowGlyph());
+        exportButton.addEventFilter(ActionEvent.ACTION, event -> {
+            event.consume();
+            exportResults(showWallet);
+        });
+
+        Button showButton = (Button)dialogPane.lookupButton(showButtonType);
         showButton.setDefaultButton(true);
         showButton.setDisable(true);
 
@@ -135,54 +166,51 @@ public class SearchWalletDialog extends Dialog<Entry> {
         });
 
         search.textProperty().addListener((observable, oldValue, newValue) -> {
-            searchWallet(newValue.toLowerCase(Locale.ROOT));
+            searchWallets(newValue);
         });
 
         setResizable(true);
 
+        AppServices.moveToActiveWindowScreen(this);
+
         Platform.runLater(search::requestFocus);
     }
 
-    private void searchWallet(String searchText) {
-        List<Entry> matchingEntries = new ArrayList<>();
+    public List<WalletForm> getWalletForms() {
+        return walletForms;
+    }
 
-        if(!searchText.isEmpty()) {
-            Long searchValue = null;
+    private void searchWallets(String searchPhrase) {
+        Set<Entry> matchingEntries = new LinkedHashSet<>();
 
-            try {
-                searchValue = Math.abs(Long.parseLong(searchText));
-            } catch(NumberFormatException e) {
-                //ignore
+        if(!searchPhrase.isEmpty()) {
+            Set<String> searchWords = new LinkedHashSet<>(Arrays.stream(searchPhrase.split("\\s+"))
+                    .filter(text -> isAddress(text) || isHash(text) || isHashIndex(text)).toList());
+            String freeText = removeOccurrences(searchPhrase, searchWords).trim();
+            if(!freeText.isEmpty()) {
+                searchWords.add(freeText);
             }
 
-            for(WalletForm walletForm : walletForms) {
-                WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
-                for(Entry entry : walletTransactionsEntry.getChildren()) {
-                    if(entry instanceof TransactionEntry transactionEntry) {
-                        if(transactionEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
-                                (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
-                                (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue)) {
-                            matchingEntries.add(entry);
-                        }
-                    }
-                }
+            for(String searchText : searchWords) {
+                Long searchValue = getSearchValue(searchText);
+                Address searchAddress = getSearchAddress(searchText);
+                searchText = searchText.toLowerCase(Locale.ROOT);
 
-                for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
-                    NodeEntry purposeEntry = walletForm.getNodeEntry(keyPurpose);
-                    for(Entry entry : purposeEntry.getChildren()) {
-                        if(entry instanceof NodeEntry nodeEntry) {
-                            if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
-                                    (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
-                                    (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+                for(WalletForm walletForm : walletForms) {
+                    WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
+                    for(Entry entry : walletTransactionsEntry.getChildren()) {
+                        if(entry instanceof TransactionEntry transactionEntry) {
+                            if(transactionEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
+                                    (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                    (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue) ||
+                                    (searchAddress != null && transactionEntry.getBlockTransaction().getTransaction().getOutputs().stream().map(output -> output.getScript().getToAddress()).filter(Objects::nonNull).anyMatch(address -> address.equals(searchAddress)))) {
                                 matchingEntries.add(entry);
                             }
                         }
                     }
-                }
 
-                for(WalletForm nestedWalletForm : walletForm.getNestedWalletForms()) {
-                    for(KeyPurpose keyPurpose : nestedWalletForm.getWallet().getWalletKeyPurposes()) {
-                        NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
+                    for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
+                        NodeEntry purposeEntry = walletForm.getNodeEntry(keyPurpose);
                         for(Entry entry : purposeEntry.getChildren()) {
                             if(entry instanceof NodeEntry nodeEntry) {
                                 if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
@@ -193,26 +221,147 @@ public class SearchWalletDialog extends Dialog<Entry> {
                             }
                         }
                     }
-                }
 
-                WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
-                for(Entry entry : walletUtxosEntry.getChildren()) {
-                    if(entry instanceof HashIndexEntry hashIndexEntry) {
-                        if(hashIndexEntry.getBlockTransaction().getHash().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
-                                (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
-                                (hashIndexEntry.getValue() != null && searchValue != null && Math.abs(hashIndexEntry.getValue()) == searchValue)) {
-                            matchingEntries.add(entry);
+                    for(WalletForm nestedWalletForm : walletForm.getNestedWalletForms()) {
+                        for(KeyPurpose keyPurpose : nestedWalletForm.getWallet().getWalletKeyPurposes()) {
+                            NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
+                            for(Entry entry : purposeEntry.getChildren()) {
+                                if(entry instanceof NodeEntry nodeEntry) {
+                                    if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
+                                            (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                            (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+                                        matchingEntries.add(entry);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
+                    for(Entry entry : walletUtxosEntry.getChildren()) {
+                        if(entry instanceof HashIndexEntry hashIndexEntry) {
+                            if(hashIndexEntry.getBlockTransaction().getHash().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
+                                    hashIndexEntry.getHashIndex().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
+                                    (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                    (hashIndexEntry.getValue() != null && searchValue != null && Math.abs(hashIndexEntry.getValue()) == searchValue)) {
+                                matchingEntries.add(entry);
+                            }
                         }
                     }
                 }
             }
         }
 
-        SearchWalletEntry rootEntry = new SearchWalletEntry(walletForms.iterator().next().getWallet(), matchingEntries);
+        SearchWalletEntry rootEntry = new SearchWalletEntry(walletForms.iterator().next().getWallet(), new ArrayList<>(matchingEntries));
         RecursiveTreeItem<Entry> rootItem = new RecursiveTreeItem<>(rootEntry, Entry::getChildren);
         results.setRoot(rootItem);
     }
 
+    private Long getSearchValue(String searchText) {
+        try {
+            return Math.abs(Long.parseLong(searchText));
+        } catch(NumberFormatException e) {
+            return null;
+        }
+    }
+
+    private Address getSearchAddress(String searchText) {
+        try {
+            return Address.fromString(searchText);
+        } catch(InvalidAddressException e) {
+            return null;
+        }
+    }
+
+    private boolean isAddress(String text) {
+        try {
+            Address.fromString(text);
+            return true;
+        } catch(InvalidAddressException e) {
+            return false;
+        }
+    }
+
+    private boolean isHash(String text) {
+        return text.length() == 64 && Utils.isHex(text);
+    }
+
+    private boolean isHashIndex(String text) {
+        String[] parts = text.split(":");
+        if(parts.length == 2 && isHash(parts[0])) {
+            try {
+                Integer.parseInt(parts[1]);
+                return true;
+            } catch(NumberFormatException e) {
+                //ignore
+            }
+        }
+
+        return false;
+    }
+
+    private String removeOccurrences(String inputString, Collection<String> stringsToRemove) {
+        for(String str : stringsToRemove) {
+            inputString = inputString.replaceAll("(?i)" + str, "");
+        }
+
+        return inputString;
+    }
+
+    public void exportResults(boolean showWallet) {
+        Stage window = new Stage();
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Export search results to CSV");
+        fileChooser.setInitialFileName(getDialogPane().getHeaderText() + ".csv");
+
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                CsvWriter writer = new CsvWriter(outputStream, ',', StandardCharsets.UTF_8);
+                List<String> headers = new ArrayList<>(List.of("Wallet", "Account", "Type", "Date", "Txid / Address / Output", "Label", "Value"));
+                if(!showWallet) {
+                    headers.remove(0);
+                }
+                writer.writeRecord(headers.toArray(new String[0]));
+                for(TreeItem<Entry> item : results.getRoot().getChildren()) {
+                    Entry entry = item.getValue();
+                    if(showWallet) {
+                       writer.write(entry.getWallet().getMasterName());
+                    }
+                    writer.write(entry.getWallet().getDisplayName());
+                    writer.write(entry.getEntryType());
+                    if(entry instanceof TransactionEntry transactionEntry) {
+                        writer.write(transactionEntry.getBlockTransaction().getDate() == null ? "Unconfirmed" : EntryCell.DATE_FORMAT.format(transactionEntry.getBlockTransaction().getDate()));
+                        writer.write(transactionEntry.getBlockTransaction().getHash().toString());
+                    } else if(entry instanceof NodeEntry nodeEntry) {
+                        writer.write("");
+                        writer.write(nodeEntry.getAddress().toString());
+                    } else if(entry instanceof HashIndexEntry hashIndexEntry) {
+                        writer.write(hashIndexEntry.getBlockTransaction().getDate() == null ? "Unconfirmed" : EntryCell.DATE_FORMAT.format(hashIndexEntry.getBlockTransaction().getDate()));
+                        writer.write(hashIndexEntry.getHashIndex().toString());
+                    } else {
+                        writer.write("");
+                        writer.write("");
+                    }
+                    writer.write(entry.getLabel());
+                    writer.write(getCoinValue(entry.getValue() == null ? 0 : entry.getValue()));
+                    writer.endRecord();
+                }
+                writer.close();
+            } catch(IOException e) {
+                log.error("Error exporting search results as CSV", e);
+                AppServices.showErrorDialog("Error exporting search results as CSV", e.getMessage());
+            }
+        }
+    }
+
+    private String getCoinValue(Long value) {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        return BitcoinUnit.BTC.equals(results.getBitcoinUnit()) ? format.tableFormatBtcValue(value) : String.format(Locale.ENGLISH, "%d", value);
+    }
+
     private static class SearchWalletEntry extends Entry {
         public SearchWalletEntry(Wallet wallet, List<Entry> entries) {
             super(wallet, wallet.getName(), entries);
@@ -238,15 +387,19 @@ public class SearchWalletDialog extends Dialog<Entry> {
         @Override
         protected void updateItem(Entry entry, boolean empty) {
             super.updateItem(entry, empty);
-            setContextMenu(null);
-        }
-    }
 
-    private static class SearchLabelCell extends LabelCell {
-        @Override
-        public void updateItem(String label, boolean empty) {
-            super.updateItem(label, empty);
-            setContextMenu(null);
+            ContextMenu copyMenu;
+            if(entry instanceof TransactionEntry transactionEntry) {
+                copyMenu = new TransactionContextMenu(getText(), transactionEntry.getBlockTransaction());
+            } else if(entry instanceof NodeEntry nodeEntry) {
+                copyMenu = new AddressContextMenu(nodeEntry.getAddress(), nodeEntry.getOutputDescriptor(), null, false, null);
+            } else if(entry instanceof UtxoEntry utxoEntry) {
+                copyMenu = new HashIndexEntryContextMenu(null, utxoEntry);
+            } else {
+                copyMenu = new ContextMenu();
+            }
+            copyMenu.getItems().removeIf(menuItem -> !menuItem.getText().startsWith("Copy"));
+            setContextMenu(copyMenu);
         }
     }
 }

src/main/java/com/sparrowwallet/sparrow/control/SeedDisplayDialog.java

@@ -1,12 +1,16 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.SeedQR;
 import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.StackPane;
 
+import java.util.Optional;
+
 public class SeedDisplayDialog extends Dialog<Void> {
     public SeedDisplayDialog(Keystore decryptedKeystore) {
         final DialogPane dialogPane = getDialogPane();
@@ -39,8 +43,15 @@ public class SeedDisplayDialog extends Dialog<Void> {
 
         stackPane.getChildren().addAll(anchorPane);
 
+        final ButtonType seedQRButtonType = new javafx.scene.control.ButtonType("Show SeedQR", ButtonBar.ButtonData.LEFT);
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().addAll(cancelButtonType);
+        dialogPane.getButtonTypes().addAll(seedQRButtonType, cancelButtonType);
+
+        Button seedQRButton = (Button)dialogPane.lookupButton(seedQRButtonType);
+        seedQRButton.addEventFilter(ActionEvent.ACTION, event -> {
+            event.consume();
+            showSeedQR(decryptedKeystore);
+        });
 
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(150 + height);
@@ -48,4 +59,15 @@ public class SeedDisplayDialog extends Dialog<Void> {
 
         Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
     }
+
+    private void showSeedQR(Keystore decryptedKeystore) {
+        Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Sensitive QR", "The following QR contains these seed words. " +
+                "Be careful before displaying or digitally recording it.\n\nAre you sure you want to continue?", ButtonType.YES, ButtonType.NO);
+        if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
+            String seedQR = SeedQR.getSeedQR(decryptedKeystore.getSeed());
+            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(seedQR);
+            qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
+            qrDisplayDialog.showAndWait();
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/control/SelectableCodeArea.java

@@ -0,0 +1,34 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import org.fxmisc.richtext.CodeArea;
+
+public class SelectableCodeArea extends CodeArea {
+    public SelectableCodeArea() {
+        super();
+
+        ContextMenu contextMenu = new ContextMenu();
+        MenuItem copy = new MenuItem("Copy");
+        copy.setDisable(true);
+        copy.setOnAction(event -> {
+            ClipboardContent content = new ClipboardContent();
+            content.putString(getSelectedText());
+            Clipboard.getSystemClipboard().setContent(content);
+        });
+        MenuItem copyAll = new MenuItem("Copy All");
+        copyAll.setOnAction(event -> {
+            ClipboardContent content = new ClipboardContent();
+            content.putString(getText());
+            Clipboard.getSystemClipboard().setContent(content);
+        });
+        contextMenu.getItems().addAll(copy, copyAll);
+        setContextMenu(contextMenu);
+
+        selectedTextProperty().addListener((observable, oldValue, newValue) -> {
+            copy.setDisable(newValue.isEmpty());
+        });
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/SendToManyDialog.java

@@ -81,6 +81,7 @@ public class SendToManyDialog extends Dialog<List<Payment>> {
 
         dialogPane.setPrefWidth(850);
         dialogPane.setPrefHeight(500);
+        setResizable(true);
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         AppServices.moveToActiveWindowScreen(this);
     }

src/main/java/com/sparrowwallet/sparrow/control/TextAreaDialog.java

@@ -85,6 +85,7 @@ public class TextAreaDialog extends Dialog<String> {
 
         dialogPane.setPrefWidth(700);
         dialogPane.setPrefHeight(400);
+        setResizable(true);
         AppServices.moveToActiveWindowScreen(this);
     }
 
@@ -109,6 +110,7 @@ public class TextAreaDialog extends Dialog<String> {
                 ButtonBar.setButtonData(scanButton, buttonData);
                 scanButton.setOnAction(event -> {
                     QRScanDialog qrScanDialog = new QRScanDialog();
+                    qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
                     Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
                     if(optionalResult.isPresent()) {
                         QRScanDialog.Result result = optionalResult.get();

src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagram.java

@@ -14,6 +14,7 @@ import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
 import com.sparrowwallet.sparrow.event.ReplaceChangeAddressEvent;
 import com.sparrowwallet.sparrow.event.SorobanInitiatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.wallet.OptimizationStrategy;
@@ -44,7 +45,6 @@ import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
-import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.tools.Platform;
 
@@ -56,6 +56,8 @@ import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.glyphfont.GlyphUtils.*;
+
 public class TransactionDiagram extends GridPane {
     private static final int MAX_UTXOS = 8;
     private static final int REDUCED_MAX_UTXOS = MAX_UTXOS - 2;
@@ -72,6 +74,7 @@ public class TransactionDiagram extends GridPane {
 
     private WalletTransaction walletTx;
     private final BooleanProperty finalProperty = new SimpleBooleanProperty(false);
+    private final ObjectProperty<TransactionDiagramLabel> labelProperty = new SimpleObjectProperty<>(null);
     private final ObjectProperty<OptimizationStrategy> optimizationStrategyProperty = new SimpleObjectProperty<>(OptimizationStrategy.EFFICIENCY);
     private boolean expanded;
     private TransactionDiagram expandedDiagram;
@@ -88,7 +91,7 @@ public class TransactionDiagram extends GridPane {
                 stage.setResizable(false);
 
                 StackPane scenePane = new StackPane();
-                if(Platform.getCurrent() == Platform.WINDOWS) {
+                if(Platform.getCurrent() == Platform.WINDOWS || Platform.getCurrent() == Platform.UNIX) {
                     scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
                 }
 
@@ -154,6 +157,10 @@ public class TransactionDiagram extends GridPane {
                 updateDerivedDiagram(expandedDiagram);
             }
         }
+
+        if(getLabel() != null) {
+            getLabel().update(this);
+        }
     }
 
     public void update(String message) {
@@ -469,7 +476,7 @@ public class TransactionDiagram extends GridPane {
                         tooltip.setText("");
                     } else if(input instanceof AddUserBlockTransactionHashIndex) {
                         tooltip.setText("");
-                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
+                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getFeeWarningGlyph());
                         label.setOnMouseClicked(event -> {
                             EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
                             closeExpanded();
@@ -534,7 +541,7 @@ public class TransactionDiagram extends GridPane {
         return input.getLabel() != null && !input.getLabel().isEmpty() ? input.getLabel() : input.getHashAsString().substring(0, 8) + "..:" + input.getIndex();
     }
 
-    private String getSatsValue(long amount) {
+    String getSatsValue(long amount) {
         UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
         return format.formatSatsValue(amount);
     }
@@ -637,7 +644,7 @@ public class TransactionDiagram extends GridPane {
 
         double width = 140.0;
         long sum = walletTx.getTotal();
-        List<Long> values = walletTx.getTransaction().getOutputs().stream().map(TransactionOutput::getValue).collect(Collectors.toList());
+        List<Long> values = walletTx.getTransaction().getOutputs().stream().filter(txo -> txo.getScript().getToAddress() != null).map(TransactionOutput::getValue).collect(Collectors.toList());
         values.add(walletTx.getFee());
         int numOutputs = displayedPayments.size() + walletTx.getChangeMap().size() + 1;
         for(int i = 1; i <= numOutputs; i++) {
@@ -681,18 +688,18 @@ public class TransactionDiagram extends GridPane {
 
         List<OutputNode> outputNodes = new ArrayList<>();
         for(Payment payment : displayedPayments) {
-            Glyph outputGlyph = getOutputGlyph(payment);
+            Glyph outputGlyph = GlyphUtils.getOutputGlyph(walletTx, payment);
             boolean labelledPayment = outputGlyph.getStyleClass().stream().anyMatch(style -> List.of("premix-icon", "badbank-icon", "whirlpoolfee-icon").contains(style)) || payment instanceof AdditionalPayment;
-            payment.setLabel(getOutputLabel(payment));
             Label recipientLabel = new Label(payment.getLabel() == null || payment.getType() == Payment.Type.FAKE_MIX || payment.getType() == Payment.Type.MIX ? payment.getAddress().toString().substring(0, 8) + "..." : payment.getLabel(), outputGlyph);
             recipientLabel.getStyleClass().add("output-label");
             recipientLabel.getStyleClass().add(labelledPayment ? "payment-label" : "recipient-label");
-            Wallet toWallet = getToWallet(payment);
+            Wallet toWallet = walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment);
             WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getAddressNodeMap().get(payment.getAddress()) : null;
             Wallet toBip47Wallet = getBip47SendWallet(payment);
             Tooltip recipientTooltip = new Tooltip((toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ")
                     + getSatsValue(payment.getAmount()) + " sats to "
-                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : (toBip47Wallet == null ? "external address" : toBip47Wallet.getDisplayName())) : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
+                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : (toBip47Wallet == null ? "external address" : toBip47Wallet.getDisplayName())) : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString())
+                    + (walletTx.isDuplicateAddress(payment) ? " (Duplicate)" : ""));
             recipientTooltip.getStyleClass().add("recipient-label");
             recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
             recipientTooltip.setShowDuration(Duration.INDEFINITE);
@@ -714,6 +721,7 @@ public class TransactionDiagram extends GridPane {
             outputNodes.add(new OutputNode(paymentBox, payment.getAddress(), payment.getAmount()));
         }
 
+        Set<Integer> seenIndexes = new HashSet<>();
         for(Map.Entry<WalletNode, Long> changeEntry : walletTx.getChangeMap().entrySet()) {
             WalletNode changeNode = changeEntry.getKey();
             WalletNode defaultChangeNode = walletTx.getWallet().getFreshNode(KeyPurpose.CHANGE);
@@ -759,11 +767,15 @@ public class TransactionDiagram extends GridPane {
                 actionBox.getChildren().addAll(region, amountLabel);
             }
 
-            outputNodes.add(new OutputNode(actionBox, changeAddress, changeEntry.getValue()));
-        }
-
-        if(isFinal()) {
-            Collections.sort(outputNodes);
+            int changeIndex = outputNodes.size();
+            if(isFinal()) {
+                changeIndex = getOutputIndex(changeAddress, changeEntry.getValue(), seenIndexes);
+                seenIndexes.add(changeIndex);
+                if(changeIndex > outputNodes.size()) {
+                    changeIndex = outputNodes.size();
+                }
+            }
+            outputNodes.add(changeIndex, new OutputNode(actionBox, changeAddress, changeEntry.getValue()));
         }
 
         for(OutputNode outputNode : outputNodes) {
@@ -777,7 +789,7 @@ public class TransactionDiagram extends GridPane {
         }
 
         boolean highFee = (walletTx.getFeePercentage() > 0.1);
-        Label feeLabel = highFee ? new Label("High Fee", getWarningGlyph()) : new Label("Fee", getFeeGlyph());
+        Label feeLabel = highFee ? new Label("High Fee", getFeeWarningGlyph()) : new Label("Fee", getFeeGlyph());
         feeLabel.getStyleClass().addAll("output-label", "fee-label");
         String percentage = String.format("%.2f", walletTx.getFeePercentage() * 100.0);
         Tooltip feeTooltip = new Tooltip(walletTx.getFee() < 0 ? "Unknown fee" : "Fee of " + getSatsValue(walletTx.getFee()) + " sats (" + percentage + "%)");
@@ -917,38 +929,10 @@ public class TransactionDiagram extends GridPane {
         return spacer;
     }
 
-    private String getOutputLabel(Payment payment) {
-        if(payment.getLabel() != null) {
-            return payment.getLabel();
-        }
-
-        if(payment.getType() == Payment.Type.WHIRLPOOL_FEE) {
-            return "Whirlpool Fee";
-        } else if(walletTx.isPremixSend(payment)) {
-            int premixIndex = getOutputIndex(payment.getAddress(), payment.getAmount()) - 2;
-            return "Premix #" + premixIndex;
-        } else if(walletTx.isBadbankSend(payment)) {
-            return "Badbank Change";
-        }
-
-        return null;
-    }
-
-    private int getOutputIndex(Address address, long amount) {
-        return walletTx.getTransaction().getOutputs().stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress()) && txOutput.getValue() == amount).mapToInt(TransactionOutput::getIndex).findFirst().orElseThrow();
-    }
-
-    private Wallet getToWallet(Payment payment) {
-        for(Wallet openWallet : AppServices.get().getOpenWallets().keySet()) {
-            if(openWallet != walletTx.getWallet() && openWallet.isValid()) {
-                WalletNode addressNode = openWallet.getWalletAddresses().get(payment.getAddress());
-                if(addressNode != null) {
-                    return addressNode.getWallet();
-                }
-            }
-        }
-
-        return null;
+    private int getOutputIndex(Address address, long amount, Collection<Integer> seenIndexes) {
+        List<TransactionOutput> addressOutputs = walletTx.getTransaction().getOutputs().stream().filter(txOutput -> txOutput.getScript().getToAddress() != null).collect(Collectors.toList());
+        TransactionOutput output = addressOutputs.stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress()) && txOutput.getValue() == amount && !seenIndexes.contains(txOutput.getIndex())).findFirst().orElseThrow();
+        return addressOutputs.indexOf(output);
     }
 
     private Wallet getBip47SendWallet(Payment payment) {
@@ -968,151 +952,6 @@ public class TransactionDiagram extends GridPane {
         return null;
     }
 
-    public Glyph getOutputGlyph(Payment payment) {
-        if(payment.getType().equals(Payment.Type.MIX)) {
-            return getMixGlyph();
-        } else if(payment.getType().equals(Payment.Type.FAKE_MIX)) {
-            return getFakeMixGlyph();
-        } else if(walletTx.isConsolidationSend(payment)) {
-            return getConsolidationGlyph();
-        } else if(walletTx.isPremixSend(payment)) {
-            return getPremixGlyph();
-        } else if(walletTx.isBadbankSend(payment)) {
-            return getBadbankGlyph();
-        } else if(payment.getType().equals(Payment.Type.WHIRLPOOL_FEE)) {
-            return getWhirlpoolFeeGlyph();
-        } else if(payment instanceof AdditionalPayment) {
-            return ((AdditionalPayment)payment).getOutputGlyph(this);
-        } else if(getToWallet(payment) != null) {
-            return getDepositGlyph();
-        }
-
-        return getPaymentGlyph();
-    }
-
-    public static Glyph getExcludeGlyph() {
-        Glyph excludeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.TIMES_CIRCLE);
-        excludeGlyph.getStyleClass().add("exclude-utxo");
-        excludeGlyph.setFontSize(12);
-        return excludeGlyph;
-    }
-
-    public static Glyph getPaymentGlyph() {
-        Glyph paymentGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
-        paymentGlyph.getStyleClass().add("payment-icon");
-        paymentGlyph.setFontSize(12);
-        return paymentGlyph;
-    }
-
-    public static Glyph getConsolidationGlyph() {
-        Glyph consolidationGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.REPLY_ALL);
-        consolidationGlyph.getStyleClass().add("consolidation-icon");
-        consolidationGlyph.setFontSize(12);
-        return consolidationGlyph;
-    }
-
-    public static Glyph getDepositGlyph() {
-        Glyph depositGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
-        depositGlyph.getStyleClass().add("deposit-icon");
-        depositGlyph.setFontSize(12);
-        return depositGlyph;
-    }
-
-    public static Glyph getPremixGlyph() {
-        Glyph premixGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        premixGlyph.getStyleClass().add("premix-icon");
-        premixGlyph.setFontSize(12);
-        return premixGlyph;
-    }
-
-    public static Glyph getBadbankGlyph() {
-        Glyph badbankGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.BIOHAZARD);
-        badbankGlyph.getStyleClass().add("badbank-icon");
-        badbankGlyph.setFontSize(12);
-        return badbankGlyph;
-    }
-
-    public static Glyph getWhirlpoolFeeGlyph() {
-        Glyph whirlpoolFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_WATER);
-        whirlpoolFeeGlyph.getStyleClass().add("whirlpoolfee-icon");
-        whirlpoolFeeGlyph.setFontSize(12);
-        return whirlpoolFeeGlyph;
-    }
-
-    public static Glyph getFakeMixGlyph() {
-        Glyph fakeMixGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.THEATER_MASKS);
-        fakeMixGlyph.getStyleClass().add("fakemix-icon");
-        fakeMixGlyph.setFontSize(12);
-        return fakeMixGlyph;
-    }
-
-    public static Glyph getTxoGlyph() {
-        return getChangeGlyph();
-    }
-
-    public static Glyph getMixGlyph() {
-        Glyph payjoinGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        payjoinGlyph.getStyleClass().add("mix-icon");
-        payjoinGlyph.setFontSize(12);
-        return payjoinGlyph;
-    }
-
-    public static Glyph getChangeGlyph() {
-        Glyph changeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
-        changeGlyph.getStyleClass().add("change-icon");
-        changeGlyph.setFontSize(12);
-        return changeGlyph;
-    }
-
-    public static Glyph getChangeWarningGlyph() {
-        Glyph changeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
-        changeWarningGlyph.getStyleClass().add("change-warning-icon");
-        changeWarningGlyph.setFontSize(12);
-        return changeWarningGlyph;
-    }
-
-    public static Glyph getChangeReplaceGlyph() {
-        Glyph changeReplaceGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
-        changeReplaceGlyph.getStyleClass().add("change-replace-icon");
-        changeReplaceGlyph.setFontSize(12);
-        return changeReplaceGlyph;
-    }
-
-    private Glyph getFeeGlyph() {
-        Glyph feeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING);
-        feeGlyph.getStyleClass().add("fee-icon");
-        feeGlyph.setFontSize(12);
-        return feeGlyph;
-    }
-
-    private Glyph getWarningGlyph() {
-        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        feeWarningGlyph.getStyleClass().add("fee-warning-icon");
-        feeWarningGlyph.setFontSize(12);
-        return feeWarningGlyph;
-    }
-
-    private Glyph getQuestionGlyph() {
-        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QUESTION_CIRCLE);
-        feeWarningGlyph.getStyleClass().add("question-icon");
-        feeWarningGlyph.setFontSize(12);
-        return feeWarningGlyph;
-    }
-
-    private Glyph getLockGlyph() {
-        Glyph lockGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LOCK);
-        lockGlyph.getStyleClass().add("lock-icon");
-        lockGlyph.setFontSize(12);
-        return lockGlyph;
-    }
-
-    private Glyph getUserGlyph() {
-        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER);
-        userGlyph.getStyleClass().add("user-icon");
-        userGlyph.setFontSize(12);
-        return userGlyph;
-    }
-
     private Glyph getUserAddGlyph() {
         Glyph userAddGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER_PLUS);
         userAddGlyph.getStyleClass().add("useradd-icon");
@@ -1162,6 +1001,10 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
+    public WalletTransaction getWalletTransaction() {
+        return walletTx;
+    }
+
     public boolean isFinal() {
         return finalProperty.get();
     }
@@ -1174,6 +1017,18 @@ public class TransactionDiagram extends GridPane {
         this.finalProperty.set(isFinal);
     }
 
+    public TransactionDiagramLabel getLabel() {
+        return labelProperty.get();
+    }
+
+    public ObjectProperty<TransactionDiagramLabel> labelProperty() {
+        return labelProperty;
+    }
+
+    public void setLabelProperty(TransactionDiagramLabel label) {
+        this.labelProperty.set(label);
+    }
+
     public OptimizationStrategy getOptimizationStrategy() {
         return optimizationStrategyProperty.get();
     }
@@ -1253,7 +1108,7 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
-    private static class AdditionalPayment extends Payment {
+    public static class AdditionalPayment extends Payment {
         private final List<Payment> additionalPayments;
 
         public AdditionalPayment(List<Payment> additionalPayments) {
@@ -1261,10 +1116,10 @@ public class TransactionDiagram extends GridPane {
             this.additionalPayments = additionalPayments;
         }
 
-        public Glyph getOutputGlyph(TransactionDiagram transactionDiagram) {
+        public Glyph getOutputGlyph(WalletTransaction walletTx) {
             Glyph glyph = null;
             for(Payment payment : additionalPayments) {
-                Glyph paymentGlyph = transactionDiagram.getOutputGlyph(payment);
+                Glyph paymentGlyph = GlyphUtils.getOutputGlyph(walletTx, payment);
                 if(glyph != null && !paymentGlyph.getStyleClass().equals(glyph.getStyleClass())) {
                     return getPaymentGlyph();
                 }
@@ -1280,7 +1135,7 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
-    private class OutputNode implements Comparable<OutputNode> {
+    private static class OutputNode {
         public Pane outputLabel;
         public Address address;
         public long amount;
@@ -1290,18 +1145,9 @@ public class TransactionDiagram extends GridPane {
             this.address = address;
             this.amount = amount;
         }
-
-        @Override
-        public int compareTo(TransactionDiagram.OutputNode o) {
-            try {
-                return getOutputIndex(address, amount) - getOutputIndex(o.address, o.amount);
-            } catch(Exception e) {
-                return 0;
-            }
-        }
     }
 
-    private static class LabelContextMenu extends ContextMenu {
+    private class LabelContextMenu extends ContextMenu {
         public LabelContextMenu(Address address, long value) {
             if(address != null) {
                 MenuItem copyAddress = new MenuItem("Copy Address");
@@ -1317,6 +1163,7 @@ public class TransactionDiagram extends GridPane {
                 showAddress.setOnAction(event -> {
                     hide();
                     QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(address.toString());
+                    qrDisplayDialog.initOwner(TransactionDiagram.this.getScene().getWindow());
                     qrDisplayDialog.showAndWait();
                 });
                 getItems().add(showAddress);

src/main/java/com/sparrowwallet/sparrow/control/TransactionDiagramLabel.java

@@ -0,0 +1,270 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.geometry.Pos;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.text.Font;
+import org.controlsfx.glyphfont.Glyph;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class TransactionDiagramLabel extends HBox {
+    private final List<HBox> outputs = new ArrayList<>();
+    private final Button left;
+    private final Button right;
+    private final IntegerProperty displayedIndex = new SimpleIntegerProperty(-1);
+
+    public TransactionDiagramLabel() {
+        setSpacing(5);
+        setAlignment(Pos.CENTER_RIGHT);
+
+        left = new Button("");
+        left.setGraphic(getLeftGlyph());
+        left.setOnAction(event -> {
+            int index = displayedIndex.get();
+            if(index > 0) {
+                index--;
+            }
+            displayedIndex.set(index);
+        });
+
+        right = new Button("");
+        right.setGraphic(getRightGlyph());
+        right.setOnAction(event -> {
+            int index = displayedIndex.get();
+            if(index < outputs.size() - 1) {
+                index++;
+            }
+            displayedIndex.set(index);
+        });
+
+        displayedIndex.addListener((observable, oldValue, newValue) -> {
+            left.setDisable(newValue.intValue() <= 0);
+            right.setDisable(newValue.intValue() < 0 || newValue.intValue() >= outputs.size() - 1);
+            if(oldValue.intValue() >= 0 && oldValue.intValue() < outputs.size()) {
+                outputs.get(oldValue.intValue()).setVisible(false);
+            }
+            if(newValue.intValue() >= 0 && newValue.intValue() < outputs.size()) {
+                outputs.get(newValue.intValue()).setVisible(true);
+            }
+        });
+    }
+
+    public void update(TransactionDiagram transactionDiagram) {
+        getChildren().clear();
+        outputs.clear();
+        displayedIndex.set(-1);
+        double maxWidth = getMaxWidth();
+
+        WalletTransaction walletTx = transactionDiagram.getWalletTransaction();
+        List<OutputLabel> outputLabels = new ArrayList<>();
+
+        List<Payment> premixOutputs = walletTx.getPayments().stream().filter(walletTx::isPremixSend).collect(Collectors.toList());
+        if(!premixOutputs.isEmpty()) {
+            OutputLabel premixOutputLabel = getPremixOutputLabel(transactionDiagram, premixOutputs);
+            if(premixOutputLabel != null) {
+                outputLabels.add(premixOutputLabel);
+            }
+
+            Optional<Payment> optWhirlpoolFee = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.WHIRLPOOL_FEE).findFirst();
+            if(optWhirlpoolFee.isPresent()) {
+                OutputLabel whirlpoolFeeOutputLabel = getWhirlpoolFeeOutputLabel(transactionDiagram, optWhirlpoolFee.get(), premixOutputs);
+                outputLabels.add(whirlpoolFeeOutputLabel);
+            }
+
+            List<Payment> badbankOutputs = walletTx.getPayments().stream().filter(walletTx::isBadbankSend).collect(Collectors.toList());
+            List<OutputLabel> badbankOutputLabels = badbankOutputs.stream().map(payment -> getBadbankOutputLabel(transactionDiagram, payment)).collect(Collectors.toList());
+            outputLabels.addAll(badbankOutputLabels);
+        } else if(walletTx.getPayments().size() >= 5 && walletTx.getPayments().stream().mapToLong(Payment::getAmount).distinct().count() <= 1 && walletTx.getWallet() != null
+                && walletTx.getWallet().getStandardAccountType() == StandardAccount.WHIRLPOOL_PREMIX  && walletTx.getPayments().stream().anyMatch(walletTx::isPostmixSend)) {
+            OutputLabel mixOutputLabel = getMixOutputLabel(transactionDiagram, walletTx.getPayments());
+            if(mixOutputLabel != null) {
+                outputLabels.add(mixOutputLabel);
+            }
+        } else if(walletTx.getPayments().size() >= 5 && walletTx.getPayments().stream().mapToLong(Payment::getAmount).distinct().count() <= 1 && walletTx.getWallet() != null
+                && walletTx.getWallet().getStandardAccountType() == StandardAccount.WHIRLPOOL_POSTMIX  && walletTx.getPayments().stream().anyMatch(walletTx::isConsolidationSend)) {
+            OutputLabel remixOutputLabel = getRemixOutputLabel(transactionDiagram, walletTx.getPayments());
+            if(remixOutputLabel != null) {
+                outputLabels.add(remixOutputLabel);
+            }
+        } else {
+            List<Payment> payments = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.DEFAULT && !walletTx.isConsolidationSend(payment)).collect(Collectors.toList());
+            List<OutputLabel> paymentLabels = payments.stream().map(payment -> getOutputLabel(transactionDiagram, payment)).collect(Collectors.toList());
+            if(walletTx.getSelectedUtxos().values().stream().allMatch(Objects::isNull)) {
+                paymentLabels.sort(Comparator.comparingInt(paymentLabel -> (paymentLabel.text.startsWith("Receive") ? 0 : 1)));
+            }
+            outputLabels.addAll(paymentLabels);
+
+            List<Payment> consolidations = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.DEFAULT && walletTx.isConsolidationSend(payment)).collect(Collectors.toList());
+            outputLabels.addAll(consolidations.stream().map(consolidation -> getOutputLabel(transactionDiagram, consolidation)).collect(Collectors.toList()));
+
+            List<Payment> mixes = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.MIX || payment.getType() == Payment.Type.FAKE_MIX).collect(Collectors.toList());
+            outputLabels.addAll(mixes.stream().map(payment -> getOutputLabel(transactionDiagram, payment)).collect(Collectors.toList()));
+        }
+
+        Map<WalletNode, Long> changeMap = walletTx.getChangeMap();
+        outputLabels.addAll(changeMap.entrySet().stream().map(changeEntry -> getOutputLabel(transactionDiagram, changeEntry)).collect(Collectors.toList()));
+
+        OutputLabel feeOutputLabel = getFeeOutputLabel(transactionDiagram);
+        if(feeOutputLabel != null) {
+            outputLabels.add(feeOutputLabel);
+        }
+
+        for(OutputLabel outputLabel : outputLabels) {
+            maxWidth = Math.max(maxWidth, outputLabel.width);
+            outputs.add(outputLabel.hBox);
+            getChildren().add(outputLabel.hBox);
+        }
+
+        HBox buttonBox = new HBox();
+        buttonBox.setAlignment(Pos.CENTER_RIGHT);
+        buttonBox.getChildren().addAll(left, right);
+        getChildren().add(buttonBox);
+
+        setMaxWidth(maxWidth);
+        setPrefWidth(maxWidth);
+
+        if(outputLabels.size() > 0) {
+            displayedIndex.set(0);
+        }
+    }
+
+    private OutputLabel getPremixOutputLabel(TransactionDiagram transactionDiagram, List<Payment> premixOutputs) {
+        if(premixOutputs.isEmpty()) {
+            return null;
+        }
+
+        Payment premixOutput = premixOutputs.get(0);
+        long total = premixOutputs.stream().mapToLong(Payment::getAmount).sum();
+        Glyph glyph = GlyphUtils.getOutputGlyph(transactionDiagram.getWalletTransaction(), premixOutput);
+        String text;
+        if(premixOutputs.size() == 1) {
+            text = "Premix transaction with 1 output of " + transactionDiagram.getSatsValue(premixOutput.getAmount()) + " sats";
+        } else {
+            text = "Premix transaction with " + premixOutputs.size() + " outputs of " + transactionDiagram.getSatsValue(premixOutput.getAmount()) + " sats each ("
+                    + transactionDiagram.getSatsValue(total) + " sats)";
+        }
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getBadbankOutputLabel(TransactionDiagram transactionDiagram, Payment payment) {
+        Glyph glyph = GlyphUtils.getOutputGlyph(transactionDiagram.getWalletTransaction(), payment);
+        String text = "Badbank change of " + transactionDiagram.getSatsValue(payment.getAmount()) + " sats to " + payment.getAddress().toString();
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getWhirlpoolFeeOutputLabel(TransactionDiagram transactionDiagram, Payment whirlpoolFee, List<Payment> premixOutputs) {
+        long total = premixOutputs.stream().mapToLong(Payment::getAmount).sum();
+        double feePercentage = (double)whirlpoolFee.getAmount() / (total - whirlpoolFee.getAmount());
+        Glyph glyph = GlyphUtils.getOutputGlyph(transactionDiagram.getWalletTransaction(), whirlpoolFee);
+        String text = "Whirlpool fee of " + transactionDiagram.getSatsValue(whirlpoolFee.getAmount()) + " sats (" + String.format("%.2f", feePercentage * 100.0) + "% of total premix value)";
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getMixOutputLabel(TransactionDiagram transactionDiagram, List<Payment> mixOutputs) {
+        if(mixOutputs.isEmpty()) {
+            return null;
+        }
+
+        Payment remixOutput = mixOutputs.get(0);
+        long total = mixOutputs.stream().mapToLong(Payment::getAmount).sum();
+        Glyph glyph = GlyphUtils.getPremixGlyph();
+        String text = "Mix transaction with " + mixOutputs.size() + " outputs of " + transactionDiagram.getSatsValue(remixOutput.getAmount()) + " sats each ("
+                + transactionDiagram.getSatsValue(total) + " sats)";
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getRemixOutputLabel(TransactionDiagram transactionDiagram, List<Payment> remixOutputs) {
+        if(remixOutputs.isEmpty()) {
+            return null;
+        }
+
+        Payment remixOutput = remixOutputs.get(0);
+        long total = remixOutputs.stream().mapToLong(Payment::getAmount).sum();
+        Glyph glyph = GlyphUtils.getPremixGlyph();
+        String text = "Remix transaction with " + remixOutputs.size() + " outputs of " + transactionDiagram.getSatsValue(remixOutput.getAmount()) + " sats each ("
+                + transactionDiagram.getSatsValue(total) + " sats)";
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getOutputLabel(TransactionDiagram transactionDiagram, Payment payment) {
+        WalletTransaction walletTx = transactionDiagram.getWalletTransaction();
+        Wallet toWallet = walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment);
+        WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getAddressNodeMap().get(payment.getAddress()) : null;
+
+        Glyph glyph = GlyphUtils.getOutputGlyph(transactionDiagram.getWalletTransaction(), payment);
+        String text = (toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ") + transactionDiagram.getSatsValue(payment.getAmount()) + " sats to " + payment.getAddress().toString();
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getOutputLabel(TransactionDiagram transactionDiagram, Map.Entry<WalletNode, Long> changeEntry) {
+        WalletTransaction walletTx = transactionDiagram.getWalletTransaction();
+
+        Glyph glyph = GlyphUtils.getChangeGlyph();
+        String text = "Change of " + transactionDiagram.getSatsValue(changeEntry.getValue()) + " sats to " + walletTx.getChangeAddress(changeEntry.getKey()).toString();
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getFeeOutputLabel(TransactionDiagram transactionDiagram) {
+        WalletTransaction walletTx = transactionDiagram.getWalletTransaction();
+        if(walletTx.getFee() < 0) {
+            return null;
+        }
+
+        Glyph glyph = GlyphUtils.getFeeGlyph();
+        String text = "Fee of " + transactionDiagram.getSatsValue(walletTx.getFee()) + " sats (" + String.format("%.2f", walletTx.getFeePercentage() * 100.0) + "%)";
+
+        return getOutputLabel(glyph, text);
+    }
+
+    private OutputLabel getOutputLabel(Glyph glyph, String text) {
+        Label icon = new Label();
+        icon.setMinWidth(15);
+        glyph.setFontSize(12);
+        icon.setGraphic(glyph);
+
+        CopyableLabel label = new CopyableLabel();
+        label.setFont(Font.font("Roboto Mono Italic", 13));
+        label.setText(text);
+
+        HBox output = new HBox(5);
+        output.setAlignment(Pos.CENTER);
+        output.managedProperty().bind(output.visibleProperty());
+        output.setVisible(false);
+        output.getChildren().addAll(icon, label);
+
+        double lineWidth = TextUtils.computeTextWidth(label.getFont(), label.getText(), 0.0D) + 2 + getSpacing() + icon.getMinWidth() + 60;
+        return new OutputLabel(output, lineWidth, text);
+    }
+
+    public static Glyph getLeftGlyph() {
+        Glyph caretLeftGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CARET_LEFT);
+        caretLeftGlyph.getStyleClass().add("label-left-icon");
+        caretLeftGlyph.setFontSize(15);
+        return caretLeftGlyph;
+    }
+
+    public static Glyph getRightGlyph() {
+        Glyph caretRightGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CARET_RIGHT);
+        caretRightGlyph.getStyleClass().add("label-right-icon");
+        caretRightGlyph.setFontSize(15);
+        return caretRightGlyph;
+    }
+
+    private record OutputLabel(HBox hBox, double width, String text) {}
+}

src/main/java/com/sparrowwallet/sparrow/control/TransactionsTreeTable.java

@@ -50,8 +50,7 @@ public class TransactionsTreeTable extends CoinTreeTable {
         setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
         setEditable(true);
         setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
-        dateCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        getSortOrder().add(dateCol);
+        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
     }
 
     public void updateAll(WalletTransactionsEntry rootEntry) {
@@ -61,16 +60,13 @@ public class TransactionsTreeTable extends CoinTreeTable {
         setRoot(rootItem);
         rootItem.setExpanded(true);
 
-        if(getColumns().size() > 0 && getSortOrder().isEmpty()) {
-            TreeTableColumn<Entry, ?> dateCol = getColumns().get(0);
-            getSortOrder().add(dateCol);
-            dateCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        }
+        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
     }
 
     public void updateHistory() {
         //Transaction entries should have already been updated using WalletTransactionsEntry.updateHistory, so only a resort required
         sort();
+        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
     }
 
     public void updateLabel(Entry entry) {

src/main/java/com/sparrowwallet/sparrow/control/TreeTableColumnConfig.java

@@ -0,0 +1,46 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.scene.control.TreeTableColumn;
+
+public class TreeTableColumnConfig {
+    private final int index;
+    private final Integer width;
+    private final TreeTableColumn.SortType sortType;
+
+    public TreeTableColumnConfig(int index, Integer width, TreeTableColumn.SortType sortType) {
+        this.index = index;
+        this.width = width;
+        this.sortType = sortType;
+    }
+
+    public TreeTableColumnConfig(int index, String width, String sortType) {
+        this.index = index;
+        this.width = width.isEmpty() ? null : Integer.valueOf(width, 10);
+        this.sortType = sortType.isEmpty() ? null : TreeTableColumn.SortType.valueOf(sortType);
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public Integer getWidth() {
+        return width;
+    }
+
+    public TreeTableColumn.SortType getSortType() {
+        return sortType;
+    }
+
+    public String toString() {
+        return index + "-" + (width == null ? "" : width) + "-" + (sortType == null ? "" : sortType);
+    }
+
+    public static TreeTableColumnConfig fromString(String columnConfig) {
+        String[] parts = columnConfig.split("-", 3);
+        if(parts.length == 3) {
+            return new TreeTableColumnConfig(Integer.parseInt(parts[0]), parts[1], parts[2]);
+        }
+
+        return new TreeTableColumnConfig(Integer.parseInt(parts[0]), (Integer)null, null);
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/TreeTableConfig.java

@@ -0,0 +1,42 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.scene.control.TreeTableColumn;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringJoiner;
+
+public class TreeTableConfig {
+    private final List<TreeTableColumnConfig> columnConfigs;
+
+    public TreeTableConfig(CoinTreeTable treeTable) {
+        columnConfigs = new ArrayList<>();
+        TreeTableColumn<Entry, ?> sortColumn = treeTable.getSortOrder().isEmpty() ? null : treeTable.getSortOrder().get(0);
+        for(int i = 0; i < treeTable.getColumns().size(); i++) {
+            TreeTableColumn<Entry, ?> column = treeTable.getColumns().get(i);
+            //TODO: Support column widths
+            columnConfigs.add(new TreeTableColumnConfig(i, null, sortColumn == column ? column.getSortType() : null));
+        }
+    }
+
+    public TreeTableConfig(List<TreeTableColumnConfig> columnConfigs) {
+        this.columnConfigs = columnConfigs;
+    }
+
+    public String toString() {
+        StringJoiner joiner = new StringJoiner("|");
+        columnConfigs.stream().forEach(col -> joiner.add(col.toString()));
+        return joiner.toString();
+    }
+
+    public static TreeTableConfig fromString(String tableConfig) {
+        List<TreeTableColumnConfig> columnConfigs = new ArrayList<>();
+        String[] parts = tableConfig.split("\\|");
+        for(String part : parts) {
+            columnConfigs.add(TreeTableColumnConfig.fromString(part));
+        }
+
+        return new TreeTableConfig(columnConfigs);
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/UsbStatusButton.java

@@ -27,7 +27,8 @@ public class UsbStatusButton extends MenuButton {
     public void setDevices(List<Device> devices) {
         for(Device device : devices) {
             MenuItem deviceItem = new MenuItem(device.getModel().toDisplayString());
-            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02)) {
+            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T ||
+                    device.getModel() == WalletModel.TREZOR_SAFE_3 || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02)) {
                 deviceItem = new Menu(device.getModel().toDisplayString());
                 MenuItem toggleItem = new MenuItem("Toggle Passphrase" + (!device.getModel().externalPassphraseEntry() ? "" : (device.isNeedsPassphraseSent() ? " Off" : " On")));
                 toggleItem.setOnAction(event -> {

src/main/java/com/sparrowwallet/sparrow/control/UtxosTreeTable.java

@@ -83,8 +83,7 @@ public class UtxosTreeTable extends CoinTreeTable {
         setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
         setEditable(true);
         setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
-        amountCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        getSortOrder().add(amountCol);
+        setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
 
         getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
     }
@@ -96,17 +95,14 @@ public class UtxosTreeTable extends CoinTreeTable {
         setRoot(rootItem);
         rootItem.setExpanded(true);
 
-        if(getColumns().size() > 0 && getSortOrder().isEmpty()) {
-            TreeTableColumn<Entry, ?> amountCol = getColumns().get(getColumns().size() - 1);
-            getSortOrder().add(amountCol);
-            amountCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        }
+        setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
     }
 
     public void updateHistory() {
         //Utxo entries should have already been updated, so only a resort required
         if(!getRoot().getChildren().isEmpty()) {
             sort();
+            setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
         }
     }
 

src/main/java/com/sparrowwallet/sparrow/control/WalletExportDialog.java

@@ -6,6 +6,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
+import com.sparrowwallet.sparrow.wallet.WalletForm;
 import com.sparrowwallet.sparrow.io.*;
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
@@ -17,7 +18,9 @@ import java.util.List;
 public class WalletExportDialog extends Dialog<Wallet> {
     private Wallet wallet;
 
-    public WalletExportDialog(Wallet wallet) {
+    public WalletExportDialog(WalletForm walletForm) {
+        this.wallet = walletForm.getWallet();
+
         EventManager.get().register(this);
         setOnCloseRequest(event -> {
             EventManager.get().unregister(this);
@@ -42,9 +45,10 @@ public class WalletExportDialog extends Dialog<Wallet> {
 
         List<WalletExport> exporters;
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
-            exporters = List.of(new Electrum(), new ElectrumPersonalServer(), new Descriptor(), new SpecterDesktop(), new Sparrow(), new WalletLabels());
+            exporters = List.of(new Electrum(), new ElectrumPersonalServer(), new Descriptor(), new SpecterDesktop(), new Sparrow(), new WalletLabels(), new WalletTransactions(walletForm));
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
-            exporters = List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new ElectrumPersonalServer(), new KeystoneMultisig(), new Descriptor(), new JadeMultisig(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new SpecterDIY(), new Sparrow(), new WalletLabels());
+            exporters = List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new ElectrumPersonalServer(), new KeystoneMultisig(),
+                    new Descriptor(), new JadeMultisig(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new SpecterDIY(), new Sparrow(), new WalletLabels(), new WalletTransactions(walletForm));
         } else {
             throw new UnsupportedOperationException("Cannot export wallet with policy type " + wallet.getPolicyType());
         }
@@ -64,6 +68,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
         dialogPane.getButtonTypes().addAll(cancelButtonType);
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(480);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
         AppServices.moveToActiveWindowScreen(this);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);

src/main/java/com/sparrowwallet/sparrow/control/WalletIcon.java

@@ -19,9 +19,10 @@ import javafx.scene.shape.Circle;
 import org.controlsfx.glyphfont.Glyph;
 import org.girod.javafx.svgimage.SVGImage;
 import org.girod.javafx.svgimage.SVGLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
@@ -137,7 +138,7 @@ public class WalletIcon extends StackPane {
     }
 
     private void addWalletIcon(String walletId) {
-        Image image = new Image(PROTOCOL + ":" + walletId + "?" + QUERY, WIDTH, HEIGHT, true, false);
+        Image image = new Image(PROTOCOL + ":" + walletId.replaceAll(" ", "%20").replaceAll("#", "%23") + "?" + QUERY, WIDTH, HEIGHT, true, false);
         getChildren().clear();
         Circle circle = new Circle(getPrefWidth() / 2,getPrefHeight() / 2,getPrefWidth() / 2);
         circle.setFill(new ImagePattern(image));
@@ -176,6 +177,8 @@ public class WalletIcon extends StackPane {
     }
 
     public static class WalletIconStreamHandler extends URLStreamHandler {
+        private static final Logger log = LoggerFactory.getLogger(WalletIconStreamHandler.class);
+
         @Override
         protected URLConnection openConnection(URL url) throws IOException {
             return new URLConnection(url) {
@@ -186,17 +189,19 @@ public class WalletIcon extends StackPane {
 
                 @Override
                 public InputStream getInputStream() throws IOException {
-                    String walletId = url.getPath();
+                    String walletId = url.getPath().replaceAll("%20", " ").replaceAll("%23", "#");
                     String query = url.getQuery();
 
                     Wallet wallet = AppServices.get().getWallet(walletId);
                     if(wallet == null) {
-                        throw new IOException("Cannot find wallet for wallet id " + walletId);
+                        log.warn("Cannot find wallet for wallet id " + walletId);
+                        return getFallbackIconStream();
                     }
 
                     if(query.startsWith(QUERY)) {
                         if(wallet.getWalletConfig() == null || wallet.getWalletConfig().getIconData() == null) {
-                            throw new IOException("No icon data for " + walletId);
+                            log.warn("No icon data for " + walletId);
+                            return getFallbackIconStream();
                         }
 
                         ByteArrayInputStream bais = new ByteArrayInputStream(wallet.getWalletConfig().getIconData());
@@ -207,7 +212,12 @@ public class WalletIcon extends StackPane {
                         }
                     }
 
-                    throw new MalformedURLException("Cannot load url " + url);
+                    log.warn("Cannot load url " + url);
+                    return getFallbackIconStream();
+                }
+
+                private static InputStream getFallbackIconStream() {
+                    return WalletIconStreamHandler.class.getResourceAsStream("/image/sparrow.png");
                 }
             };
         }

src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java

@@ -51,7 +51,8 @@ public class WalletImportDialog extends Dialog<Wallet> {
         AnchorPane.setRightAnchor(scrollPane, 0.0);
 
         importAccordion = new Accordion();
-        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new GordianSeedTool(), new SeedSigner(), new SpecterDIY());
+        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(),
+                new GordianSeedTool(), new SeedSigner(), new SpecterDIY(), new Krux(), new AirGapVault(), new Samourai());
         for(KeystoreFileImport importer : keystoreImporters) {
             if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
                 FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
@@ -59,7 +60,8 @@ public class WalletImportDialog extends Dialog<Wallet> {
             }
         }
 
-        List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow()));
+        List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(),
+                new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow(), new JadeMultisig()));
         if(!selectedWalletForms.isEmpty()) {
             walletImporters.add(new WalletLabels(selectedWalletForms));
         }
@@ -90,6 +92,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
 
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(600);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
         AppServices.moveToActiveWindowScreen(this);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);

src/main/java/com/sparrowwallet/sparrow/control/WalletSummaryDialog.java

@@ -0,0 +1,218 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.CurrencyRate;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.net.ExchangeSource;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import com.sparrowwallet.sparrow.wallet.Function;
+import com.sparrowwallet.sparrow.wallet.WalletForm;
+import com.sparrowwallet.sparrow.wallet.WalletTransactionsEntry;
+import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.geometry.Side;
+import javafx.scene.chart.NumberAxis;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class WalletSummaryDialog extends Dialog<Void> {
+    public WalletSummaryDialog(List<List<WalletForm>> summaryWalletFormsList) {
+        List<List<WalletForm>> walletFormsList = new ArrayList<>(summaryWalletFormsList);
+        walletFormsList.removeIf(List::isEmpty);
+        if(walletFormsList.isEmpty()) {
+            throw new IllegalArgumentException("No wallets selected to summarize");
+        }
+
+        boolean allOpenWallets = walletFormsList.size() > 1;
+        List<Wallet> masterWallets = walletFormsList.stream().map(walletForms -> walletForms.get(0).getMasterWallet()).toList();
+
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/transactions.css").toExternalForm());
+
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.setHeaderText("Wallet Summary for " + (allOpenWallets ? "All Open Wallets" : masterWallets.get(0).getName()));
+
+        Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
+        if(!image.isError()) {
+            ImageView imageView = new ImageView();
+            imageView.setSmooth(false);
+            imageView.setImage(image);
+            dialogPane.setGraphic(imageView);
+        }
+
+        HBox hBox = new HBox(40);
+
+        CoinTreeTable table = new CoinTreeTable();
+
+        TreeTableColumn<Entry, String> nameColumn = new TreeTableColumn<>("Wallet");
+        nameColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
+            return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getLabel());
+        });
+        nameColumn.setCellFactory(p -> new LabelCell());
+        table.getColumns().add(nameColumn);
+
+        TreeTableColumn<Entry, Number> balanceColumn = new TreeTableColumn<>("Balance");
+        balanceColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
+            return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
+        });
+        balanceColumn.setCellFactory(p -> new CoinCell());
+        table.getColumns().add(balanceColumn);
+        table.setUnitFormat(masterWallets.get(0));
+
+        CurrencyRate currencyRate = AppServices.getFiatCurrencyExchangeRate();
+        if(currencyRate != null && currencyRate.isAvailable() && Config.get().getExchangeSource() != ExchangeSource.NONE) {
+            TreeTableColumn<Entry, Number> fiatColumn = new TreeTableColumn<>(currencyRate.getCurrency().getSymbol());
+            fiatColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
+                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
+            });
+            fiatColumn.setCellFactory(p -> new FiatCell());
+            table.getColumns().add(fiatColumn);
+            table.setCurrencyRate(currencyRate);
+        }
+
+        Entry rootEntry = allOpenWallets ? new AllSummaryEntry(walletFormsList) : new SummaryEntry(walletFormsList.get(0));
+        TreeItem<Entry> rootItem = new TreeItem<>(rootEntry);
+        for(Entry childEntry : rootEntry.getChildren()) {
+            TreeItem<Entry> childItem = new TreeItem<>(childEntry);
+            rootItem.getChildren().add(childItem);
+            if(allOpenWallets) {
+                for(Entry walletEntry : childEntry.getChildren()) {
+                    TreeItem<Entry> walletItem = new TreeItem<>(walletEntry);
+                    childItem.getChildren().add(walletItem);
+                    walletItem.getChildren().add(new TreeItem<>(new UnconfirmedEntry((WalletTransactionsEntry)walletEntry)));
+                }
+            } else {
+                childItem.getChildren().add(new TreeItem<>(new UnconfirmedEntry((WalletTransactionsEntry)childEntry)));
+            }
+        }
+
+        table.setShowRoot(true);
+        table.setRoot(rootItem);
+        rootItem.setExpanded(true);
+
+        table.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+        table.setPrefWidth(450);
+
+        VBox vBox = new VBox();
+        vBox.getChildren().add(table);
+
+        hBox.getChildren().add(vBox);
+
+        Wallet balanceWallet;
+        if(allOpenWallets) {
+            balanceWallet = new Wallet();
+            balanceWallet.getChildWallets().addAll(masterWallets.stream().flatMap(mws -> mws.getAllWallets().stream()).toList());
+        } else {
+            balanceWallet = masterWallets.get(0);
+        }
+
+        NumberAxis xAxis = new NumberAxis();
+        xAxis.setSide(Side.BOTTOM);
+        xAxis.setForceZeroInRange(false);
+        xAxis.setMinorTickVisible(false);
+        NumberAxis yAxis = new NumberAxis();
+        yAxis.setSide(Side.LEFT);
+        BalanceChart balanceChart = new BalanceChart(xAxis, yAxis);
+        balanceChart.initialize(new WalletTransactionsEntry(balanceWallet, true));
+        balanceChart.setAnimated(false);
+        balanceChart.setLegendVisible(false);
+        balanceChart.setVerticalGridLinesVisible(false);
+
+        hBox.getChildren().add(balanceChart);
+
+        getDialogPane().setContent(hBox);
+
+        ButtonType okButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(okButtonType);
+
+        setResizable(true);
+        AppServices.moveToActiveWindowScreen(this);
+    }
+
+    public static class AllSummaryEntry extends Entry {
+        private AllSummaryEntry(List<List<WalletForm>> walletFormsList) {
+            super(null, "All Wallets", walletFormsList.stream().map(SummaryEntry::new).collect(Collectors.toList()));
+        }
+
+        @Override
+        public Long getValue() {
+            long value = 0;
+            for(Entry entry : getChildren()) {
+                value += entry.getValue();
+            }
+
+            return value;
+        }
+
+        @Override
+        public String getEntryType() {
+            return null;
+        }
+
+        @Override
+        public Function getWalletFunction() {
+            return Function.TRANSACTIONS;
+        }
+    }
+
+    public static class SummaryEntry extends Entry {
+        private SummaryEntry(List<WalletForm> walletForms) {
+            super(walletForms.get(0).getWallet(), walletForms.get(0).getWallet().getName(), walletForms.stream().map(WalletForm::getWalletTransactionsEntry).collect(Collectors.toList()));
+        }
+
+        @Override
+        public Long getValue() {
+            long value = 0;
+            for(Entry entry : getChildren()) {
+                value += entry.getValue();
+            }
+
+            return value;
+        }
+
+        @Override
+        public String getEntryType() {
+            return null;
+        }
+
+        @Override
+        public Function getWalletFunction() {
+            return Function.TRANSACTIONS;
+        }
+    }
+
+    public static class UnconfirmedEntry extends Entry {
+        private final WalletTransactionsEntry walletTransactionsEntry;
+
+        private UnconfirmedEntry(WalletTransactionsEntry walletTransactionsEntry) {
+            super(walletTransactionsEntry.getWallet(), "Unconfirmed", Collections.emptyList());
+            this.walletTransactionsEntry = walletTransactionsEntry;
+        }
+
+        @Override
+        public Long getValue() {
+            return walletTransactionsEntry.getMempoolBalance();
+        }
+
+        @Override
+        public String getEntryType() {
+            return null;
+        }
+
+        @Override
+        public Function getWalletFunction() {
+            return Function.TRANSACTIONS;
+        }
+    }
+}

src/main/java/com/sparrowwallet/sparrow/control/WebcamService.java

@@ -5,6 +5,7 @@ import com.google.zxing.*;
 import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
 import com.google.zxing.common.HybridBinarizer;
 import com.google.zxing.qrcode.QRCodeReader;
+import com.sparrowwallet.bokmakierie.Bokmakierie;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -43,6 +44,7 @@ public class WebcamService extends ScheduledService<Image> {
     private Webcam cam;
     private long lastQrSampleTime;
     private final Reader qrReader;
+    private final Bokmakierie bokmakierie;
 
     static {
         Webcam.setDriver(new WebcamScanDriver());
@@ -55,6 +57,7 @@ public class WebcamService extends ScheduledService<Image> {
         this.delayCalculator = delayCalculator;
         this.lastQrSampleTime = System.currentTimeMillis();
         this.qrReader = new QRCodeReader();
+        this.bokmakierie = new Bokmakierie();
     }
 
     @Override
@@ -156,6 +159,15 @@ public class WebcamService extends ScheduledService<Image> {
         LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
         BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
 
+        try {
+            com.sparrowwallet.bokmakierie.Result result = bokmakierie.scan(bufferedImage);
+            if(result != null) {
+                return new Result(result.getMessage(), result.getRawBytes(), new ResultPoint[0], BarcodeFormat.QR_CODE);
+            }
+        } catch(Exception e) {
+            log.debug("Error scanning QR", e);
+        }
+
         if(ZBar.isEnabled()) {
             ZBar.Scan scan = ZBar.scan(bufferedImage);
             if(scan != null) {

src/main/java/com/sparrowwallet/sparrow/control/XprvKeystoreImportPane.java

@@ -28,16 +28,18 @@ import java.util.List;
 public class XprvKeystoreImportPane extends TitledDescriptionPane {
     protected final Wallet wallet;
     protected final KeystoreXprvImport importer;
+    protected final KeyDerivation defaultDerivation;
 
     private Button enterXprvButton;
     private SplitMenuButton importButton;
 
     private ExtendedKey xprv;
 
-    public XprvKeystoreImportPane(Wallet wallet, KeystoreXprvImport importer) {
+    public XprvKeystoreImportPane(Wallet wallet, KeystoreXprvImport importer, KeyDerivation defaultDerivation) {
         super(importer.getName(), "Extended key import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.importer = importer;
+        this.defaultDerivation = defaultDerivation;
 
         createImportButton();
         buttonBox.getChildren().add(importButton);
@@ -47,6 +49,7 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
         super("Master Private Key", "BIP32 key", "", "image/" + WalletModel.SEED.getType() + ".png");
         this.wallet = null;
         this.importer = null;
+        this.defaultDerivation = keystore.getKeyDerivation();
 
         try {
             this.xprv = keystore.getExtendedMasterPrivateKey();
@@ -79,7 +82,7 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
         importButton.getStyleClass().add("default-button");
         importButton.setOnAction(event -> {
             importButton.setDisable(true);
-            importKeystore(wallet.getScriptType().getDefaultDerivation());
+            importKeystore(getDefaultDerivation());
         });
         String[] accounts = new String[] {"Import Default Account #0", "Import Account #1", "Import Account #2", "Import Account #3", "Import Account #4", "Import Account #5", "Import Account #6", "Import Account #7", "Import Account #8", "Import Account #9"};
         int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
@@ -97,6 +100,10 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
         importButton.setVisible(false);
     }
 
+    private List<ChildNumber> getDefaultDerivation() {
+        return defaultDerivation == null || defaultDerivation.getDerivation().isEmpty() ? wallet.getScriptType().getDefaultDerivation() : defaultDerivation.getDerivation();
+    }
+
     private void enterXprv() {
         setDescription("Enter master private key");
         showHideLink.setVisible(false);
@@ -149,7 +156,7 @@ public class XprvKeystoreImportPane extends TitledDescriptionPane {
             importButton.setVisible(true);
             setDescription("Ready to import");
             xprv = ExtendedKey.fromDescriptor(xprvField.getText());
-            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+            setContent(getDerivationEntry(getDefaultDerivation()));
         });
 
         xprvField.textProperty().addListener((observable, oldValue, newValue) -> {

src/main/java/com/sparrowwallet/sparrow/event/PSBTReorderedEvent.java

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.psbt.PSBT;
+
+public class PSBTReorderedEvent {
+    private final PSBT psbt;
+
+    public PSBTReorderedEvent(PSBT psbt) {
+        this.psbt = psbt;
+    }
+
+    public PSBT getPsbt() {
+        return psbt;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/event/RequestVerifyDownloadEvent.java

@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.event;
+
+import javafx.stage.Window;
+
+import java.io.File;
+
+public class RequestVerifyDownloadEvent {
+    private final Window window;
+    private final File file;
+
+    public RequestVerifyDownloadEvent(Window window) {
+        this.window = window;
+        this.file = null;
+    }
+
+    public RequestVerifyDownloadEvent(Window window, File file) {
+        this.window = window;
+        this.file = file;
+    }
+
+    public Window getWindow() {
+        return window;
+    }
+
+    public File getFile() {
+        return file;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/event/WhirlpoolIndexHighFrequencyEvent.java

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WhirlpoolIndexHighFrequencyEvent {
+    private final Wallet wallet;
+
+    public WhirlpoolIndexHighFrequencyEvent(Wallet wallet) {
+        this.wallet = wallet;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/glyphfont/FontAwesome5.java

@@ -25,6 +25,8 @@ public class FontAwesome5 extends GlyphFont {
         BTC('\uf15a'),
         BULLSEYE('\uf140'),
         CAMERA('\uf030'),
+        CARET_LEFT('\uf0d9'),
+        CARET_RIGHT('\uf0da'),
         CHECK_CIRCLE('\uf058'),
         CIRCLE('\uf111'),
         COINS('\uf51e'),
@@ -42,6 +44,7 @@ public class FontAwesome5 extends GlyphFont {
         HAND_HOLDING('\uf4bd'),
         HAND_HOLDING_MEDICAL('\ue05c'),
         HAND_HOLDING_WATER('\uf4c1'),
+        HOURGLASS_HALF('\uf252'),
         HISTORY('\uf1da'),
         INFO_CIRCLE('\uf05a'),
         KEY('\uf084'),
@@ -49,8 +52,10 @@ public class FontAwesome5 extends GlyphFont {
         LINK('\uf0c1'),
         LOCK('\uf023'),
         LOCK_OPEN('\uf3c1'),
+        LONG_ARROW_ALT_RIGHT('\uf30b'),
         MAGNIFYING_GLASS_PLUS('\uf00e'),
         MAGNIFYING_GLASS_MINUS('\uf010'),
+        MICROCHIP('\uf2db'),
         MINUS_CIRCLE('\uf056'),
         PEN_FANCY('\uf5ac'),
         PLUS('\uf067'),

src/main/java/com/sparrowwallet/sparrow/glyphfont/GlyphUtils.java

@@ -0,0 +1,213 @@
+package com.sparrowwallet.sparrow.glyphfont;
+
+import com.sparrowwallet.drongo.wallet.Payment;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.control.TransactionDiagram;
+import org.controlsfx.glyphfont.FontAwesome;
+import org.controlsfx.glyphfont.Glyph;
+
+public class GlyphUtils {
+    public static Glyph getOutputGlyph(WalletTransaction walletTx, Payment payment) {
+        if(payment.getType().equals(Payment.Type.MIX)) {
+            return getMixGlyph();
+        } else if(payment.getType().equals(Payment.Type.FAKE_MIX)) {
+            return getFakeMixGlyph();
+        } else if(walletTx.isConsolidationSend(payment)) {
+            return getConsolidationGlyph();
+        } else if(walletTx.isPremixSend(payment)) {
+            return getPremixGlyph();
+        } else if(walletTx.isBadbankSend(payment)) {
+            return getBadbankGlyph();
+        } else if(payment.getType().equals(Payment.Type.WHIRLPOOL_FEE)) {
+            return getWhirlpoolFeeGlyph();
+        } else if(payment instanceof TransactionDiagram.AdditionalPayment) {
+            return ((TransactionDiagram.AdditionalPayment)payment).getOutputGlyph(walletTx);
+        } else if(walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment) != null) {
+            return getDepositGlyph();
+        } else if(walletTx.isDuplicateAddress(payment)) {
+            return getPaymentWarningGlyph();
+        }
+
+        return getPaymentGlyph();
+    }
+
+    public static Glyph getPaymentGlyph() {
+        Glyph paymentGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
+        paymentGlyph.getStyleClass().add("payment-icon");
+        paymentGlyph.setFontSize(12);
+        return paymentGlyph;
+    }
+
+    public static Glyph getPaymentWarningGlyph() {
+        Glyph paymentWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        paymentWarningGlyph.getStyleClass().add("payment-warning-icon");
+        paymentWarningGlyph.setFontSize(12);
+        return paymentWarningGlyph;
+    }
+
+    public static Glyph getConsolidationGlyph() {
+        Glyph consolidationGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.REPLY_ALL);
+        consolidationGlyph.getStyleClass().add("consolidation-icon");
+        consolidationGlyph.setFontSize(12);
+        return consolidationGlyph;
+    }
+
+    public static Glyph getDepositGlyph() {
+        Glyph depositGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
+        depositGlyph.getStyleClass().add("deposit-icon");
+        depositGlyph.setFontSize(12);
+        return depositGlyph;
+    }
+
+    public static Glyph getPremixGlyph() {
+        Glyph premixGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
+        premixGlyph.getStyleClass().add("premix-icon");
+        premixGlyph.setFontSize(12);
+        return premixGlyph;
+    }
+
+    public static Glyph getBadbankGlyph() {
+        Glyph badbankGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.BIOHAZARD);
+        badbankGlyph.getStyleClass().add("badbank-icon");
+        badbankGlyph.setFontSize(12);
+        return badbankGlyph;
+    }
+
+    public static Glyph getWhirlpoolFeeGlyph() {
+        Glyph whirlpoolFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_WATER);
+        whirlpoolFeeGlyph.getStyleClass().add("whirlpoolfee-icon");
+        whirlpoolFeeGlyph.setFontSize(12);
+        return whirlpoolFeeGlyph;
+    }
+
+    public static Glyph getFakeMixGlyph() {
+        Glyph fakeMixGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.THEATER_MASKS);
+        fakeMixGlyph.getStyleClass().add("fakemix-icon");
+        fakeMixGlyph.setFontSize(12);
+        return fakeMixGlyph;
+    }
+
+    public static Glyph getTxoGlyph() {
+        return getChangeGlyph();
+    }
+
+    public static Glyph getMixGlyph() {
+        Glyph payjoinGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
+        payjoinGlyph.getStyleClass().add("mix-icon");
+        payjoinGlyph.setFontSize(12);
+        return payjoinGlyph;
+    }
+
+    public static Glyph getExternalInputGlyph() {
+        Glyph externalGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LONG_ARROW_ALT_RIGHT);
+        externalGlyph.getStyleClass().add("external-input-icon");
+        externalGlyph.setFontSize(12);
+        return externalGlyph;
+    }
+
+    public static Glyph getExcludeGlyph() {
+        Glyph excludeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.TIMES_CIRCLE);
+        excludeGlyph.getStyleClass().add("exclude-utxo");
+        excludeGlyph.setFontSize(12);
+        return excludeGlyph;
+    }
+
+    public static Glyph getChangeGlyph() {
+        Glyph changeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
+        changeGlyph.getStyleClass().add("change-icon");
+        changeGlyph.setFontSize(12);
+        return changeGlyph;
+    }
+
+    public static Glyph getChangeWarningGlyph() {
+        Glyph changeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        changeWarningGlyph.getStyleClass().add("change-warning-icon");
+        changeWarningGlyph.setFontSize(12);
+        return changeWarningGlyph;
+    }
+
+    public static Glyph getChangeReplaceGlyph() {
+        Glyph changeReplaceGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
+        changeReplaceGlyph.getStyleClass().add("change-replace-icon");
+        changeReplaceGlyph.setFontSize(12);
+        return changeReplaceGlyph;
+    }
+
+    public static Glyph getFeeGlyph() {
+        Glyph feeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING);
+        feeGlyph.getStyleClass().add("fee-icon");
+        feeGlyph.setFontSize(12);
+        return feeGlyph;
+    }
+
+    public static Glyph getFeeWarningGlyph() {
+        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+        feeWarningGlyph.getStyleClass().add("fee-warning-icon");
+        feeWarningGlyph.setFontSize(12);
+        return feeWarningGlyph;
+    }
+
+    public static Glyph getQuestionGlyph() {
+        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QUESTION_CIRCLE);
+        feeWarningGlyph.getStyleClass().add("question-icon");
+        feeWarningGlyph.setFontSize(12);
+        return feeWarningGlyph;
+    }
+
+    public static Glyph getLockGlyph() {
+        Glyph lockGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LOCK);
+        lockGlyph.getStyleClass().add("lock-icon");
+        lockGlyph.setFontSize(12);
+        return lockGlyph;
+    }
+
+    public static Glyph getUserGlyph() {
+        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER);
+        userGlyph.getStyleClass().add("user-icon");
+        userGlyph.setFontSize(12);
+        return userGlyph;
+    }
+
+    public static Glyph getOpcodeGlyph() {
+        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.MICROCHIP);
+        userGlyph.getStyleClass().add("opcode-icon");
+        userGlyph.setFontSize(12);
+        return userGlyph;
+    }
+
+    public static Glyph getSuccessGlyph() {
+        Glyph successGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
+        successGlyph.getStyleClass().add("success");
+        successGlyph.setFontSize(12);
+        return successGlyph;
+    }
+
+    public static Glyph getWarningGlyph() {
+        Glyph warningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        warningGlyph.getStyleClass().add("warn-icon");
+        warningGlyph.setFontSize(12);
+        return warningGlyph;
+    }
+
+    public static Glyph getFailureGlyph() {
+        Glyph failureGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.TIMES_CIRCLE);
+        failureGlyph.getStyleClass().add("failure");
+        failureGlyph.setFontSize(12);
+        return failureGlyph;
+    }
+
+    public static Glyph getBusyGlyph() {
+        Glyph busyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HOURGLASS_HALF);
+        busyGlyph.getStyleClass().add("busy");
+        busyGlyph.setFontSize(12);
+        return busyGlyph;
+    }
+
+    public static Glyph getDownArrowGlyph() {
+        Glyph downGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
+        downGlyph.getStyleClass().add("arrow-down");
+        downGlyph.setFontSize(12);
+        return downGlyph;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/instance/Instance.java

@@ -1,535 +1,270 @@
-/**
- * Copyright 2019 Pratanu Mandal
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- */
-
 package com.sparrowwallet.sparrow.instance;
 
+import com.sparrowwallet.sparrow.io.Storage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.RandomAccessFile;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
+import java.net.ConnectException;
 import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
+import java.net.StandardProtocolFamily;
+import java.net.UnixDomainSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.util.Iterator;
+import java.util.Set;
 
-/**
- * The <code>Instance</code> class is the primary logical entry point to the library.<br>
- * It allows to create an application lock or free it and send and receive messages between first and subsequent instances.<br><br>
- * 
- * <pre>
- *	// unique application ID
- *	String APP_ID = "tk.pratanumandal.unique4j-mlsdvo-20191511-#j.6";
- *	
- *	// create Instance instance
- *	Instance unique = new Instance(APP_ID) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected void receiveMessage(String message) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// print received message (timestamp)
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;System.out.println(message);
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *	&nbsp;&nbsp;&nbsp;&nbsp;
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected String sendMessage() {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// send timestamp as message
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Timestamp ts = new Timestamp(new Date().getTime());
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return "Another instance launch attempted: " + ts.toString();
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *	};
- *	
- *	// try to obtain lock
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.acquireLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- *	
- *	...
- *	
- *	// try to free the lock before exiting program
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.freeLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- * </pre>
- * 
- * @author Pratanu Mandal
- * @since 1.3
- *
- */
 public abstract class Instance {
     private static final Logger log = LoggerFactory.getLogger(Instance.class);
-	
-	// starting position of port check
-	private static final int PORT_START = 7221;
-	
-	// system temporary directory path
-	private static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
-	
-	/**
-	 * Unique string representing the application ID.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 */
-	public final String APP_ID;
-	
-	// auto exit from application or not
-	private final boolean AUTO_EXIT;
-	
-	// lock server port
-	private int port;
-	
-	// lock server socket
-	private ServerSocket server;
-	
-	// lock file RAF object
-	private RandomAccessFile lockRAF;
-	
-	// file lock for the lock file RAF object
-	private FileLock fileLock;
+    private static final String LINK_ENV_PROPERTY = "SPARROW_NO_LOCK_FILE_LINK";
 
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor configures to automatically exit the application for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 */
-	public Instance(final String APP_ID) {
-		this(APP_ID, true);
-	}
-	
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor allows to explicitly specify the exit strategy for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @since 1.2
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 * @param AUTO_EXIT If true, automatically exit the application for subsequent instances
-	 */
-	public Instance(final String APP_ID, final boolean AUTO_EXIT) {
-		this.APP_ID = APP_ID;
-		this.AUTO_EXIT = AUTO_EXIT;
-	}
-	
-	/**
-	 * Try to obtain lock. If not possible, send data to first instance.
-	 * 
-	 * @deprecated Use <code>acquireLock()</code> instead.
-	 * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
-	 */
-	@Deprecated
-	public void lock() throws InstanceException {
-		acquireLock();
-	}
-	
-	/**
-	 * Try to obtain lock. If not possible, send data to first instance.
-	 * 
-	 * @since 1.2
-	 * 
-	 * @return true if able to acquire lock, false otherwise
-	 * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
-	 */
-	public boolean acquireLock() throws InstanceException {
-		// try to obtain port number from lock file
-		port = lockFile();
-		
-		if (port == -1) {
-			// failed to fetch port number
-			// try to start server
-			startServer();
-		}
-		else {
-			// port number fetched from lock file
-			// try to start client
-			doClient();
-		}
-		
-		return (server != null);
-	}
-	
-	// start the server
-	private void startServer() throws InstanceException {
-		// try to create server
-		port = PORT_START;
-		while (true) {
-			try {
-				server = new ServerSocket(port, 50, InetAddress.getByName(null));
-				break;
-			} catch (IOException e) {
-				port++;
-			}
-		}
-		
-		// try to lock file
-		lockFile(port);
-		
-		// server created successfully; this is the first instance
-		// keep listening for data from other instances
-		Thread thread = new Thread() {
-			@Override
-			public void run() {
-				while (!server.isClosed()) {
-					try {
-						// establish connection
-						final Socket socket = server.accept();
-						
-						// handle socket on a different thread to allow parallel connections
-						Thread thread = new Thread() {
-							@Override
-							public void run() {
-								try {
-									// open writer
-									OutputStream os = socket.getOutputStream();
-									DataOutputStream dos = new DataOutputStream(os);
-									
-									// open reader
-									InputStream is = socket.getInputStream();
-									DataInputStream dis = new DataInputStream(is);
-									
-									// read message length from client
-									int length = dis.readInt();
-									
-									// read message string from client
-									String message = null;
-									if (length > -1) {
-										byte[] messageBytes = new byte[length];
-										int bytesRead = dis.read(messageBytes, 0, length);
-										message = new String(messageBytes, 0, bytesRead, "UTF-8");
-									}
-									
-									// write response to client
-									if (APP_ID == null) {
-										dos.writeInt(-1);
-									}
-									else {
-										byte[] appId = APP_ID.getBytes("UTF-8");
-										
-										dos.writeInt(appId.length);
-										dos.write(appId);
-									}
-									dos.flush();
-									
-									// close writer and reader
-									dos.close();
-									dis.close();
-									
-									// perform user action on message
-									receiveMessage(message);
-									
-									// close socket
-									socket.close();
-								} catch (IOException e) {
-									handleException(new InstanceException(e));
-								}
-							}
-						};
-						
-						// start socket thread
-						thread.start();
-					} catch (SocketException e) {
-						if (!server.isClosed()) {
-							handleException(new InstanceException(e));
-						}
-					} catch (IOException e) {
-						handleException(new InstanceException(e));
-					}
-				}
-			}
-		};
-		
-		thread.start();
-	}
-	
-	// do client tasks
-	private void doClient() throws InstanceException {
-		// get localhost address
-		InetAddress address = null;
-		try {
-			address = InetAddress.getByName(null);
-		} catch (UnknownHostException e) {
-			throw new InstanceException(e);
-		}
-		
-		// try to establish connection to server
-		Socket socket = null;
-		try {
-			socket = new Socket(address, port);
-		} catch (IOException e) {
-			// connection failed try to start server
-			startServer();
-		}
-		
-		// connection successful try to connect to server
-		if (socket != null) {
-			try {
-				// get message to be sent to first instance
-				String message = sendMessage();
-				
-				// open writer
-				OutputStream os = socket.getOutputStream();
-				DataOutputStream dos = new DataOutputStream(os);
-				
-				// open reader
-				InputStream is = socket.getInputStream();
-				DataInputStream dis = new DataInputStream(is);
-				
-				// write message to server
-				if (message == null) {
-					dos.writeInt(-1);
-				}
-				else {
-					byte[] messageBytes = message.getBytes("UTF-8");
-					
-					dos.writeInt(messageBytes.length);
-					dos.write(messageBytes);
-				}
-				
-				dos.flush();
-				
-				// read response length from server
-				int length = dis.readInt();
-				
-				// read response string from server
-				String response = null;
-				if (length > -1) {
-					byte[] responseBytes = new byte[length];
-					int bytesRead = dis.read(responseBytes, 0, length);
-					response = new String(responseBytes, 0, bytesRead, "UTF-8");
-				}
-				
-				// close writer and reader
-				dos.close();
-				dis.close();
-				
-				if (response.equals(APP_ID)) {
-					// validation successful
-					if (AUTO_EXIT) {
-						// perform pre-exit tasks
-						beforeExit();
-						// exit this instance
-						System.exit(0);
-					}
-				}
-				else {
-					// validation failed, this is the first instance
-					startServer();
-				}
-			} catch (IOException e) {
-				throw new InstanceException(e);
-			} finally {
-				// close socket
-			 	try {
-			 		if (socket != null) socket.close();
-				} catch (IOException e) {
-					throw new InstanceException(e);
-				}
-			}
-		}
-	}
-	
-	// try to get port from lock file
-	private int lockFile() throws InstanceException {
-		// lock file path
-		String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
-		File file = new File(filePath);
-		
-		// try to get port from lock file
-		if (file.exists()) {
-			BufferedReader br = null;
-			try {
-				br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-				return Integer.parseInt(br.readLine());
-			} catch (IOException e) {
-				throw new InstanceException(e);
-			} catch (NumberFormatException e) {
-				// do nothing
-			} finally {
-				try {
-					if (br != null) br.close();
-				} catch (IOException e) {
-					throw new InstanceException(e);
-				}
-			}
-		}
-		
-		return -1;
-	}
-	
-	// try to write port to lock file
-	private void lockFile(int port) throws InstanceException {
-		// lock file path
-		String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
-		File file = new File(filePath);
-		
-		// try to write port to lock file
-		BufferedWriter bw = null;
-		try {
-			bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
-			bw.write(String.valueOf(port));
-		} catch (IOException e) {
-			throw new InstanceException(e);
-		} finally {
-			try {
-				if (bw != null) bw.close();
-			} catch (IOException e) {
-				throw new InstanceException(e);
-			}
-		}
-		
-		// try to obtain file lock
-		try {
-			lockRAF = new RandomAccessFile(file, "rw");
-			FileChannel fc = lockRAF.getChannel();
-			fileLock = fc.tryLock(0, Long.MAX_VALUE, true);
-			if (fileLock == null) {
-				throw new InstanceException("Failed to obtain file lock");
-			}
-		} catch (FileNotFoundException e) {
-			throw new InstanceException(e);
-		} catch (IOException e) {
-			throw new InstanceException(e);
-		}
-	}
-	
-	/**
-	 * Free the lock if possible. This is only required to be called from the first instance.
-	 * 
-	 * @deprecated Use <code>freeLock()</code> instead.
-	 * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
-	 */
-	@Deprecated
-	public void free() throws InstanceException {
-		freeLock();
-	}
-	
-	/**
-	 * Free the lock if possible. This is only required to be called from the first instance.
-	 * 
-	 * @since 1.2
-	 * 
-	 * @return true if able to release lock, false otherwise
-	 * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
-	 */
-	public boolean freeLock() throws InstanceException {
-		try {
-			// close server socket
-			if (server != null) {
-				server.close();
-			
-				// lock file path
-				String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
-				File file = new File(filePath);
-				
-				// try to release file lock
-				if (fileLock != null) {
-					fileLock.release();
-				}
-				
-				// try to close lock file RAF object
-				if (lockRAF != null) {
-					lockRAF.close();
-				}
-				
-				// try to delete lock file
-				if (file.exists()) {
-					file.delete();
-				}
-				
-				return true;
-			}
-			
-			return false;
-		} catch (IOException e) {
-			throw new InstanceException(e);
-		}
-	}
-	
-	/**
-	 * Method used in first instance to receive messages from subsequent instances.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @param message message received by first instance from subsequent instances
-	 */
-	protected abstract void receiveMessage(String message);
-	
-	/**
-	 * Method used in subsequent instances to send message to first instance.<br><br>
-	 * 
-	 * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
-	 * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @return message sent from subsequent instances
-	 */
-	protected abstract String sendMessage();
-	
-	/**
-	 * Method to receive and handle exceptions occurring while first instance is listening for subsequent instances.<br><br>
-	 * 
-	 * By default prints stack trace of all exceptions. Override this method to handle exceptions explicitly.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @param exception exception occurring while first instance is listening for subsequent instances
-	 */
-	protected void handleException(Exception exception) {
+    public final String applicationId;
+    private final boolean autoExit;
+
+    private Selector selector;
+    private ServerSocketChannel serverChannel;
+
+    public Instance(final String applicationId) {
+        this(applicationId, true);
+    }
+
+    public Instance(final String applicationId, final boolean autoExit) {
+        this.applicationId = applicationId;
+        this.autoExit = autoExit;
+    }
+
+    /**
+     * Try to obtain lock. If not possible, send data to first instance.
+     *
+     * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
+     */
+    public void acquireLock(boolean findExisting) throws InstanceException {
+        Path lockFile = getLockFile(findExisting);
+
+        if(!Files.exists(lockFile)) {
+            startServer(lockFile);
+        } else {
+            doClient(lockFile);
+        }
+    }
+
+    private void startServer(Path lockFile) throws InstanceException {
+        try {
+            selector = Selector.open();
+            UnixDomainSocketAddress socketAddress = UnixDomainSocketAddress.of(lockFile);
+            serverChannel = ServerSocketChannel.open(StandardProtocolFamily.UNIX);
+            serverChannel.bind(socketAddress);
+            serverChannel.configureBlocking(false);
+            serverChannel.register(selector, SelectionKey.OP_ACCEPT);
+            lockFile.toFile().deleteOnExit();
+        } catch(Exception e) {
+            throw new InstanceException("Could not open UNIX socket lock file for instance at " + lockFile.toAbsolutePath(), e);
+        }
+
+        Thread thread = new Thread(() -> {
+            while(true) {
+                try {
+                    selector.select();
+                    Set<SelectionKey> selectedKeys = selector.selectedKeys();
+                    Iterator<SelectionKey> iter = selectedKeys.iterator();
+                    while(iter.hasNext()) {
+                        SelectionKey key = iter.next();
+                        if(key.isAcceptable()) {
+                            SocketChannel client = serverChannel.accept();
+                            client.configureBlocking(false);
+                            client.register(selector, SelectionKey.OP_READ);
+                        }
+                        if(key.isReadable()) {
+                            try(SocketChannel clientChannel = (SocketChannel)key.channel()) {
+                                String message = readMessage(clientChannel);
+                                clientChannel.write(ByteBuffer.wrap(applicationId.getBytes(StandardCharsets.UTF_8)));
+                                receiveMessage(message);
+                            }
+                        }
+                        iter.remove();
+                    }
+                } catch(SocketException e) {
+                    if(serverChannel.isOpen()) {
+                        handleException(new InstanceException(e));
+                    }
+                } catch(Exception e) {
+                    handleException(new InstanceException(e));
+                }
+            }
+        });
+
+        thread.setDaemon(true);
+        thread.setName("SparrowInstanceListener");
+        thread.start();
+
+        createSymlink(lockFile);
+    }
+
+    private void doClient(Path lockFile) throws InstanceException {
+        try(SocketChannel client = SocketChannel.open(UnixDomainSocketAddress.of(lockFile))) {
+            String message = sendMessage();
+            client.write(ByteBuffer.wrap(message.getBytes(StandardCharsets.UTF_8)));
+            client.shutdownOutput();
+
+            String response = readMessage(client);
+            if(response.equals(applicationId) && autoExit) {
+                beforeExit();
+                System.exit(0);
+            }
+        } catch(ConnectException e) {
+            try {
+                Files.deleteIfExists(lockFile);
+                startServer(lockFile);
+            } catch(Exception ex) {
+                throw new InstanceException("Could not delete lock file from previous instance", e);
+            }
+        } catch(Exception e) {
+            throw new InstanceException("Could not open client connection to existing instance", e);
+        }
+    }
+
+    private static String readMessage(SocketChannel clientChannel) throws IOException {
+        ByteBuffer buffer = ByteBuffer.allocate(1024);
+        StringBuilder messageBuilder = new StringBuilder();
+        while(clientChannel.read(buffer) != -1) {
+            buffer.flip();
+            messageBuilder.append(new String(buffer.array(), 0, buffer.limit()));
+            buffer.clear();
+        }
+
+        return messageBuilder.toString();
+    }
+
+    private Path getLockFile(boolean findExisting) {
+        if(findExisting) {
+            Path pointer = getUserLockFilePointer();
+            try {
+                if(pointer != null && Files.exists(pointer)) {
+                    if(Files.isSymbolicLink(pointer)) {
+                        return Files.readSymbolicLink(pointer);
+                    } else {
+                        Path lockFile = Path.of(Files.readString(pointer, StandardCharsets.UTF_8));
+                        if(Files.exists(lockFile)) {
+                            return lockFile;
+                        }
+                    }
+                }
+            } catch(IOException e) {
+                log.warn("Could not find lock file at " + pointer.toAbsolutePath());
+            } catch(Exception e) {
+                //ignore
+            }
+        }
+
+        return Storage.getSparrowDir().toPath().resolve(applicationId + ".lock");
+    }
+
+    private void createSymlink(Path lockFile) {
+        Path pointer = getUserLockFilePointer();
+        try {
+            if(pointer != null && !Files.exists(pointer, LinkOption.NOFOLLOW_LINKS)) {
+                Files.createSymbolicLink(pointer, lockFile);
+                pointer.toFile().deleteOnExit();
+            }
+        } catch(IOException e) {
+            log.debug("Could not create symlink " + pointer.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath() + ", writing as normal file", e);
+
+            try {
+                Files.writeString(pointer, lockFile.toAbsolutePath().toString(), StandardCharsets.UTF_8);
+                pointer.toFile().deleteOnExit();
+            } catch(IOException ex) {
+                log.warn("Could not create pointer " + pointer.toAbsolutePath() + " to lockFile at " + lockFile.toAbsolutePath(), ex);
+            }
+        } catch(Exception e) {
+            //ignore
+        }
+    }
+
+    private Path getUserLockFilePointer() {
+        if(Boolean.parseBoolean(System.getenv(LINK_ENV_PROPERTY))) {
+            return null;
+        }
+
+        try {
+            File sparrowHome = Storage.getSparrowHome(true);
+            if(!sparrowHome.exists()) {
+                Storage.createOwnerOnlyDirectory(sparrowHome);
+            }
+
+            return sparrowHome.toPath().resolve(applicationId + ".default");
+        } catch(Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * Free the lock if possible. This is only required to be called from the first instance.
+     *
+     * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
+     */
+    public void freeLock() throws InstanceException {
+        try {
+            if(serverChannel != null && serverChannel.isOpen()) {
+                serverChannel.close();
+            }
+            if(getUserLockFilePointer() != null) {
+                Files.deleteIfExists(getUserLockFilePointer());
+            }
+            Files.deleteIfExists(getLockFile(false));
+        } catch(Exception e) {
+            throw new InstanceException(e);
+        }
+    }
+
+    /**
+     * Method used in first instance to receive messages from subsequent instances.<br><br>
+     *
+     * This method is not synchronized.
+     *
+     * @param message message received by first instance from subsequent instances
+     */
+    protected abstract void receiveMessage(String message);
+
+    /**
+     * Method used in subsequent instances to send message to first instance.<br><br>
+     *
+     * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
+     * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
+     *
+     * This method is not synchronized.
+     *
+     * @return message sent from subsequent instances
+     */
+    protected abstract String sendMessage();
+
+    /**
+     * Method to receive and handle exceptions occurring while first instance is listening for subsequent instances.<br><br>
+     *
+     * By default prints stack trace of all exceptions. Override this method to handle exceptions explicitly.<br><br>
+     *
+     * This method is not synchronized.
+     *
+     * @param exception exception occurring while first instance is listening for subsequent instances
+     */
+    protected void handleException(Exception exception) {
         log.error("Error listening for instances", exception);
-	}
-	
-	/**
-	 * This method is called before exiting from subsequent instances.<br><br>
-	 * 
-	 * Override this method to perform blocking tasks before exiting from subsequent instances.<br>
-	 * This method is not invoked if auto exit is turned off.<br><br>
-	 * 
-	 * This method is not synchronized.
-	 * 
-	 * @since 1.2
-	 */
-	protected void beforeExit() {}
-	
+    }
+
+    /**
+     * This method is called before exiting from subsequent instances.<br><br>
+     *
+     * Override this method to perform blocking tasks before exiting from subsequent instances.<br>
+     * This method is not invoked if auto exit is turned off.<br><br>
+     *
+     * This method is not synchronized.
+     */
+    protected void beforeExit() {}
 }

src/main/java/com/sparrowwallet/sparrow/instance/InstanceList.java

@@ -7,88 +7,14 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 
-/**
- * The <code>InstanceList</code> class is a logical entry point to the library which extends the functionality of the <code>Instance</code> class.<br>
- * It allows to create an application lock or free it and send and receive messages between first and subsequent instances.<br><br>
- * 
- * This class is intended for passing a list of strings instead of a single string from the subsequent instance to the first instance.<br><br>
- * 
- * <pre>
- *	// unique application ID
- *	String APP_ID = "tk.pratanumandal.unique4j-mlsdvo-20191511-#j.6";
- *	
- *	// create Instance instance
- *	Instance unique = new InstanceList(APP_ID) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected List&lt;String&gt; sendMessageList() {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;List&lt;String&gt; messageList = new ArrayList&lt;String&gt;();
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 1");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 2");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 3");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 4");
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return messageList;
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *
- *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
- *	&nbsp;&nbsp;&nbsp;&nbsp;protected void receiveMessageList(List&lt;String&gt; messageList) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (String message : messageList) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;System.out.println(message);
- *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
- *	&nbsp;&nbsp;&nbsp;&nbsp;}
- *	};
- *	
- *	// try to obtain lock
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.acquireLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- *	
- *	...
- *	
- *	// try to free the lock before exiting program
- *	try {
- *	&nbsp;&nbsp;&nbsp;&nbsp;unique.freeLock();
- *	} catch (InstanceException e) {
- *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
- *	}
- * </pre>
- * 
- * @author Pratanu Mandal
- * @since 1.3
- *
- */
 public abstract class InstanceList extends Instance {
 	
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor configures to automatically exit the application for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 */
-	public InstanceList(String APP_ID) {
-		super(APP_ID);
+	public InstanceList(String applicationId) {
+		super(applicationId);
 	}
 	
-	/**
-	 * Parameterized constructor.<br>
-	 * This constructor allows to explicitly specify the exit strategy for subsequent instances.<br><br>
-	 * 
-	 * The APP_ID must be as unique as possible.
-	 * Avoid generic names like "my_app_id" or "hello_world".<br>
-	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
-	 * 
-	 * @param APP_ID Unique string representing the application ID
-	 * @param AUTO_EXIT If true, automatically exit the application for subsequent instances
-	 */
-	public InstanceList(String APP_ID, boolean AUTO_EXIT) {
-		super(APP_ID, AUTO_EXIT);
+	public InstanceList(String applicationId, boolean autoExit) {
+		super(applicationId, autoExit);
 	}
 
 	/**
@@ -101,16 +27,15 @@ public abstract class InstanceList extends Instance {
 	 */
 	@Override
 	protected final void receiveMessage(String message) {
-		if (message == null) {
+		if(message == null) {
 			receiveMessageList(null);
-		}
-		else {
+		} else {
 			// parse the JSON array string into an array of string arguments
 	        JsonArray jsonArgs = JsonParser.parseString(message).getAsJsonArray();
 	        
 	        List<String> stringArgs = new ArrayList<String>(jsonArgs.size());
 	        
-	        for (int i = 0; i < jsonArgs.size(); i++) {
+	        for(int i = 0; i < jsonArgs.size(); i++) {
 	            JsonElement element = jsonArgs.get(i);
 	            stringArgs.add(element.getAsString());
 	        }
@@ -137,10 +62,11 @@ public abstract class InstanceList extends Instance {
         JsonArray jsonArgs = new JsonArray();
         
         List<String> stringArgs = sendMessageList();
+        if(stringArgs == null) {
+            return null;
+        }
         
-        if (stringArgs == null) return null;
-        
-        for (String arg : stringArgs) {
+        for(String arg : stringArgs) {
             jsonArgs.add(arg);
         }
 
@@ -168,5 +94,4 @@ public abstract class InstanceList extends Instance {
 	 * @return list of messages sent from subsequent instances
 	 */
 	protected abstract List<String> sendMessageList();
-	
 }

src/main/java/com/sparrowwallet/sparrow/io/AirGapVault.java

@@ -0,0 +1,35 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+public class AirGapVault extends KeystoneSinglesig {
+    @Override
+    public String getName() {
+        return "AirGap Vault";
+    }
+
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import QR created on your AirGap Vault, by selecting the Secret > Account > Sparrow Wallet";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.AIRGAP_VAULT;
+    }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
+
+    @Override
+    public boolean isWalletImportFileFormatAvailable() {
+        return false;
+    }
+
+    @Override
+    public boolean isDeprecated() {
+        return true;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/io/Bip129.java

@@ -189,7 +189,7 @@ public class Bip129 implements KeystoreFileExport, KeystoreFileImport, WalletExp
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         try {
             String record = "BSMS 1.0\n" +
                     OutputDescriptor.getOutputDescriptor(wallet) +

src/main/java/com/sparrowwallet/sparrow/io/CaravanMultisig.java

@@ -28,7 +28,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
 
     @Override
     public String getName() {
-        return "Caravan Multisig";
+        return "Unchained or Caravan Multisig";
     }
 
     @Override
@@ -94,7 +94,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         if(!wallet.isValid()) {
             throw new ExportException("Cannot export an incomplete wallet");
         }

src/main/java/com/sparrowwallet/sparrow/io/CardApi.java

@@ -10,6 +10,7 @@ import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
 import com.sparrowwallet.sparrow.io.ckcard.CkCardApi;
+import com.sparrowwallet.sparrow.io.satochip.SatoCardApi;
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Service;
 import org.controlsfx.tools.Platform;
@@ -23,6 +24,7 @@ import javax.smartcardio.TerminalFactory;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -33,26 +35,41 @@ public abstract class CardApi {
             new File("/usr/lib/libpcsclite.so.1"),
             new File("/usr/local/lib/libpcsclite.so.1"),
             new File("/lib/x86_64-linux-gnu/libpcsclite.so.1"),
-            new File("/lib/aarch64-linux-gnu/libpcsclite.so.1")};
+            new File("/lib/aarch64-linux-gnu/libpcsclite.so.1"),
+            new File("/usr/lib64/libpcsclite.so.1"),
+            new File("/usr/lib/x86_64-linux-gnu/libpcsclite.so.1")};
 
     private static boolean initialized;
 
     public static List<WalletModel> getConnectedCards() throws CardException {
+        List<WalletModel> cards = new ArrayList<>();
+
         try {
             CkCardApi ckCardApi = new CkCardApi(null, null);
-            return List.of(ckCardApi.getCardType());
+            cards.add(ckCardApi.getCardType());
         } catch(Exception e) {
             //ignore
         }
 
-        return Collections.emptyList();
+        try {
+            SatoCardApi satoCardApi = new SatoCardApi(null, null);
+            cards.add(satoCardApi.getCardType());
+        } catch(Exception e) {
+            //ignore
+        }
+
+        return cards;
     }
 
     public static CardApi getCardApi(WalletModel walletModel, String pin) throws CardException {
-        if(walletModel == WalletModel.TAPSIGNER || walletModel == WalletModel.SATSCARD) {
+        if(walletModel == WalletModel.TAPSIGNER || walletModel == WalletModel.SATSCHIP || walletModel == WalletModel.SATSCARD) {
             return new CkCardApi(walletModel, pin);
         }
 
+        if(walletModel == WalletModel.SATOCHIP) {
+            return new SatoCardApi(walletModel, pin);
+        }
+
         throw new IllegalArgumentException("Cannot create card API for " + walletModel.toDisplayString());
     }
 

src/main/java/com/sparrowwallet/sparrow/io/CardImport.java

@@ -6,5 +6,5 @@ import javax.smartcardio.CardException;
 
 public interface CardImport extends ImportExport {
     boolean isInitialized() throws CardException;
-    void initialize(String pin, byte[] chainCode, StringProperty messageProperty) throws CardException;
+    void initialize(String pin, byte[] entropy, StringProperty messageProperty) throws CardException;
 }

src/main/java/com/sparrowwallet/sparrow/io/ColdcardMultisig.java

@@ -36,6 +36,31 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
     @Override
     public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            inputStream.transferTo(baos);
+            InputStream firstClone = new ByteArrayInputStream(baos.toByteArray());
+            InputStream secondClone = new ByteArrayInputStream(baos.toByteArray());
+
+            Keystore keystore;
+            try {
+                keystore = getKeystoreMultisig(scriptType, firstClone, password);
+            } catch(Exception e) {
+                keystore = getKeystoreSinglesig(scriptType, secondClone, password);
+            }
+
+            return keystore;
+        } catch(IOException e) {
+            throw new ImportException("Error importing keystore for " + scriptType, e);
+        }
+    }
+
+    private Keystore getKeystoreSinglesig(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        ColdcardSinglesig coldcardSinglesig = new ColdcardSinglesig();
+        return coldcardSinglesig.getKeystore(scriptType, inputStream, password);
+    }
+
+    public Keystore getKeystoreMultisig(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
         InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
         ColdcardKeystore cck = JsonPersistence.getGson().fromJson(reader, ColdcardKeystore.class);
 
@@ -165,7 +190,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         if(!wallet.isValid()) {
             throw new ExportException("Cannot export an incomplete wallet");
         }
@@ -224,17 +249,17 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
     @Override
     public boolean isWalletImportScannable() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isKeystoreImportScannable() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isWalletExportScannable() {
-        return false;
+        return true;
     }
 
     @Override

src/main/java/com/sparrowwallet/sparrow/io/ColdcardSinglesig.java

@@ -45,12 +45,12 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
 
     @Override
     public boolean isWalletImportScannable() {
-        return false;
+        return true;
     }
 
     @Override
     public boolean isKeystoreImportScannable() {
-        return false;
+        return true;
     }
 
     @Override
@@ -72,7 +72,7 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
                     ColdcardKeystore ck = gson.fromJson(map.get(key), ColdcardKeystore.class);
 
                     if(ck.name != null) {
-                        ScriptType ckScriptType = ScriptType.valueOf(ck.name.replace("p2wpkh-p2sh", "p2sh_p2wpkh").replace("p2sh-p2wpkh", "p2sh_p2wpkh").toUpperCase(Locale.ROOT));
+                        ScriptType ckScriptType = ScriptType.valueOf(ck.name.replace("p2wpkh-p2sh", "p2sh_p2wpkh").replace("-", "_").toUpperCase(Locale.ROOT));
                         if(ckScriptType.equals(scriptType)) {
                             Keystore keystore = new Keystore();
                             keystore.setLabel(getName());

src/main/java/com/sparrowwallet/sparrow/io/Config.java

@@ -78,6 +78,7 @@ public class Config {
     private int maxPageSize = DEFAULT_PAGE_SIZE;
     private boolean usePayNym;
     private boolean sameAppMixing;
+    private boolean mempoolFullRbf;
     private Double appWidth;
     private Double appHeight;
 
@@ -670,6 +671,15 @@ public class Config {
         flush();
     }
 
+    public boolean isMempoolFullRbf() {
+        return mempoolFullRbf;
+    }
+
+    public void setMempoolFullRbf(boolean mempoolFullRbf) {
+        this.mempoolFullRbf = mempoolFullRbf;
+        flush();
+    }
+
     public Double getAppWidth() {
         return appWidth;
     }

src/main/java/com/sparrowwallet/sparrow/io/Descriptor.java

@@ -23,7 +23,7 @@ public class Descriptor implements WalletImport, WalletExport {
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         try {
             BufferedWriter bufferedWriter = new BufferedWriter(new OutputStreamWriter(outputStream));
             bufferedWriter.write("# Receive and change descriptor (BIP389):");
@@ -65,7 +65,7 @@ public class Descriptor implements WalletImport, WalletExport {
 
     @Override
     public boolean isWalletExportScannable() {
-        return false;
+        return true;
     }
 
     @Override

src/main/java/com/sparrowwallet/sparrow/io/Electrum.java

@@ -2,10 +2,7 @@ package com.sparrowwallet.sparrow.io;
 
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
-import com.sparrowwallet.drongo.ExtendedKey;
-import com.sparrowwallet.drongo.KeyDerivation;
-import com.sparrowwallet.drongo.KeyPurpose;
-import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.*;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.crypto.*;
 import com.sparrowwallet.drongo.policy.Policy;
@@ -18,7 +15,10 @@ import org.slf4j.LoggerFactory;
 import java.io.*;
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.*;
+import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
 
 public class Electrum implements KeystoreFileImport, WalletImport, WalletExport {
@@ -301,11 +301,11 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
 
     @Override
     public String getExportFileExtension(Wallet wallet) {
-        return "json";
+        return wallet.isEncrypted() ? "" : "json";
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         try {
             ElectrumJsonWallet ew = new ElectrumJsonWallet();
             if(wallet.getPolicyType().equals(PolicyType.SINGLE)) {
@@ -342,7 +342,18 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                         ek.seed = keystore.getSeed().getMnemonicString().asString();
                         ek.passphrase = keystore.getSeed().getPassphrase() == null ? null : keystore.getSeed().getPassphrase().asString();
                     }
-                    ew.use_encryption = false;
+                    if(password != null) {
+                        ek.xprv = encrypt(ek.xprv, password);
+                        if(ek.seed != null) {
+                            ek.seed = encrypt(ek.seed, password);
+                        }
+                        if(ek.passphrase != null) {
+                            ek.passphrase = encrypt(ek.passphrase, password);
+                        }
+                        ew.use_encryption = true;
+                    } else {
+                        ew.use_encryption = false;
+                    }
                 } else if(keystore.getSource() == KeystoreSource.SW_WATCH) {
                     ek.type = "bip32";
                     ek.xpub = keystore.getExtendedPublicKey().toString(xpubHeader);
@@ -373,14 +384,41 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
 
             gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
             String json = gson.toJson(eJson);
+            if(password != null) {
+                ECKey encryptionKey = Pbkdf2KeyDeriver.DEFAULT_INSTANCE.deriveECKey(password);
+                outputStream = new DeflaterOutputStream(new ECIESOutputStream(outputStream, encryptionKey));
+            }
+
             outputStream.write(json.getBytes(StandardCharsets.UTF_8));
             outputStream.flush();
+            outputStream.close();
         } catch (Exception e) {
             log.error("Error exporting Electrum Wallet", e);
             throw new ExportException("Error exporting Electrum Wallet", e);
         }
     }
 
+    private String encrypt(String plain, String password) throws NoSuchAlgorithmException {
+        if(plain == null) {
+            return null;
+        }
+
+        byte[] plainBytes = plain.getBytes(StandardCharsets.UTF_8);
+
+        KeyDeriver keyDeriver = new DoubleSha256KeyDeriver();
+        Key key = keyDeriver.deriveKey(password);
+
+        KeyCrypter keyCrypter = new AESKeyCrypter();
+        byte[] initializationVector = new byte[16];
+        SecureRandom.getInstanceStrong().nextBytes(initializationVector);
+        EncryptedData encryptedData = keyCrypter.encrypt(plainBytes, initializationVector, key);
+        byte[] encrypted = new byte[initializationVector.length + encryptedData.getEncryptedBytes().length];
+        System.arraycopy(initializationVector, 0, encrypted, 0, 16);
+        System.arraycopy(encryptedData.getEncryptedBytes(), 0, encrypted, 16, encryptedData.getEncryptedBytes().length);
+        byte[] encryptedBase64 = Base64.getEncoder().encode(encrypted);
+        return new String(encryptedBase64, StandardCharsets.UTF_8);
+    }
+
     @Override
     public boolean isEncrypted(File file) {
         return (FileType.BINARY.equals(IOUtils.getFileType(file)));

src/main/java/com/sparrowwallet/sparrow/io/ElectrumPersonalServer.java

@@ -29,7 +29,7 @@ public class ElectrumPersonalServer implements WalletExport {
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         if(wallet.getScriptType() == ScriptType.P2TR) {
             throw new ExportException(getName() + " does not support Taproot wallets.");
         }

src/main/java/com/sparrowwallet/sparrow/io/Hwi.java

@@ -13,6 +13,9 @@ import com.sparrowwallet.drongo.wallet.WalletModel;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,19 +27,18 @@ import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
 
 public class Hwi {
     private static final Logger log = LoggerFactory.getLogger(Hwi.class);
     private static final String HWI_HOME_DIR = "hwi";
     private static final String HWI_VERSION_PREFIX = "hwi-";
-    private static final String HWI_VERSION = "2.2.1";
+    private static final String HWI_VERSION = "3.0.0";
     private static final String HWI_VERSION_DIR = HWI_VERSION_PREFIX + HWI_VERSION;
 
     private static boolean isPromptActive = false;
@@ -377,9 +379,9 @@ public class Hwi {
                 if(platform == Platform.OSX) {
                     InputStream inputStream;
                     if(osArch.equals("aarch64")) {
-                        inputStream = Hwi.class.getResourceAsStream("/native/osx/aarch64/" + HWI_VERSION_DIR + "-mac-aarch64-signed.zip");
+                        inputStream = Hwi.class.getResourceAsStream("/native/osx/aarch64/" + HWI_VERSION_DIR + "-mac-aarch64-signed.tar.bz2");
                     } else {
-                        inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + HWI_VERSION_DIR + "-mac-amd64-signed.zip");
+                        inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + HWI_VERSION_DIR + "-mac-amd64-signed.tar.bz2");
                     }
 
                     if(inputStream == null) {
@@ -396,26 +398,27 @@ public class Hwi {
                     log.debug("Using HWI path: " + hwiVersionDir.getAbsolutePath());
 
                     File hwiExec = null;
-                    try(ZipInputStream zis = new ZipInputStream(inputStream)) {
-                        ZipEntry zipEntry = zis.getNextEntry();
-                        while(zipEntry != null) {
-                            if(zipEntry.isDirectory()) {
-                                newDirectory(hwiVersionDir, zipEntry, ownerExecutableWritable);
+                    try(TarArchiveInputStream tarInput = new TarArchiveInputStream(new BZip2CompressorInputStream(inputStream))) {
+                        TarArchiveEntry tarEntry = tarInput.getNextEntry();
+                        while(tarEntry != null) {
+                            if(tarEntry.isDirectory()) {
+                                newDirectory(hwiVersionDir, tarEntry, ownerExecutableWritable);
+                            } else if(tarEntry.isSymbolicLink()) {
+                                newSymlink(hwiVersionDir, tarEntry, ownerExecutableWritable);
                             } else {
-                                File newFile = newFile(hwiVersionDir, zipEntry, ownerExecutableWritable);
+                                File newFile = newFile(hwiVersionDir, tarEntry, ownerExecutableWritable);
                                 try(FileOutputStream fos = new FileOutputStream(newFile)) {
-                                    ByteStreams.copy(zis, new FileOutputStream(newFile));
+                                    ByteStreams.copy(tarInput, new FileOutputStream(newFile));
                                     fos.flush();
-                                };
+                                }
 
-                                if(zipEntry.getName().equals("hwi")) {
+                                if(tarEntry.getName().equals("hwi")) {
                                     hwiExec = newFile;
                                 }
                             }
 
-                            zipEntry = zis.getNextEntry();
+                            tarEntry = tarInput.getNextEntry();
                         }
-                        zis.closeEntry();
                     }
 
                     hwiExecutable = hwiExec;
@@ -478,29 +481,43 @@ public class Hwi {
         }
     }
 
-    public static File newDirectory(File destinationDir, ZipEntry zipEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+    public static File newDirectory(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
         String destDirPath = destinationDir.getCanonicalPath();
 
-        Path path = Path.of(destDirPath, zipEntry.getName());
+        Path path = Path.of(destDirPath, tarEntry.getName());
         File destDir = Files.createDirectory(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();
 
         String destSubDirPath = destDir.getCanonicalPath();
         if(!destSubDirPath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
+            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
         }
 
         return destDir;
     }
 
-    public static File newFile(File destinationDir, ZipEntry zipEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+    public static File newFile(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
         String destDirPath = destinationDir.getCanonicalPath();
 
-        Path path = Path.of(destDirPath, zipEntry.getName());
+        Path path = Path.of(destDirPath, tarEntry.getName());
         File destFile = Files.createFile(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();
 
         String destFilePath = destFile.getCanonicalPath();
         if(!destFilePath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
+            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
+        }
+
+        return destFile;
+    }
+
+    public static File newSymlink(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+        String destDirPath = destinationDir.getCanonicalPath();
+
+        Path path = Path.of(destDirPath, tarEntry.getName());
+        File destFile = Files.createSymbolicLink(path, Paths.get(tarEntry.getLinkName())).toFile();
+
+        String destFilePath = destFile.getCanonicalPath();
+        if(!destFilePath.startsWith(destDirPath + File.separator)) {
+            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
         }
 
         return destFile;
@@ -836,7 +853,7 @@ public class Hwi {
         public WalletModel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
             String modelStr = json.getAsJsonPrimitive().getAsString();
             try {
-                return WalletModel.valueOf(modelStr.toUpperCase(Locale.ROOT));
+                return WalletModel.valueOf(modelStr.toUpperCase(Locale.ROOT).replace(' ', '_'));
             } catch(Exception e) {
                 for(WalletModel model : WalletModel.values()) {
                     if(modelStr.startsWith(model.getType())) {

src/main/java/com/sparrowwallet/sparrow/io/JadeMultisig.java

@@ -1,8 +1,11 @@
 package com.sparrowwallet.sparrow.io;
 
+import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
 
+import java.io.InputStream;
+
 public class JadeMultisig extends ColdcardMultisig {
     @Override
     public String getName() {
@@ -38,4 +41,30 @@ public class JadeMultisig extends ColdcardMultisig {
     public boolean walletExportRequiresDecryption() {
         return false;
     }
+
+    @Override
+    public String getWalletImportDescription() {
+        return "Import the QR created using Options > Wallet > Registered Wallets on your Jade.";
+    }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isWalletImportFileFormatAvailable() {
+        return false;
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        Wallet wallet = super.importWallet(inputStream, password);
+        for(Keystore keystore : wallet.getKeystores()) {
+            keystore.setLabel(keystore.getLabel().replace("Coldcard", "Jade"));
+            keystore.setWalletModel(WalletModel.JADE);
+        }
+
+        return wallet;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/io/Krux.java

@@ -0,0 +1,20 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+public class Krux extends SpecterDIY {
+    @Override
+    public String getName() {
+        return "Krux";
+    }
+
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import file or QR created on your Krux by selecting Extended Public Key from the main menu once you have loaded your mnemonic.";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.KRUX;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/io/PdfUtils.java

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.io;
 
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
 import com.google.zxing.client.j2se.MatrixToImageConfig;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
@@ -104,7 +105,7 @@ public class PdfUtils {
 
     private static javafx.scene.image.Image getQrCode(String fragment) throws IOException, WriterException {
         QRCodeWriter qrCodeWriter = new QRCodeWriter();
-        BitMatrix qrMatrix = qrCodeWriter.encode(fragment.toUpperCase(Locale.ROOT), BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT);
+        BitMatrix qrMatrix = qrCodeWriter.encode(fragment.toUpperCase(Locale.ROOT), BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT, Map.of(EncodeHintType.MARGIN, "2"));
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         MatrixToImageWriter.writeToStream(qrMatrix, "PNG", baos, new MatrixToImageConfig());

src/main/java/com/sparrowwallet/sparrow/io/Samourai.java

@@ -0,0 +1,97 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.google.common.io.CharStreams;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
+import com.samourai.wallet.crypto.AESUtil;
+import com.samourai.wallet.util.CharSequenceX;
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.*;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+@SuppressWarnings("deprecation")
+public class Samourai implements KeystoreFileImport {
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import the wallet backup file samourai.txt exported from the Samourai app. Note that see the full balance, several script types may need to imported in separate wallets.";
+    }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        try {
+            String input = CharStreams.toString(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+
+            Gson gson = new Gson();
+            Type stringStringMap = new TypeToken<Map<String, JsonElement>>() {
+            }.getType();
+            Map<String, JsonElement> map = gson.fromJson(input, stringStringMap);
+
+            String payload = input;
+            if(map.containsKey("payload")) {
+                payload = map.get("payload").getAsString();
+            }
+
+            int version = 1;
+            if(map.containsKey("version")) {
+                version = map.get("version").getAsInt();
+            }
+
+            String decrypted;
+            if(version == 1) {
+                decrypted = AESUtil.decrypt(payload, new CharSequenceX(password), AESUtil.DefaultPBKDF2Iterations);
+            } else if(version == 2) {
+                decrypted = AESUtil.decryptSHA256(payload, new CharSequenceX(password));
+            } else {
+                throw new ImportException("Unsupported backup version: " + version);
+            }
+
+            SamouraiBackup backup = gson.fromJson(decrypted, SamouraiBackup.class);
+            DeterministicSeed seed = new DeterministicSeed(Utils.hexToBytes(backup.wallet.seed), password, 0);
+            Keystore keystore = Keystore.fromSeed(seed, scriptType.getDefaultDerivation());
+            keystore.setLabel(getWalletModel().toDisplayString());
+            return keystore;
+        } catch(ImportException e) {
+            throw e;
+        } catch(Exception e) {
+            throw new ImportException("Error importing backup", e);
+        }
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return false;
+    }
+
+    @Override
+    public boolean isEncrypted(File file) {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "Samourai Backup";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SAMOURAI;
+    }
+
+    private static class SamouraiBackup {
+        public SamouraiWallet wallet;
+    }
+
+    private static class SamouraiWallet {
+        public boolean testnet;
+        public String seed;
+        public String fingerprint;
+    }
+}

src/main/java/com/sparrowwallet/sparrow/io/Sparrow.java

@@ -28,7 +28,7 @@ public class Sparrow implements WalletImport, WalletExport {
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         try {
             Wallet exportedWallet = !wallet.isMasterWallet() ? wallet.getMasterWallet() : wallet;
             PersistenceType persistenceType = PersistenceType.DB;

src/main/java/com/sparrowwallet/sparrow/io/SpecterDIY.java

@@ -65,7 +65,7 @@ public class SpecterDIY implements KeystoreFileImport, WalletExport {
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         try {
             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
             writer.append("addwallet ").append(wallet.getFullName()).append("&").append(OutputDescriptor.getOutputDescriptor(wallet).toString().replace('\'', 'h')).append("\n");

src/main/java/com/sparrowwallet/sparrow/io/SpecterDesktop.java

@@ -18,7 +18,7 @@ public class SpecterDesktop implements WalletImport, WalletExport {
     private static final Logger log = LoggerFactory.getLogger(SpecterDesktop.class);
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         try {
             SpecterWallet specterWallet = new SpecterWallet();
             specterWallet.label = wallet.getFullName();
@@ -108,7 +108,7 @@ public class SpecterDesktop implements WalletImport, WalletExport {
                         WalletModel walletModel = device.getWalletModel();
                         if(walletModel != null) {
                             keystore.setWalletModel(walletModel);
-                            if(walletModel == WalletModel.TREZOR_1 || walletModel == WalletModel.TREZOR_T || walletModel == WalletModel.KEEPKEY ||
+                            if(walletModel == WalletModel.TREZOR_1 || walletModel == WalletModel.TREZOR_T || walletModel == WalletModel.TREZOR_SAFE_3 || walletModel == WalletModel.KEEPKEY ||
                                 walletModel == WalletModel.LEDGER_NANO_S || walletModel == WalletModel.LEDGER_NANO_X || walletModel == WalletModel.LEDGER_NANO_S_PLUS ||
                                 walletModel == WalletModel.BITBOX_02 || walletModel == WalletModel.COLDCARD) {
                                 keystore.setSource(KeystoreSource.HW_USB);

src/main/java/com/sparrowwallet/sparrow/io/Storage.java

@@ -8,7 +8,6 @@ import com.sparrowwallet.drongo.wallet.StandardAccount;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.SparrowWallet;
-import com.sparrowwallet.sparrow.control.WalletPasswordDialog;
 import com.sparrowwallet.sparrow.soroban.Soroban;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import javafx.concurrent.ScheduledService;
@@ -536,7 +535,7 @@ public class Storage {
         return certsDir;
     }
 
-    static File getSparrowDir() {
+    public static File getSparrowDir() {
         File sparrowDir;
         if(Network.get() != Network.MAINNET) {
             sparrowDir = new File(getSparrowHome(), Network.get().getName());
@@ -552,7 +551,11 @@ public class Storage {
     }
 
     public static File getSparrowHome() {
-        if(System.getProperty(SparrowWallet.APP_HOME_PROPERTY) != null) {
+        return getSparrowHome(false);
+    }
+
+    public static File getSparrowHome(boolean useDefault) {
+        if(!useDefault && System.getProperty(SparrowWallet.APP_HOME_PROPERTY) != null) {
             return new File(System.getProperty(SparrowWallet.APP_HOME_PROPERTY));
         }
 
@@ -753,7 +756,7 @@ public class Storage {
                 protected Void call() throws IOException, ExportException {
                     Sparrow export = new Sparrow();
                     try(BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(newWalletFile))) {
-                        export.exportWallet(wallet, outputStream);
+                        export.exportWallet(wallet, outputStream, null);
                     }
 
                     return null;

src/main/java/com/sparrowwallet/sparrow/io/WalletExport.java

@@ -5,7 +5,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import java.io.OutputStream;
 
 public interface WalletExport extends ImportExport {
-    void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException;
+    void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException;
     String getWalletExportDescription();
     String getExportFileExtension(Wallet wallet);
     boolean isWalletExportScannable();

src/main/java/com/sparrowwallet/sparrow/io/WalletImport.java

@@ -8,4 +8,7 @@ public interface WalletImport extends FileImport {
     String getWalletImportDescription();
     Wallet importWallet(InputStream inputStream, String password) throws ImportException;
     boolean isWalletImportScannable();
+    default boolean isWalletImportFileFormatAvailable() {
+        return true;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/io/WalletLabels.java

@@ -1,8 +1,10 @@
 package com.sparrowwallet.sparrow.io;
 
+import com.csvreader.CsvReader;
 import com.google.gson.Gson;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
@@ -37,7 +39,7 @@ public class WalletLabels implements WalletImport, WalletExport {
 
     @Override
     public String getName() {
-        return "Wallet Labels";
+        return "Labels";
     }
 
     @Override
@@ -46,7 +48,7 @@ public class WalletLabels implements WalletImport, WalletExport {
     }
 
     @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
         List<Label> labels = new ArrayList<>();
         List<Wallet> allWallets = wallet.isMasterWallet() ? wallet.getAllWallets() : wallet.getMasterWallet().getAllWallets();
         for(Wallet exportWallet : allWallets) {
@@ -122,7 +124,7 @@ public class WalletLabels implements WalletImport, WalletExport {
 
     @Override
     public String getWalletImportDescription() {
-        return "Imports a file containing labels in the BIP329 standard format to the currently selected wallet.";
+        return "Imports a file containing labels in the BIP329 standard (or Electrum history CSV) format to the currently selected wallet.";
     }
 
     @Override
@@ -141,7 +143,17 @@ public class WalletLabels implements WalletImport, WalletExport {
                 try {
                     label = gson.fromJson(line, Label.class);
                 } catch(Exception e) {
-                    continue;
+                    //Try parse Electrum history CSV, or any CSV with txid,label entries
+                    try {
+                        CsvReader csvReader = new CsvReader(new StringReader(line));
+                        if(csvReader.readRecord() && csvReader.getColumnCount() > 1 && csvReader.get(0).length() == 64 && Utils.isHex(csvReader.get(0))) {
+                            label = new Label(Type.tx, csvReader.get(0), csvReader.get(1), null, null);
+                        } else {
+                            continue;
+                        }
+                    } catch(Exception ex) {
+                        continue;
+                    }
                 }
 
                 if(label == null || label.type == null || label.ref == null) {