improve samourai backup import error message

bump to v1.9.0
remove whirlpool and soroban features and dependencies
2026-07-31 03:56:16 +00:00 · 2024-04-25 15:21:13 +02:00 · 2024-04-25 15:13:10 +02:00 · 2024-04-25 15:11:22 +02:00 · 2024-04-24 11:27:58 +02:00 · 2024-04-24 09:00:36 +02:00
280 changed files with 6921 additions and 9478 deletions
@@ -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: |
@@ -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.8.0'
+def sparrowVersion = '1.9.0'
 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,26 @@ 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.37')
+    implementation('com.sparrowwallet.bokmakierie:bokmakierie:1.0')
+    implementation('org.eclipse.jetty:jetty-client:9.4.54.v20240208')
    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 +159,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 +212,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 +240,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 +267,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 +290,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 +422,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 +442,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 +501,21 @@ extraJavaModuleInfo {
        exports('co.nstant.in.cbor.model')
        exports('co.nstant.in.cbor.builder')
    }
-    module('nightjar-0.2.37.jar', 'com.sparrowwallet.nightjar', '0.2.37') {
-        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 +523,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 +658,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')
 }
@@ -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 {
@@ -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.9"
+GIT_TAG="1.8.6"
 ```

 The project can then be initially cloned as follows:
@@ -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
@@ -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" \
@@ -0,0 +1,3 @@
+mime-type=application/pgp-signature
+extension=asc
+description=ASCII Armored File
@@ -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
@@ -21,7 +21,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
-  <string>1.8.0</string>
+  <string>1.9.0</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>
@@ -21,14 +21,13 @@ 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;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
-import com.sparrowwallet.sparrow.soroban.CounterpartyDialog;
 import com.sparrowwallet.sparrow.paynym.PayNymDialog;
-import com.sparrowwallet.sparrow.soroban.Soroban;
-import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
@@ -77,6 +76,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 +107,9 @@ public class AppController implements Initializable {
    @FXML
    private MenuItem exportWallet;

+    @FXML
+    private MenuItem renameWallet;
+
    @FXML
    private MenuItem deleteWallet;

@@ -181,9 +184,6 @@ public class AppController implements Initializable {
    @FXML
    private MenuItem sweepPrivateKey;

-    @FXML
-    private MenuItem findMixingPartner;
-
    @FXML
    private MenuItem showPayNym;

@@ -195,7 +195,7 @@ public class AppController implements Initializable {
    private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();

    @FXML
-    private MenuItem restart;
+    private Menu restart;

    @FXML
    private StackPane rootStack;
@@ -209,12 +209,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;
@@ -272,9 +278,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();
        });
@@ -283,9 +298,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);
@@ -327,6 +340,8 @@ public class AppController implements Initializable {
            EventManager.get().post(new OpenWalletsEvent(tabs.getScene().getWindow(), Collections.emptyList()));
        });

+        tabs.setPickOnBounds(false);
+
        registerShortcuts();

        BitcoinUnit unit = Config.get().getBitcoinUnit();
@@ -372,7 +387,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);
@@ -382,6 +407,7 @@ 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);
@@ -391,10 +417,6 @@ public class AppController implements Initializable {
        sendToMany.disableProperty().bind(exportWallet.disableProperty());
        sweepPrivateKey.disableProperty().bind(Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not()));
        showPayNym.setDisable(true);
-        findMixingPartner.setDisable(true);
-        AppServices.onlineProperty().addListener((observable, oldValue, newValue) -> {
-            findMixingPartner.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
-        });

        configureSwitchServer();
        setServerType(Config.get().getServerType());
@@ -622,7 +644,7 @@ 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.");
            }
        }
    }
@@ -738,8 +760,10 @@ 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) {
@@ -837,8 +861,10 @@ 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();
        }
@@ -953,19 +979,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));
@@ -978,11 +1031,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);
+            }
        }
    }

@@ -1253,7 +1314,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();
@@ -1284,11 +1345,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();
@@ -1299,7 +1362,7 @@ 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()) {
@@ -1361,7 +1424,6 @@ public class AppController implements Initializable {
            }

            sendToManyDialog = new SendToManyDialog(bitcoinUnit);
-            sendToManyDialog.initOwner(rootStack.getScene().getWindow());
            sendToManyDialog.initModality(Modality.NONE);
            Optional<List<Payment>> optPayments = sendToManyDialog.showAndWait();
            sendToManyDialog = null;
@@ -1387,74 +1449,6 @@ public class AppController implements Initializable {
        optTransaction.ifPresent(transaction -> addTransactionTab(null, null, transaction));
    }

-    public void findMixingPartner(ActionEvent event) {
-        WalletForm selectedWalletForm = getSelectedWalletForm();
-        if(selectedWalletForm != null) {
-            Wallet wallet = selectedWalletForm.getWallet();
-            Soroban soroban = AppServices.getSorobanServices().getSoroban(selectedWalletForm.getWalletId());
-            if(soroban.getHdWallet() == null) {
-                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.setOnSucceeded(workerStateEvent -> {
-                            EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Done"));
-                            ECKey encryptionFullKey = keyDerivationService.getValue();
-                            Key key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
-                            copy.decrypt(key);
-
-                            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);
-                                }
-                                counterpartyDialog.showAndWait();
-                            } finally {
-                                key.clear();
-                                encryptionFullKey.clear();
-                                password.get().clear();
-                            }
-                        });
-                        keyDerivationService.setOnFailed(workerStateEvent -> {
-                            EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.END, "Failed"));
-                            if(keyDerivationService.getException() instanceof InvalidPasswordException) {
-                                Optional<ButtonType> optResponse = showErrorDialog("Invalid Password", "The wallet password was invalid. Try again?", ButtonType.CANCEL, ButtonType.OK);
-                                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                                    Platform.runLater(() -> findMixingPartner(null));
-                                }
-                            } else {
-                                log.error("Error deriving wallet key", keyDerivationService.getException());
-                            }
-                        });
-                        EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
-                        keyDerivationService.start();
-                    }
-                } 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);
-                    }
-                    counterpartyDialog.showAndWait();
-                }
-            } else {
-                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
-                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
-                if(Config.get().isSameAppMixing()) {
-                    counterpartyDialog.initModality(Modality.NONE);
-                }
-                counterpartyDialog.showAndWait();
-            }
-        }
-    }
-
    public void showPayNym(ActionEvent event) {
        WalletForm selectedWalletForm = getSelectedWalletForm();
        if(selectedWalletForm != null) {
@@ -1464,6 +1458,23 @@ public class AppController implements Initializable {
        }
    }

+    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());
    }
@@ -1530,13 +1541,46 @@ public class AppController implements Initializable {
    }

    private void searchWallets(List<WalletForm> walletForms) {
-        SearchWalletDialog searchWalletDialog = new SearchWalletDialog(walletForms);
-        searchWalletDialog.initOwner(rootStack.getScene().getWindow());
-        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)));
+        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();
        }
    }

@@ -1548,7 +1592,7 @@ 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()) {
-                    WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(walletForms);
+                    WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(List.of(walletForms));
                    walletSummaryDialog.initOwner(rootStack.getScene().getWindow());
                    walletSummaryDialog.showAndWait();
                }
@@ -1604,14 +1648,6 @@ public class AppController implements Initializable {
            tabLabel.setGraphicTextGap(5.0);
            tab.setGraphic(tabLabel);
            tab.setClosable(true);
-            tab.setOnCloseRequest(event -> {
-                if(AppServices.getWhirlpoolServices().getWhirlpoolForMixToWallet(((WalletTabData)tab.getUserData()).getWalletForm().getWalletId()) != null) {
-                    Optional<ButtonType> optType = AppServices.showWarningDialog("Close mix to wallet?", "This wallet has been configured as the final destination for mixes, and needs to be open for this to occur.\n\nAre you sure you want to close?", ButtonType.NO, ButtonType.YES);
-                    if(optType.isPresent() && optType.get() == ButtonType.NO) {
-                        event.consume();
-                    }
-                }
-            });

            TabPane subTabs = new TabPane();
            subTabs.setSide(Side.LEFT);
@@ -2105,7 +2141,7 @@ public class AppController implements Initializable {
                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();
@@ -2115,7 +2151,7 @@ public class AppController implements Initializable {
                            deleteStorage(storage, true);
                        } finally {
                            encryptionFullKey.clear();
-                            password.get().clear();
+                            keyDerivationService = null;
                        }
                    });
                    keyDerivationService.setOnFailed(workerStateEvent -> {
@@ -2128,6 +2164,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();
@@ -2430,7 +2467,6 @@ public class AppController implements Initializable {
                showLoadingLog.setDisable(true);
                showTxHex.setDisable(false);
                showPayNym.setDisable(true);
-                findMixingPartner.setDisable(true);
            } else if(event instanceof WalletTabSelectedEvent) {
                WalletTabSelectedEvent walletTabEvent = (WalletTabSelectedEvent)event;
                WalletTabData walletTabData = walletTabEvent.getWalletTabData();
@@ -2442,7 +2478,6 @@ public class AppController implements Initializable {
                showLoadingLog.setDisable(false);
                showTxHex.setDisable(true);
                showPayNym.setDisable(exportWallet.isDisable() || !walletTabData.getWallet().hasPaymentCode());
-                findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(walletTabData.getWallet()) || !AppServices.onlineProperty().get());
            }
        }
    }
@@ -2468,7 +2503,6 @@ public class AppController implements Initializable {
            if(selectedWalletForm.getWalletId().equals(event.getWalletId())) {
                exportWallet.setDisable(!event.getWallet().isValid() || selectedWalletForm.isLocked());
                showPayNym.setDisable(exportWallet.isDisable() || !event.getWallet().hasPaymentCode());
-                findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(event.getWallet()) || !AppServices.onlineProperty().get());
            }
        }

@@ -2710,7 +2744,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);
@@ -3025,6 +3059,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());
@@ -24,9 +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;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -34,6 +31,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 +59,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 +67,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,23 +79,23 @@ 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;

-    private final WhirlpoolServices whirlpoolServices = new WhirlpoolServices();
+    private final InteractionServices interactionServices;

-    private final SorobanServices sorobanServices = new SorobanServices();
-
-    private InteractionServices interactionServices;
-
-    private static PayNymService payNymService;
+    private static HttpClientService httpClientService;

    private final Application application;

@@ -112,6 +111,8 @@ public class AppServices {

    private ElectrumServer.ConnectionService connectionService;

+    private ElectrumServer.FeeRatesService feeRatesService;
+
    private Hwi.ScheduledEnumerateService deviceEnumerateService;

    private VersionCheckService versionCheckService;
@@ -160,6 +161,11 @@ public class AppServices {
                connectionService.cancel();
                ratesService.cancel();
                versionCheckService.cancel();
+
+                if(httpClientService != null) {
+                    HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
+                    shutdownService.start();
+                }
            }
        }
    };
@@ -176,13 +182,12 @@ public class AppServices {
        this.application = application;
        this.interactionServices = interactionServices;
        EventManager.get().register(this);
-        EventManager.get().register(whirlpoolServices);
-        EventManager.get().register(sorobanServices);
    }

    public void start() {
        Config config = Config.get();
        connectionService = createConnectionService();
+        feeRatesService = createFeeRatesService();
        ratesService = createRatesService(config.getExchangeSource(), config.getFiatCurrency());
        versionCheckService = createVersionCheckService();
        torService = createTorService();
@@ -196,6 +201,8 @@ public class AppServices {
            } else {
                restartServices();
            }
+        } else {
+            EventManager.get().post(new DisconnectionEvent());
        }

        addURIHandlers();
@@ -247,8 +254,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 +286,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 +365,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 +494,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);
@@ -501,30 +526,21 @@ public class AppServices {
        return INSTANCE;
    }

-    public static WhirlpoolServices getWhirlpoolServices() {
-        return get().whirlpoolServices;
-    }
-
-    public static SorobanServices getSorobanServices() {
-        return get().sorobanServices;
-    }
-
    public static InteractionServices getInteractionServices() {
        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() {
@@ -662,15 +678,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;
    }
@@ -776,7 +796,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) {
@@ -849,6 +869,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();
@@ -868,6 +907,7 @@ public class AppServices {
            }

            if(openWindow instanceof Stage) {
+                ((Stage)openWindow).setIconified(false);
                ((Stage)openWindow).setAlwaysOnTop(true);
                ((Stage)openWindow).setAlwaysOnTop(false);
            }
@@ -875,6 +915,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));
                }
@@ -1037,6 +1079,37 @@ public class AppServices {
        return wallet;
    }

+    public static final List<Network> WHIRLPOOL_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
+
+    public static boolean isWhirlpoolCompatible(Wallet wallet) {
+        return WHIRLPOOL_NETWORKS.contains(Network.get())
+                && wallet.getScriptType() != ScriptType.P2TR    //Taproot not yet supported
+                && wallet.getKeystores().size() == 1
+                && wallet.getKeystores().get(0).hasSeed()
+                && wallet.getKeystores().get(0).getSeed().getType() == DeterministicSeed.Type.BIP39
+                && wallet.getStandardAccountType() != null
+                && StandardAccount.isMixableAccount(wallet.getStandardAccountType());
+    }
+
+    public static boolean isWhirlpoolPostmixCompatible(Wallet wallet) {
+        return WHIRLPOOL_NETWORKS.contains(Network.get())
+                && wallet.getScriptType() != ScriptType.P2TR    //Taproot not yet supported
+                && wallet.getKeystores().size() == 1;
+    }
+
+    public static List<Wallet> addWhirlpoolWallets(Wallet decryptedWallet, String walletId, Storage storage) {
+        List<Wallet> childWallets = new ArrayList<>();
+        for(StandardAccount whirlpoolAccount : StandardAccount.WHIRLPOOL_ACCOUNTS) {
+            if(decryptedWallet.getChildWallet(whirlpoolAccount) == null) {
+                Wallet childWallet = decryptedWallet.addChildWallet(whirlpoolAccount);
+                childWallets.add(childWallet);
+                EventManager.get().post(new ChildWalletsAddedEvent(storage, decryptedWallet, childWallet));
+            }
+        }
+
+        return childWallets;
+    }
+
    public static Font getMonospaceFont() {
        return Font.font("Roboto Mono", 13);
    }
@@ -1071,17 +1144,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
@@ -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;
+    }
 }
@@ -80,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());
@@ -107,7 +108,7 @@ public class SparrowDesktop extends Application {
            }
        }

-        AppServices.openFileUriArguments(stage);
+        AppServices.openFileUriArgumentsAfterWalletLoading(stage);

        AppServices.get().start();
    }
@@ -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.8.0";
+    public static final String APP_VERSION = "1.9.0";
    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);
            }
@@ -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());
    }
@@ -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());
@@ -5,21 +5,19 @@ import com.sparrowwallet.drongo.wallet.StandardAccount;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.net.ServerType;
-import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.collections.FXCollections;
 import javafx.scene.control.*;
 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;

@@ -44,31 +42,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()) && !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()) {
+        if(AppServices.isWhirlpoolCompatible(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
            availableAccounts.add(WHIRLPOOL_PREMIX);
-        } else if(WhirlpoolServices.canWatchPostmix(masterWallet) && !existingIndexes.contains(WHIRLPOOL_POSTMIX.getAccountNumber())) {
+        } else if(AppServices.isWhirlpoolPostmixCompatible(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);
@@ -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";
            }
@@ -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);
@@ -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) {
@@ -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());
@@ -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 { }
+}
@@ -352,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);
@@ -583,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 -> {
@@ -602,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());
@@ -610,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 -> {
@@ -624,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 -> {
@@ -632,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 -> {
@@ -640,8 +650,7 @@ 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);
        }
    }

@@ -13,6 +13,8 @@ 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);
@@ -20,11 +22,16 @@ public class FeeRangeSlider extends Slider {
        setSnapToTicks(false);
        setShowTickLabels(true);
        setShowTickMarks(true);
+        setBlockIncrement(Math.log(1.02) / Math.log(2));

-        setLabelFormatter(new StringConverter<Double>() {
+        setLabelFormatter(new StringConverter<>() {
            @Override
            public String toString(Double object) {
-                return Long.toString(FEE_RATES_RANGE.get(object.intValue()));
+                Long feeRate = LONG_FEE_RATES_RANGE.get(object.intValue());
+                if(isLongFeeRange() && feeRate >= 1000) {
+                    return feeRate / 1000 + "k";
+                }
+                return Long.toString(feeRate);
            }

            @Override
@@ -34,6 +41,24 @@ public class FeeRangeSlider extends Slider {
        });

        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() {
@@ -41,7 +66,23 @@ public class FeeRangeSlider extends Slider {
    }

    public void setFeeRate(double feeRate) {
-        setValue(Math.log(feeRate) / Math.log(2));
+        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() {
@@ -75,7 +116,7 @@ public class FeeRangeSlider extends Slider {
    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 -> FALLBACK_FEE_RATE,
+            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));
        }
@@ -97,6 +138,9 @@ public class FeeRangeSlider extends Slider {

    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);
    }
 }
@@ -240,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;
    }
 }
@@ -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;
@@ -153,7 +155,9 @@ 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));
                }
@@ -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));
        }
@@ -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;
@@ -115,16 +125,12 @@ public class FileWalletExportPane extends TitledDescriptionPane {
            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"));
@@ -134,25 +140,42 @@ 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));
                }
@@ -165,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;
+                }
+            };
        }
    }
 }
@@ -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;
    }
 }
@@ -472,7 +472,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(qrText, true);
        qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
        Optional<ButtonType> optButtonType = qrDisplayDialog.showAndWait();
-        if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.NEXT_FORWARD) {
+        if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
            scanQr();
        }
    }
@@ -1,27 +1,11 @@
 package com.sparrowwallet.sparrow.control;

-import com.samourai.whirlpool.client.mix.listener.MixFailReason;
-import com.samourai.whirlpool.client.mix.listener.MixStep;
-import com.samourai.whirlpool.client.wallet.beans.MixProgress;
-import com.samourai.whirlpool.protocol.beans.Utxo;
-import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
-import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
-import com.sparrowwallet.sparrow.whirlpool.WhirlpoolException;
-import javafx.animation.Timeline;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
-import javafx.util.Duration;
-import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
-
-import java.util.Locale;

 public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
-    private static final int ERROR_DISPLAY_MILLIS = 5 * 60 * 1000;
-
    public MixStatusCell() {
        super();
        setAlignment(Pos.CENTER_RIGHT);
@@ -41,174 +25,9 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
            setGraphic(null);
        } else {
            setText(Integer.toString(mixStatus.getMixesDone()));
-            if(mixStatus.getNextMixUtxo() == null) {
-                setContextMenu(new MixStatusContextMenu(mixStatus.getUtxoEntry(), mixStatus.getMixProgress() != null && mixStatus.getMixProgress().getMixStep() != MixStep.FAIL));
-            } else {
-                setContextMenu(null);
-            }
-
-            if(mixStatus.getNextMixUtxo() != null) {
-                setMixSuccess(mixStatus.getNextMixUtxo());
-            } else if(mixStatus.getMixFailReason() != null) {
-                setMixFail(mixStatus.getMixFailReason(), mixStatus.getMixError(), mixStatus.getMixErrorTimestamp());
-            } else if(mixStatus.getMixProgress() != null) {
-                setMixProgress(mixStatus.getUtxoEntry(), mixStatus.getMixProgress());
-            } else {
-                setGraphic(null);
-                setTooltip(null);
-            }
-        }
-    }
-
-    private void setMixSuccess(Utxo nextMixUtxo) {
-        ProgressIndicator progressIndicator = getProgressIndicator();
-        progressIndicator.setProgress(-1);
-        setGraphic(progressIndicator);
-        Tooltip tt = new Tooltip();
-        tt.setText("Waiting for broadcast of " + nextMixUtxo.getHash().substring(0, 8) + "..." + ":" + nextMixUtxo.getIndex() );
-        setTooltip(tt);
-    }
-
-    private void setMixFail(MixFailReason mixFailReason, String mixError, Long mixErrorTimestamp) {
-        if(mixFailReason != MixFailReason.CANCEL) {
-            long elapsed = mixErrorTimestamp == null ? 0L : System.currentTimeMillis() - mixErrorTimestamp;
-            if(elapsed >= ERROR_DISPLAY_MILLIS) {
-                //Old error, don't set again.
-                return;
-            }
-
-            Glyph failGlyph = getFailGlyph();
-            setGraphic(failGlyph);
-            Tooltip tt = new Tooltip();
-            tt.setText(mixFailReason.getMessage() + (mixError == null ? "" : ": " + mixError) +
-                    "\nMix failures are generally caused by peers disconnecting during a mix." +
-                    "\nMake sure your internet connection is stable and the computer is configured to prevent sleeping." +
-                    "\nTo prevent sleeping, use the " + getPlatformSleepConfig() + " or enable the function in the Tools menu.");
-            setTooltip(tt);
-
-            Duration fadeDuration = Duration.millis(ERROR_DISPLAY_MILLIS - elapsed);
-            double fadeFromValue = 1.0 - ((double)elapsed / ERROR_DISPLAY_MILLIS);
-            Timeline timeline = AnimationUtil.getSlowFadeOut(failGlyph, fadeDuration, fadeFromValue, 10);
-            timeline.setOnFinished(event -> {
-                setTooltip(null);
-            });
-            timeline.play();
-        } else {
+            setContextMenu(null);
            setGraphic(null);
            setTooltip(null);
        }
    }
-
-    private String getPlatformSleepConfig() {
-        Platform platform = Platform.getCurrent();
-        if(platform == Platform.OSX) {
-            return "OSX System Preferences";
-        } else if(platform == Platform.WINDOWS) {
-            return "Windows Control Panel";
-        }
-
-        return "system power settings";
-    }
-
-    private void setMixProgress(UtxoEntry utxoEntry, MixProgress mixProgress) {
-        if(mixProgress.getMixStep() != MixStep.FAIL) {
-            ProgressIndicator progressIndicator = getProgressIndicator();
-            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);
-            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);
-        }
-    }
-
-    private ProgressIndicator getProgressIndicator() {
-        ProgressIndicator progressIndicator;
-        if(getGraphic() instanceof ProgressIndicator) {
-            progressIndicator = (ProgressIndicator)getGraphic();
-        } else {
-            progressIndicator = new ProgressBar();
-        }
-
-        return progressIndicator;
-    }
-
-    private static Glyph getMixGlyph() {
-        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        copyGlyph.setFontSize(12);
-        return copyGlyph;
-    }
-
-    private static Glyph getStopGlyph() {
-        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.STOP_CIRCLE);
-        copyGlyph.setFontSize(12);
-        return copyGlyph;
-    }
-
-    public static Glyph getFailGlyph() {
-        Glyph failGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        failGlyph.getStyleClass().add("fail-warning");
-        failGlyph.setFontSize(12);
-        return failGlyph;
-    }
-
-    private static class MixStatusContextMenu extends ContextMenu {
-        public MixStatusContextMenu(UtxoEntry utxoEntry, boolean isMixing) {
-            Whirlpool pool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-            if(isMixing) {
-                MenuItem mixStop = new MenuItem("Stop Mixing");
-                if(pool != null) {
-                    mixStop.disableProperty().bind(pool.mixingProperty().not());
-                }
-                mixStop.setGraphic(getStopGlyph());
-                mixStop.setOnAction(event -> {
-                    hide();
-                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-                    if(whirlpool != null) {
-                        try {
-                            whirlpool.mixStop(utxoEntry.getHashIndex());
-                        } catch(WhirlpoolException e) {
-                            AppServices.showErrorDialog("Error stopping mixing UTXO", e.getMessage());
-                        }
-                    }
-                });
-                getItems().add(mixStop);
-            } else {
-                MenuItem mixNow = new MenuItem("Mix Now");
-                if(pool != null) {
-                    mixNow.disableProperty().bind(pool.mixingProperty().not());
-                }
-
-                mixNow.setGraphic(getMixGlyph());
-                mixNow.setOnAction(event -> {
-                    hide();
-                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
-                    if(whirlpool != null) {
-                        try {
-                            whirlpool.mix(utxoEntry.getHashIndex());
-                        } catch(WhirlpoolException e) {
-                            AppServices.showErrorDialog("Error mixing UTXO", e.getMessage());
-                        }
-                    }
-                });
-                getItems().add(mixNow);
-            }
-        }
-    }
 }
@@ -139,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);
    }
@@ -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()));
        }
    }

@@ -79,10 +79,6 @@ public class PayNymAvatar extends StackPane {
        this.paymentCodeProperty.set(paymentCode);
    }

-    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
-        setPaymentCode(PaymentCode.fromString(paymentCode.toString()));
-    }
-
    public void clearPaymentCode() {
        this.paymentCodeProperty.set(null);
    }
@@ -81,10 +81,7 @@ public class PayNymCell extends ListCell<PayNym> {
                        linkButton.setDisable(true);
                        payNymController.linkPayNym(payNym);
                    });
-
-                    if(payNymController.isSelectLinkedOnly()) {
-                        getStyleClass().add("unlinked");
-                    }
+                    getStyleClass().add("unlinked");
                }
            }

@@ -10,11 +10,6 @@ public class PaymentCodeTextField extends CopyableTextField {
        setPaymentCodeString();
    }

-    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
-        this.paymentCodeStr = paymentCode.toString();
-        setPaymentCodeString();
-    }
-
    private void setPaymentCodeString() {
        String abbrevPcode = paymentCodeStr.substring(0, 12) + "..." + paymentCodeStr.substring(paymentCodeStr.length() - 5);
        setText(abbrevPcode);
@@ -190,6 +190,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {

            boolean isValidKey = isValidKey();
            createButton.setDisable(!isValidKey || !isValidToAddress());
+            setScriptTypes(isValidKey);
            if(isValidKey) {
                setFromAddress();
            }
@@ -289,6 +290,16 @@ 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());
@@ -1,22 +1,28 @@
 package com.sparrowwallet.sparrow.control;

 public enum QRDensity {
-    NORMAL("Normal", 400),
-    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;
    }
 }
@@ -14,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;
@@ -39,15 +42,21 @@ public class QRDisplayDialog extends Dialog<ButtonType> {

    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 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;

@@ -62,17 +71,26 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
    private static boolean initialDensityChange;

    public QRDisplayDialog(String type, byte[] data, boolean addLegacyEncodingOption) throws UR.URException {
-        this(UR.fromBytes(type, data), addLegacyEncodingOption, false);
+        this(UR.fromBytes(type, data), null, addLegacyEncodingOption, false, false);
    }

    public QRDisplayDialog(UR ur) {
-        this(ur, false, false);
+        this(ur, null, false, false, false);
    }

-    public QRDisplayDialog(UR ur, boolean addLegacyEncodingOption, boolean addScanButton) {
+    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);
@@ -82,19 +100,29 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
        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(encoder.isSinglePart()) {
+        if(isSinglePart()) {
            qrImageView.setImage(getQrCode(currentPart));
        } else {
            createAnimateQRService();
        }

-        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().add(cancelButtonType);

-        if(addLegacyEncodingOption) {
+        if(this.addLegacyEncodingOption) {
            final ButtonType legacyEncodingButtonType = new javafx.scene.control.ButtonType("Use Legacy Encoding (Cobo Vault)", ButtonBar.ButtonData.LEFT);
            dialogPane.getButtonTypes().add(legacyEncodingButtonType);
        } else {
@@ -102,13 +130,19 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
            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.NEXT_FORWARD);
+            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);
@@ -120,7 +154,9 @@ public class QRDisplayDialog extends Dialog<ButtonType> {

    public QRDisplayDialog(String data, boolean addScanButton) {
        this.ur = null;
-        this.encoder = null;
+        this.bbqr = null;
+        this.urEncoder = null;
+        this.bbqrEncoder = null;

        final DialogPane dialogPane = new QRDisplayDialogPane();
        setDialogPane(dialogPane);
@@ -133,16 +169,17 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
        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);

        if(addScanButton) {
-            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.NEXT_FORWARD);
+            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);
@@ -161,9 +198,22 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
        });
    }

+    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];
@@ -199,37 +249,23 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
                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();
        }
    }

@@ -238,12 +274,28 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
            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();
        }
    }

@@ -288,7 +340,7 @@ public class QRDisplayDialog extends Dialog<ButtonType> {
                    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;
@@ -304,12 +356,25 @@ public class QRDisplayDialog extends Dialog<ButtonType> {

                    return density;
                }
-            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.NEXT_FORWARD) {
+            } 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);
@@ -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"));
@@ -570,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;
@@ -583,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 {
@@ -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()) {
@@ -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);
@@ -1,18 +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;
@@ -20,10 +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.util.Objects;
+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);
@@ -48,7 +58,7 @@ public class SearchWalletDialog extends Dialog<Entry> {
        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(showWallet ? "Search All Wallets" : "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()) {
@@ -81,6 +91,7 @@ public class SearchWalletDialog extends Dialog<Entry> {
        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");
@@ -117,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");
@@ -130,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);

@@ -147,7 +166,7 @@ public class SearchWalletDialog extends Dialog<Entry> {
        });

        search.textProperty().addListener((observable, oldValue, newValue) -> {
-            searchWallets(newValue.toLowerCase(Locale.ROOT));
+            searchWallets(newValue);
        });

        setResizable(true);
@@ -157,42 +176,41 @@ public class SearchWalletDialog extends Dialog<Entry> {
        Platform.runLater(search::requestFocus);
    }

-    private void searchWallets(String searchText) {
-        List<Entry> matchingEntries = new ArrayList<>();
+    public List<WalletForm> getWalletForms() {
+        return walletForms;
+    }

-        if(!searchText.isEmpty()) {
-            Long searchValue = getSearchValue(searchText);
-            Address searchAddress = getSearchAddress(searchText);
+    private void searchWallets(String searchPhrase) {
+        Set<Entry> matchingEntries = new LinkedHashSet<>();

-            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);
-                        }
-                    }
-                }
+        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(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(String searchText : searchWords) {
+                Long searchValue = getSearchValue(searchText);
+                Address searchAddress = getSearchAddress(searchText);
+                searchText = searchText.toLowerCase(Locale.ROOT);
+
+                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) ||
@@ -203,22 +221,38 @@ 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);
    }
@@ -239,6 +273,95 @@ public class SearchWalletDialog extends Dialog<Entry> {
        }
    }

+    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);
@@ -264,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);
        }
    }
 }
@@ -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();
+        }
+    }
 }
@@ -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());
+        });
+    }
+}
@@ -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);
    }
@@ -85,6 +85,7 @@ public class TextAreaDialog extends Dialog<String> {

        dialogPane.setPrefWidth(700);
        dialogPane.setPrefHeight(400);
+        setResizable(true);
        AppServices.moveToActiveWindowScreen(this);
    }

@@ -12,10 +12,9 @@ import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.Theme;
 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;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -44,7 +43,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 +54,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;
@@ -89,7 +89,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)));
                }

@@ -244,19 +244,9 @@ public class TransactionDiagram extends GridPane {
    }

    private List<Map<BlockTransactionHashIndex, WalletNode>> getDisplayedUtxoSets() {
-        boolean addUserSet = getOptimizationStrategy() == OptimizationStrategy.PRIVACY && SorobanServices.canWalletMix(walletTx.getWallet())
-                && walletTx.getPayments().size() == 1
-                && (walletTx.getPayments().get(0).getAddress().getScriptType() == walletTx.getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
-
        List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = new ArrayList<>();
        for(Map<BlockTransactionHashIndex, WalletNode> selectedUtxoSet : walletTx.getSelectedUtxoSets()) {
-            displayedUtxoSets.add(getDisplayedUtxos(selectedUtxoSet, addUserSet ? 2 : walletTx.getSelectedUtxoSets().size()));
-        }
-
-        if(addUserSet && displayedUtxoSets.size() == 1) {
-            Map<BlockTransactionHashIndex, WalletNode> addUserUtxoSet = new HashMap<>();
-            addUserUtxoSet.put(new AddUserBlockTransactionHashIndex(!walletTx.isTwoPersonCoinjoin()), null);
-            displayedUtxoSets.add(addUserUtxoSet);
+            displayedUtxoSets.add(getDisplayedUtxos(selectedUtxoSet, walletTx.getSelectedUtxoSets().size()));
        }

        List<Map<BlockTransactionHashIndex, WalletNode>> paddedUtxoSets = new ArrayList<>();
@@ -337,11 +327,9 @@ public class TransactionDiagram extends GridPane {
            double setHeight = (height / numSets) - 5;
            for(int set = 0; set < numSets; set++) {
                boolean externalUserSet = displayedUtxoSets.get(set).values().stream().anyMatch(Objects::nonNull);
-                boolean addUserSet = displayedUtxoSets.get(set).keySet().stream().anyMatch(ref -> ref instanceof AddUserBlockTransactionHashIndex);
-                if(externalUserSet || addUserSet) {
-                    boolean replace = !isFinal() && set > 0 && SorobanServices.canWalletMix(walletTx.getWallet());
-                    Glyph bracketGlyph = !replace && walletTx.isCoinControlUsed() ? getLockGlyph() : (addUserSet ? getUserAddGlyph() : getCoinsGlyph(replace));
-                    String tooltipText = addUserSet ? "Click to add a mix partner" : (walletTx.getWallet().getFullDisplayName() + (replace ? "\nClick to replace with a mix partner" : ""));
+                if(externalUserSet) {
+                    Glyph bracketGlyph = walletTx.isCoinControlUsed() ? getLockGlyph() : getCoinsGlyph();
+                    String tooltipText = walletTx.getWallet().getFullDisplayName();
                    StackPane stackPane = getBracket(width, setHeight, bracketGlyph, tooltipText);
                    allBrackets.getChildren().add(stackPane);
                } else {
@@ -472,14 +460,6 @@ public class TransactionDiagram extends GridPane {
                        tooltip.setText(joiner.toString());
                    } else if(input instanceof InvisibleBlockTransactionHashIndex) {
                        tooltip.setText("");
-                    } else if(input instanceof AddUserBlockTransactionHashIndex) {
-                        tooltip.setText("");
-                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
-                        label.setOnMouseClicked(event -> {
-                            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
-                            closeExpanded();
-                            event.consume();
-                        });
                    } else {
                        if(walletTx.getInputTransactions() != null && walletTx.getInputTransactions().get(input.getHash()) != null) {
                            BlockTransaction blockTransaction = walletTx.getInputTransactions().get(input.getHash());
@@ -568,7 +548,7 @@ public class TransactionDiagram extends GridPane {
            CubicCurve curve = new CubicCurve();
            curve.getStyleClass().add("input-line");

-            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex || inputs.get(numUtxos-i) instanceof AddUserBlockTransactionHashIndex) {
+            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex) {
                curve.getStyleClass().add("input-dashed-line");
            } else if(inputs.get(numUtxos-i) instanceof InvisibleBlockTransactionHashIndex) {
                continue;
@@ -642,7 +622,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++) {
@@ -686,19 +666,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())
-                    + (isDuplicateAddress(payment) ? " (Duplicate)" : ""));
+                    + (walletTx.isDuplicateAddress(payment) ? " (Duplicate)" : ""));
            recipientTooltip.getStyleClass().add("recipient-label");
            recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
            recipientTooltip.setShowDuration(Duration.INDEFINITE);
@@ -720,6 +699,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);
@@ -765,11 +745,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) {
@@ -783,7 +767,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 + "%)");
@@ -923,38 +907,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();
-    }
-
-    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) {
@@ -974,204 +930,10 @@ 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();
-        } else if(isDuplicateAddress(payment)) {
-            return getPaymentWarningGlyph();
-        }
-
-        return getPaymentGlyph();
-    }
-
-    private boolean isDuplicateAddress(Payment payment) {
-        return walletTx.getPayments().stream().filter(p -> payment != p).anyMatch(p -> payment.getAddress() != null && payment.getAddress().equals(p.getAddress()));
-    }
-
-    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 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 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 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");
-        userAddGlyph.setFontSize(12);
-        userAddGlyph.setOnMouseEntered(event -> {
-            userAddGlyph.setFontSize(18);
-        });
-        userAddGlyph.setOnMouseExited(event -> {
-            userAddGlyph.setFontSize(12);
-        });
-        userAddGlyph.setOnMouseClicked(event -> {
-            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
-            closeExpanded();
-            event.consume();
-        });
-        return userAddGlyph;
-    }
-
-    private Glyph getCoinsGlyph(boolean allowReplacement) {
+    private Glyph getCoinsGlyph() {
        Glyph coinsGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
        coinsGlyph.setFontSize(12);
-        if(allowReplacement) {
-            coinsGlyph.getStyleClass().add("coins-replace-icon");
-            coinsGlyph.setOnMouseEntered(event -> {
-                coinsGlyph.setIcon(FontAwesome5.Glyph.USER_PLUS);
-                coinsGlyph.setFontSize(18);
-            });
-            coinsGlyph.setOnMouseExited(event -> {
-                coinsGlyph.setIcon(FontAwesome5.Glyph.COINS);
-                coinsGlyph.setFontSize(12);
-            });
-            coinsGlyph.setOnMouseClicked(event -> {
-                EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
-                closeExpanded();
-                event.consume();
-            });
-        } else {
-            coinsGlyph.getStyleClass().add("coins-icon");
-        }
-
+        coinsGlyph.getStyleClass().add("coins-icon");
        return coinsGlyph;
    }

@@ -1274,21 +1036,7 @@ public class TransactionDiagram extends GridPane {
        }
    }

-    private static class AddUserBlockTransactionHashIndex extends BlockTransactionHashIndex {
-        private final boolean required;
-
-        public AddUserBlockTransactionHashIndex(boolean required) {
-            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
-            this.required = required;
-        }
-
-        @Override
-        public String getLabel() {
-            return "Add Mix Partner" + (required ? "" : "?");
-        }
-    }
-
-    private static class AdditionalPayment extends Payment {
+    public static class AdditionalPayment extends Payment {
        private final List<Payment> additionalPayments;

        public AdditionalPayment(List<Payment> additionalPayments) {
@@ -1296,10 +1044,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();
                }
@@ -1315,7 +1063,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;
@@ -1325,15 +1073,6 @@ 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 class LabelContextMenu extends ContextMenu {
@@ -1,7 +1,9 @@
 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;
@@ -81,13 +83,13 @@ public class TransactionDiagramLabel extends HBox {
            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
+        } 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
+        } 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) {
@@ -142,7 +144,7 @@ public class TransactionDiagramLabel extends HBox {

        Payment premixOutput = premixOutputs.get(0);
        long total = premixOutputs.stream().mapToLong(Payment::getAmount).sum();
-        Glyph glyph = transactionDiagram.getOutputGlyph(premixOutput);
+        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";
@@ -155,7 +157,7 @@ public class TransactionDiagramLabel extends HBox {
    }

    private OutputLabel getBadbankOutputLabel(TransactionDiagram transactionDiagram, Payment payment) {
-        Glyph glyph = transactionDiagram.getOutputGlyph(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);
@@ -164,7 +166,7 @@ public class TransactionDiagramLabel extends HBox {
    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 = transactionDiagram.getOutputGlyph(whirlpoolFee);
+        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);
@@ -177,7 +179,7 @@ public class TransactionDiagramLabel extends HBox {

        Payment remixOutput = mixOutputs.get(0);
        long total = mixOutputs.stream().mapToLong(Payment::getAmount).sum();
-        Glyph glyph = TransactionDiagram.getPremixGlyph();
+        Glyph glyph = GlyphUtils.getPremixGlyph();
        String text = "Mix transaction with " + mixOutputs.size() + " outputs of " + transactionDiagram.getSatsValue(remixOutput.getAmount()) + " sats each ("
                + transactionDiagram.getSatsValue(total) + " sats)";

@@ -191,7 +193,7 @@ public class TransactionDiagramLabel extends HBox {

        Payment remixOutput = remixOutputs.get(0);
        long total = remixOutputs.stream().mapToLong(Payment::getAmount).sum();
-        Glyph glyph = TransactionDiagram.getPremixGlyph();
+        Glyph glyph = GlyphUtils.getPremixGlyph();
        String text = "Remix transaction with " + remixOutputs.size() + " outputs of " + transactionDiagram.getSatsValue(remixOutput.getAmount()) + " sats each ("
                + transactionDiagram.getSatsValue(total) + " sats)";

@@ -200,10 +202,10 @@ public class TransactionDiagramLabel extends HBox {

    private OutputLabel getOutputLabel(TransactionDiagram transactionDiagram, Payment payment) {
        WalletTransaction walletTx = transactionDiagram.getWalletTransaction();
-        Wallet toWallet = transactionDiagram.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;

-        Glyph glyph = transactionDiagram.getOutputGlyph(payment);
+        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);
@@ -212,7 +214,7 @@ public class TransactionDiagramLabel extends HBox {
    private OutputLabel getOutputLabel(TransactionDiagram transactionDiagram, Map.Entry<WalletNode, Long> changeEntry) {
        WalletTransaction walletTx = transactionDiagram.getWalletTransaction();

-        Glyph glyph = TransactionDiagram.getChangeGlyph();
+        Glyph glyph = GlyphUtils.getChangeGlyph();
        String text = "Change of " + transactionDiagram.getSatsValue(changeEntry.getValue()) + " sats to " + walletTx.getChangeAddress(changeEntry.getKey()).toString();

        return getOutputLabel(glyph, text);
@@ -224,7 +226,7 @@ public class TransactionDiagramLabel extends HBox {
            return null;
        }

-        Glyph glyph = transactionDiagram.getFeeGlyph();
+        Glyph glyph = GlyphUtils.getFeeGlyph();
        String text = "Fee of " + transactionDiagram.getSatsValue(walletTx.getFee()) + " sats (" + String.format("%.2f", walletTx.getFeePercentage() * 100.0) + "%)";

        return getOutputLabel(glyph, text);
@@ -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 -> {
@@ -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);
@@ -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");
                }
            };
        }
@@ -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(), new JadeMultisig()));
+        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);
@@ -18,17 +18,21 @@ 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<WalletForm> walletForms) {
-        if(walletForms.isEmpty()) {
+    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");
        }

-        Wallet masterWallet = walletForms.get(0).getMasterWallet();
+        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());
@@ -37,7 +41,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
        dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/transactions.css").toExternalForm());

        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setHeaderText("Wallet Summary for " + masterWallet.getName());
+        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()) {
@@ -64,7 +68,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
        });
        balanceColumn.setCellFactory(p -> new CoinCell());
        table.getColumns().add(balanceColumn);
-        table.setUnitFormat(masterWallet);
+        table.setUnitFormat(masterWallets.get(0));

        CurrencyRate currencyRate = AppServices.getFiatCurrencyExchangeRate();
        if(currencyRate != null && currencyRate.isAvailable() && Config.get().getExchangeSource() != ExchangeSource.NONE) {
@@ -77,12 +81,20 @@ public class WalletSummaryDialog extends Dialog<Void> {
            table.setCurrencyRate(currencyRate);
        }

-        SummaryEntry rootEntry = new SummaryEntry(walletForms);
+        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);
-            childItem.getChildren().add(new TreeItem<>(new UnconfirmedEntry((WalletTransactionsEntry)childEntry)));
+            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);
@@ -97,6 +109,14 @@ public class WalletSummaryDialog extends Dialog<Void> {

        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);
@@ -104,7 +124,7 @@ public class WalletSummaryDialog extends Dialog<Void> {
        NumberAxis yAxis = new NumberAxis();
        yAxis.setSide(Side.LEFT);
        BalanceChart balanceChart = new BalanceChart(xAxis, yAxis);
-        balanceChart.initialize(new WalletTransactionsEntry(masterWallet, true));
+        balanceChart.initialize(new WalletTransactionsEntry(balanceWallet, true));
        balanceChart.setAnimated(false);
        balanceChart.setLegendVisible(false);
        balanceChart.setVerticalGridLinesVisible(false);
@@ -116,9 +136,36 @@ public class WalletSummaryDialog extends Dialog<Void> {
        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()));
@@ -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) {
@@ -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) -> {
@@ -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;
+    }
+}
@@ -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;
+    }
+}
@@ -1,15 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.sparrowwallet.drongo.wallet.Wallet;
-
-public class SorobanInitiatedEvent {
-    private Wallet wallet;
-
-    public SorobanInitiatedEvent(Wallet wallet) {
-        this.wallet = wallet;
-    }
-
-    public Wallet getWallet() {
-        return wallet;
-    }
-}
@@ -1,6 +1,5 @@
 package com.sparrowwallet.sparrow.event;

-import com.samourai.whirlpool.client.whirlpool.beans.Pool;
 import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
@@ -17,7 +16,6 @@ public class SpendUtxoEvent {
    private final Long fee;
    private final boolean requireAllUtxos;
    private final BlockTransaction replacedTransaction;
-    private final Pool pool;
    private final PaymentCode paymentCode;

    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
@@ -32,19 +30,6 @@ public class SpendUtxoEvent {
        this.fee = fee;
        this.requireAllUtxos = requireAllUtxos;
        this.replacedTransaction = replacedTransaction;
-        this.pool = null;
-        this.paymentCode = null;
-    }
-
-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, Pool pool) {
-        this.wallet = wallet;
-        this.utxos = utxos;
-        this.payments = payments;
-        this.opReturns = opReturns;
-        this.fee = fee;
-        this.requireAllUtxos = false;
-        this.replacedTransaction = null;
-        this.pool = pool;
        this.paymentCode = null;
    }

@@ -56,7 +41,6 @@ public class SpendUtxoEvent {
        this.fee = null;
        this.requireAllUtxos = false;
        this.replacedTransaction = null;
-        this.pool = null;
        this.paymentCode = paymentCode;
    }

@@ -88,10 +72,6 @@ public class SpendUtxoEvent {
        return replacedTransaction;
    }

-    public Pool getPool() {
-        return pool;
-    }
-
    public PaymentCode getPaymentCode() {
        return paymentCode;
    }
@@ -1,15 +0,0 @@
-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;
-    }
-}
@@ -1,67 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.samourai.whirlpool.client.mix.listener.MixFailReason;
-import com.samourai.whirlpool.client.wallet.beans.MixProgress;
-import com.samourai.whirlpool.protocol.beans.Utxo;
-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
-import com.sparrowwallet.drongo.wallet.Wallet;
-
-public class WhirlpoolMixEvent {
-    private final Wallet wallet;
-    private final BlockTransactionHashIndex utxo;
-    private final MixProgress mixProgress;
-    private final Utxo nextUtxo;
-    private final MixFailReason mixFailReason;
-    private final String mixError;
-
-    public WhirlpoolMixEvent(Wallet wallet, BlockTransactionHashIndex utxo, MixProgress mixProgress) {
-        this.wallet = wallet;
-        this.utxo = utxo;
-        this.mixProgress = mixProgress;
-        this.nextUtxo = null;
-        this.mixFailReason = null;
-        this.mixError = null;
-    }
-
-    public WhirlpoolMixEvent(Wallet wallet, BlockTransactionHashIndex utxo, Utxo nextUtxo) {
-        this.wallet = wallet;
-        this.utxo = utxo;
-        this.mixProgress = null;
-        this.nextUtxo = nextUtxo;
-        this.mixFailReason = null;
-        this.mixError = null;
-    }
-
-    public WhirlpoolMixEvent(Wallet wallet, BlockTransactionHashIndex utxo, MixFailReason mixFailReason, String mixError) {
-        this.wallet = wallet;
-        this.utxo = utxo;
-        this.mixProgress = null;
-        this.nextUtxo = null;
-        this.mixFailReason = mixFailReason;
-        this.mixError = mixError;
-    }
-
-    public Wallet getWallet() {
-        return wallet;
-    }
-
-    public BlockTransactionHashIndex getUtxo() {
-        return utxo;
-    }
-
-    public MixProgress getMixProgress() {
-        return mixProgress;
-    }
-
-    public Utxo getNextUtxo() {
-        return nextUtxo;
-    }
-
-    public MixFailReason getMixFailReason() {
-        return mixFailReason;
-    }
-
-    public String getMixError() {
-        return mixError;
-    }
-}
@@ -1,19 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.samourai.whirlpool.protocol.beans.Utxo;
-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.drongo.wallet.WalletNode;
-
-public class WhirlpoolMixSuccessEvent extends WhirlpoolMixEvent {
-    private final WalletNode walletNode;
-
-    public WhirlpoolMixSuccessEvent(Wallet wallet, BlockTransactionHashIndex utxo, Utxo nextUtxo, WalletNode walletNode) {
-        super(wallet, utxo, nextUtxo);
-        this.walletNode = walletNode;
-    }
-
-    public WalletNode getWalletNode() {
-        return walletNode;
-    }
-}
@@ -44,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'),
@@ -51,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'),
@@ -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;
+    }
+}
@@ -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() {}
 }
@@ -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();
-	
 }
@@ -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;
+    }
+}
@@ -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) +
@@ -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");
        }
@@ -62,7 +62,7 @@ public abstract class CardApi {
    }

    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);
        }

@@ -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
@@ -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());
@@ -77,7 +77,6 @@ public class Config {
    private int maxServerTimeout = DEFAULT_MAX_TIMEOUT;
    private int maxPageSize = DEFAULT_PAGE_SIZE;
    private boolean usePayNym;
-    private boolean sameAppMixing;
    private boolean mempoolFullRbf;
    private Double appWidth;
    private Double appHeight;
@@ -662,15 +661,6 @@ public class Config {
        flush();
    }

-    public boolean isSameAppMixing() {
-        return sameAppMixing;
-    }
-
-    public void setSameAppMixing(boolean sameAppMixing) {
-        this.sameAppMixing = sameAppMixing;
-        flush();
-    }
-
    public boolean isMempoolFullRbf() {
        return mempoolFullRbf;
    }
@@ -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
@@ -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)));
@@ -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.");
        }
@@ -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.3.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())) {
@@ -17,9 +17,4 @@ public class Krux extends SpecterDIY {
    public WalletModel getWalletModel() {
        return WalletModel.KRUX;
    }
-
-    @Override
-    public boolean isFileFormatAvailable() {
-        return false;
-    }
 }
@@ -0,0 +1,99 @@
+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.JsonParseException;
+import com.google.gson.reflect.TypeToken;
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.crypto.SamouraiUtil;
+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 = SamouraiUtil.decrypt(payload, password, SamouraiUtil.DefaultPBKDF2Iterations);
+            } else if(version == 2) {
+                decrypted = SamouraiUtil.decryptSHA256(payload, 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(JsonParseException e) {
+            throw new ImportException("Failed to decrypt the wallet backup file, check if the password is correct.");
+        } 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;
+    }
+}
@@ -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;
@@ -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");
@@ -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);
@@ -8,8 +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.soroban.Soroban;
-import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
@@ -174,15 +172,6 @@ public class Storage {
                }
            }

-            if(wallet.isWhirlpoolMasterWallet()) {
-                String walletId = getWalletId(wallet);
-                Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(walletId);
-                whirlpool.setScode(wallet.getMasterMixConfig().getScode());
-                whirlpool.setHDWallet(getWalletId(wallet), copy);
-                Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-                soroban.setHDWallet(copy);
-            }
-
            StandardAccount standardAccount = wallet.getStandardAccountType();
            if(standardAccount != null && standardAccount.getMinimumGapLimit() != null && wallet.gapLimit() == null) {
                wallet.setGapLimit(standardAccount.getMinimumGapLimit());
@@ -535,7 +524,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());
@@ -551,7 +540,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));
        }

@@ -752,7 +745,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;
@@ -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();
@@ -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) {
@@ -0,0 +1,185 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.csvreader.CsvWriter;
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.TransactionInput;
+import com.sparrowwallet.drongo.protocol.TransactionOutput;
+import com.sparrowwallet.drongo.wallet.BlockTransaction;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.net.ExchangeSource;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import com.sparrowwallet.sparrow.wallet.TransactionEntry;
+import com.sparrowwallet.sparrow.wallet.WalletForm;
+import com.sparrowwallet.sparrow.wallet.WalletTransactionsEntry;
+import org.apache.commons.lang3.time.DateUtils;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class WalletTransactions implements WalletExport {
+    private static final long ONE_DAY = 24*60*60*1000L;
+    public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    private final WalletForm walletForm;
+
+    static {
+        DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    public WalletTransactions(WalletForm walletForm) {
+        this.walletForm = walletForm;
+    }
+
+    @Override
+    public String getName() {
+        return "Transactions";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.TRANSACTIONS;
+    }
+
+    @Override
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
+        WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
+
+        ExchangeSource exchangeSource = Config.get().getExchangeSource();
+        if(Config.get().getExchangeSource() == null) {
+            exchangeSource = ExchangeSource.COINGECKO;
+        }
+
+        Currency fiatCurrency = (exchangeSource == ExchangeSource.NONE || !AppServices.onlineProperty().get() ? null : Config.get().getFiatCurrency());
+        Map<Date, Double> fiatRates = new HashMap<>();
+        if(fiatCurrency != null && !walletTransactionsEntry.getChildren().isEmpty()) {
+            LongSummaryStatistics stats = walletTransactionsEntry.getChildren().stream()
+                    .map(entry -> ((TransactionEntry)entry).getBlockTransaction().getDate())
+                    .filter(Objects::nonNull)
+                    .collect(Collectors.summarizingLong(Date::getTime));
+            fiatRates = exchangeSource.getHistoricalExchangeRates(fiatCurrency, new Date(stats.getMin() - ONE_DAY), new Date(stats.getMax()));
+        }
+
+        BitcoinUnit bitcoinUnit = Config.get().getBitcoinUnit();
+        if(bitcoinUnit == null || bitcoinUnit.equals(BitcoinUnit.AUTO)) {
+            bitcoinUnit = walletForm.getWallet().getAutoUnit();
+        }
+
+        try {
+            CsvWriter writer = new CsvWriter(outputStream, ',', StandardCharsets.UTF_8);
+
+            writer.write("Date (UTC)");
+            writer.write("Label");
+            writer.write("Value");
+            writer.write("Balance");
+            writer.write("Fee");
+            if(fiatCurrency != null) {
+                writer.write("Value (" + fiatCurrency.getCurrencyCode() + ")");
+            }
+            writer.write("Txid");
+            writer.endRecord();
+
+            for(Entry entry : walletTransactionsEntry.getChildren()) {
+                TransactionEntry txEntry = (TransactionEntry)entry;
+                writer.write(txEntry.getBlockTransaction().getDate() == null ? "Unconfirmed" : DATE_FORMAT.format(txEntry.getBlockTransaction().getDate()));
+                writer.write(txEntry.getLabel());
+                writer.write(getCoinValue(bitcoinUnit, txEntry.getValue()));
+                writer.write(getCoinValue(bitcoinUnit, txEntry.getBalance()));
+                Long fee = txEntry.getValue() < 0 ? getFee(wallet, txEntry.getBlockTransaction()) : null;
+                writer.write(fee == null ? "" : getCoinValue(bitcoinUnit, fee));
+                if(fiatCurrency != null) {
+                    Double fiatValue = getFiatValue(txEntry, fiatRates);
+                    writer.write(fiatValue == null ? "" : getFiatValue(fiatValue));
+                }
+                writer.write(txEntry.getBlockTransaction().getHash().toString());
+                writer.endRecord();
+            }
+
+            if(fiatCurrency != null) {
+                writer.endRecord();
+                writer.writeComment(" Historical " + fiatCurrency.getCurrencyCode() + " values are taken from daily rates and should only be considered as approximate.");
+            }
+
+            writer.close();
+        } catch(IOException e) {
+            throw new ExportException("Error writing transactions CSV", e);
+        }
+    }
+
+    private Long getFee(Wallet wallet, BlockTransaction blockTransaction) {
+        long fee = 0L;
+        for(TransactionInput txInput : blockTransaction.getTransaction().getInputs()) {
+            if(txInput.isCoinBase()) {
+                return 0L;
+            }
+
+            BlockTransaction inputTx = wallet.getWalletTransaction(txInput.getOutpoint().getHash());
+            if(inputTx == null || inputTx.getTransaction().getOutputs().size() <= txInput.getOutpoint().getIndex()) {
+                return null;
+            }
+            TransactionOutput spentOutput = inputTx.getTransaction().getOutputs().get((int)txInput.getOutpoint().getIndex());
+            fee += spentOutput.getValue();
+        }
+
+        for(TransactionOutput txOutput : blockTransaction.getTransaction().getOutputs()) {
+            fee -= txOutput.getValue();
+        }
+
+        return fee;
+    }
+
+    private String getCoinValue(BitcoinUnit bitcoinUnit, Long value) {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        return BitcoinUnit.BTC.equals(bitcoinUnit) ? format.tableFormatBtcValue(value) : String.format(Locale.ENGLISH, "%d", value);
+    }
+
+    private String getFiatValue(Double value) {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        return format.tableFormatCurrencyValue(value);
+    }
+
+    private Double getFiatValue(TransactionEntry txEntry, Map<Date, Double> fiatRates) {
+        Double dayRate = null;
+        if(txEntry.getBlockTransaction().getDate() == null) {
+            if(AppServices.getFiatCurrencyExchangeRate() != null) {
+                dayRate = AppServices.getFiatCurrencyExchangeRate().getBtcRate();
+            }
+        } else {
+            dayRate = fiatRates.get(DateUtils.truncate(txEntry.getBlockTransaction().getDate(), Calendar.DAY_OF_MONTH));
+        }
+
+        if(dayRate != null) {
+            return dayRate * txEntry.getValue() / Transaction.SATOSHIS_PER_BITCOIN;
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getWalletExportDescription() {
+        return "Exports a CSV file containing dates and values of the transactions in this wallet. Additionally, if a fiat currency has been configured, the fiat value on the day they were first included in the blockchain.";
+    }
+
+    @Override
+    public String getExportFileExtension(Wallet wallet) {
+        return "csv";
+    }
+
+    @Override
+    public boolean isWalletExportScannable() {
+        return false;
+    }
+
+    @Override
+    public boolean walletExportRequiresDecryption() {
+        return false;
+    }
+}
@@ -0,0 +1,3 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+public record BBQR(BBQRType type, byte[] data) {}
@@ -0,0 +1,180 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.psbt.PSBT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.TreeMap;
+
+public class BBQRDecoder {
+    private static final Logger log = LoggerFactory.getLogger(BBQRDecoder.class);
+
+    private final Map<Integer, byte[]> receivedParts = new TreeMap<>();
+    private int totalParts;
+
+    private BBQRType type;
+    private Result result;
+
+    public static boolean isBBQRFragment(String part) {
+        try {
+            BBQRHeader.fromString(part);
+            return true;
+        } catch(Exception e) {
+            return false;
+        }
+    }
+
+    public void receivePart(String part) {
+        try {
+            BBQRHeader header = BBQRHeader.fromString(part);
+            totalParts = header.seqTotal();
+            type = header.type();
+            byte[] partData = header.decode(part);
+            receivedParts.put(header.seqNumber(), partData);
+
+            if(receivedParts.size() == totalParts) {
+                byte[] data = concatParts();
+
+                if(type == BBQRType.PSBT) {
+                    result = new Result(new PSBT(data));
+                } else if(type == BBQRType.TXN) {
+                    result = new Result(new Transaction(data));
+                } else if(type == BBQRType.JSON || type == BBQRType.UNICODE) {
+                    result = new Result(type, new String(data, StandardCharsets.UTF_8));
+                } else {
+                    result = new Result(type, data);
+                }
+            }
+        } catch(Exception e) {
+            log.error("Could not parse received QR of type " + type, e);
+            result = new Result(ResultType.FAILURE, e.getMessage());
+        }
+    }
+
+    private byte[] concatParts() {
+        int totalLength = 0;
+        for(byte[] part : receivedParts.values()) {
+            totalLength += part.length;
+        }
+
+        byte[] data = new byte[totalLength];
+        int index = 0;
+        for(byte[] part : receivedParts.values()) {
+            System.arraycopy(part, 0, data, index, part.length);
+            index += part.length;
+        }
+
+        return data;
+    }
+
+    public int getProcessedPartsCount() {
+        return receivedParts.size();
+    }
+
+    public double getPercentComplete() {
+        if(totalParts == 0) {
+            return 0d;
+        }
+
+        return (double)getProcessedPartsCount() / totalParts;
+    }
+
+    public Result getResult() {
+        return result;
+    }
+
+    public static class Result {
+        private final ResultType resultType;
+        private final BBQRType bbqrType;
+        private final PSBT psbt;
+        private final Transaction transaction;
+        private final String strData;
+        private final byte[] data;
+        private final String error;
+
+        public Result(ResultType resultType, String error) {
+            this.resultType = resultType;
+            this.bbqrType = null;
+            this.psbt = null;
+            this.transaction = null;
+            this.strData = null;
+            this.data = null;
+            this.error = error;
+        }
+
+        public Result(PSBT psbt) {
+            this.resultType = ResultType.SUCCESS;
+            this.bbqrType = BBQRType.PSBT;
+            this.psbt = psbt;
+            this.transaction = null;
+            this.strData = null;
+            this.data = null;
+            this.error = null;
+        }
+
+        public Result(Transaction transaction) {
+            this.resultType = ResultType.SUCCESS;
+            this.bbqrType = BBQRType.TXN;
+            this.psbt = null;
+            this.transaction = transaction;
+            this.strData = null;
+            this.data = null;
+            this.error = null;
+        }
+
+        public Result(BBQRType bbqrType, String strData) {
+            this.resultType = ResultType.SUCCESS;
+            this.bbqrType = bbqrType;
+            this.psbt = null;
+            this.transaction = null;
+            this.strData = strData;
+            this.data = null;
+            this.error = null;
+        }
+
+        public Result(BBQRType bbqrType, byte[] data) {
+            this.resultType = ResultType.SUCCESS;
+            this.bbqrType = bbqrType;
+            this.psbt = null;
+            this.transaction = null;
+            this.strData = null;
+            this.data = data;
+            this.error = null;
+        }
+
+        public ResultType getResultType() {
+            return resultType;
+        }
+
+        public BBQRType getBbqrType() {
+            return bbqrType;
+        }
+
+        public PSBT getPsbt() {
+            return psbt;
+        }
+
+        public Transaction getTransaction() {
+            return transaction;
+        }
+
+        public byte[] getData() {
+            return data;
+        }
+
+        public String toString() {
+            return strData;
+        }
+
+        public String getError() {
+            return error;
+        }
+    }
+
+    public enum ResultType {
+        SUCCESS, FAILURE;
+    }
+}
@@ -0,0 +1,71 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BBQREncoder {
+    private final String[] parts;
+    private int partIndex;
+
+    public BBQREncoder(BBQRType bbqrType, BBQREncoding bbqrEncoding, byte[] data, int maxFragmentLength, int firstSeqNum) {
+        this.parts = encode(bbqrType, bbqrEncoding, data, maxFragmentLength).toArray(new String[0]);
+        this.partIndex = firstSeqNum;
+    }
+
+    public boolean isSinglePart() {
+        return parts.length == 1;
+    }
+
+    public String nextPart() {
+        String currentPart = parts[partIndex];
+        partIndex++;
+        if(partIndex > parts.length - 1) {
+            partIndex = 0;
+        }
+
+        return currentPart;
+    }
+
+    public int getNumParts() {
+        return parts.length;
+    }
+
+    private List<String> encode(BBQRType type, BBQREncoding desiredEncoding, byte[] data, int desiredChunkSize) {
+        String encoded;
+        BBQREncoding encoding = desiredEncoding;
+
+        try {
+            encoded = encoding.encode(data);
+            if(encoding == BBQREncoding.ZLIB) {
+                String uncompressed = BBQREncoding.BASE32.encode(data);
+                if(encoded.length() > uncompressed.length()) {
+                    throw new BBQREncodingException("Compressed data was larger than uncompressed data");
+                }
+            }
+        } catch(BBQREncodingException e) {
+            encoding = BBQREncoding.BASE32;
+            encoded = BBQREncoding.BASE32.encode(data);
+        }
+
+        int inputLength = encoded.length();
+        int numChunks = (inputLength + desiredChunkSize - 1) / desiredChunkSize;
+        int chunkSize = numChunks == 1 ? desiredChunkSize : (int)Math.ceil((double)inputLength / numChunks);
+
+        int modulo = chunkSize % encoding.getPartModulo();
+        if(modulo > 0) {
+            chunkSize += (encoding.getPartModulo() - modulo);
+        }
+
+        List<String> chunks = new ArrayList<>();
+        int startIndex = 0;
+        for(int i = 0; i < numChunks; i ++) {
+            int endIndex = Math.min(startIndex + chunkSize, encoded.length());
+            BBQRHeader bbqrHeader = new BBQRHeader(encoding, type, numChunks, i);
+            String chunk = bbqrHeader + encoded.substring(startIndex, endIndex);
+            startIndex = endIndex;
+            chunks.add(chunk);
+        }
+
+        return chunks;
+    }
+}
@@ -0,0 +1,104 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+import com.google.common.io.BaseEncoding;
+import com.jcraft.jzlib.*;
+import com.sparrowwallet.drongo.Utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Locale;
+
+public enum BBQREncoding {
+    HEX("H") {
+        @Override
+        public String encode(byte[] data) throws BBQREncodingException {
+            return Utils.bytesToHex(data).toUpperCase(Locale.ROOT);
+        }
+
+        @Override
+        public byte[] decode(String part) throws BBQREncodingException {
+            return Utils.hexToBytes(part);
+        }
+
+        @Override
+        public int getPartModulo() {
+            return 2;
+        }
+    }, BASE32("2") {
+        @Override
+        public String encode(byte[] data) throws BBQREncodingException {
+            return BaseEncoding.base32().encode(data).replaceAll("=+$", "");
+        }
+
+        @Override
+        public byte[] decode(String part) throws BBQREncodingException {
+            return BaseEncoding.base32().decode(part);
+        }
+
+        @Override
+        public int getPartModulo() {
+            return 8;
+        }
+    }, ZLIB("Z") {
+        @Override
+        public String encode(byte[] data) throws BBQREncodingException {
+            try {
+                Deflater deflater = new Deflater(JZlib.Z_BEST_COMPRESSION, 10, true);
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                DeflaterOutputStream zOut = new DeflaterOutputStream(out, deflater);
+                zOut.write(data);
+                zOut.close();
+
+                return BASE32.encode(out.toByteArray());
+            } catch(Exception e) {
+                throw new BBQREncodingException("Error deflating with zlib", e);
+            }
+        }
+
+        @Override
+        public byte[] decode(String part) throws BBQREncodingException {
+            try {
+                Inflater inflater = new Inflater(10, true);
+                ByteArrayInputStream in = new ByteArrayInputStream(BASE32.decode(part));
+                InflaterInputStream zIn = new InflaterInputStream(in, inflater);
+                byte[] decoded = zIn.readAllBytes();
+                zIn.close();
+
+                return decoded;
+            } catch(Exception e) {
+                throw new BBQREncodingException("Error inflating with zlib", e);
+            }
+        }
+
+        @Override
+        public int getPartModulo() {
+            return 8;
+        }
+    };
+
+    public static BBQREncoding fromString(String code) {
+        for(BBQREncoding encoding : values()) {
+            if(encoding.getCode().equals(code)) {
+                return encoding;
+            }
+        }
+
+        throw new IllegalArgumentException("Could not find encoding for code " + code);
+    }
+
+    private final String code;
+
+    BBQREncoding(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public abstract String encode(byte[] data) throws BBQREncodingException;
+
+    public abstract byte[] decode(String part) throws BBQREncodingException;
+
+    public abstract int getPartModulo();
+}
@@ -0,0 +1,11 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+public class BBQREncodingException extends BBQRException {
+    public BBQREncodingException(String message) {
+        super(message);
+    }
+
+    public BBQREncodingException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
@@ -0,0 +1,11 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+public class BBQRException extends RuntimeException {
+    public BBQRException(String message) {
+        super(message);
+    }
+
+    public BBQRException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
@@ -0,0 +1,40 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+import java.math.BigInteger;
+
+public record BBQRHeader(BBQREncoding encoding, BBQRType type, int seqTotal, int seqNumber) {
+    public static final String HEADER = "B$";
+
+    public String toString() {
+        return HEADER + encoding.getCode() + type.getCode() + encodeToBase36(seqTotal) + encodeToBase36(seqNumber);
+    }
+
+    public byte[] decode(String part) {
+        return encoding.decode(part.substring(8));
+    }
+
+    public static BBQRHeader fromString(String part) {
+        if(part.length() < 8) {
+            throw new IllegalArgumentException("Part too short");
+        }
+
+        if(!HEADER.equals(part.substring(0, 2))) {
+            throw new IllegalArgumentException("Part does not start with " + HEADER);
+        }
+
+        BBQREncoding e = BBQREncoding.fromString(part.substring(2, 3));
+        BBQRType t = BBQRType.fromString(part.substring(3, 4));
+
+        return new BBQRHeader(e, t, decodeFromBase36(part.substring(4, 6)), decodeFromBase36(part.substring(6, 8)));
+    }
+
+    private String encodeToBase36(int number) {
+        String base36Encoded = new BigInteger(String.valueOf(number)).toString(36);
+        return String.format("%2s", base36Encoded).replace(' ', '0');
+    }
+
+    private static int decodeFromBase36(String base36) {
+        BigInteger bigInteger = new BigInteger(base36, 36);
+        return bigInteger.intValue();
+    }
+}
@@ -0,0 +1,25 @@
+package com.sparrowwallet.sparrow.io.bbqr;
+
+public enum BBQRType {
+    PSBT("P"), TXN("T"), JSON("J"), CBOR("C"), UNICODE("U"), BINARY("B"), EXECUTABLE("X");
+
+    private final String code;
+
+    BBQRType(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public static BBQRType fromString(String code) {
+        for(BBQRType type : values()) {
+            if(type.getCode().equals(code)) {
+                return type;
+            }
+        }
+
+        throw new IllegalArgumentException("Could not find type for code " + code);
+    }
+}
@@ -15,6 +15,7 @@ public class CardStatus extends CardResponse {
    String ver;
    BigInteger birth;
    boolean tapsigner;
+    boolean satschip;
    List<BigInteger> path;
    BigInteger num_backups;
    List<BigInteger> slots;
@@ -24,7 +25,7 @@ public class CardStatus extends CardResponse {
    boolean testnet;

    public boolean isInitialized() {
-        return (getCardType() == WalletModel.TAPSIGNER && path != null) || (getCardType() == WalletModel.SATSCARD && addr != null);
+        return ((getCardType() == WalletModel.TAPSIGNER || getCardType() == WalletModel.SATSCHIP) && path != null) || (getCardType() == WalletModel.SATSCARD && addr != null);
    }

    public String getIdentifier() {
@@ -42,11 +43,11 @@ public class CardStatus extends CardResponse {
    }

    public boolean requiresBackup() {
-        return num_backups == null || num_backups.intValue() == 0;
+        return !satschip && (num_backups == null || num_backups.intValue() == 0);
    }

    public WalletModel getCardType() {
-        return tapsigner ? WalletModel.TAPSIGNER : WalletModel.SATSCARD;
+        return satschip ? WalletModel.SATSCHIP : (tapsigner ? WalletModel.TAPSIGNER : WalletModel.SATSCARD);
    }

    public int getCurrentSlot() {
@@ -72,6 +73,7 @@ public class CardStatus extends CardResponse {
                ", ver='" + ver + '\'' +
                ", birth=" + birth +
                ", tapsigner=" + tapsigner +
+                ", satschip=" + satschip +
                ", path=" + path +
                ", num_backups=" + num_backups +
                ", slots=" + slots +
@@ -32,10 +32,6 @@ public class CkCardApi extends CardApi {
    private final CardProtocol cardProtocol;
    private String cvc;

-    public CkCardApi(String cvc) throws CardException {
-        this(WalletModel.TAPSIGNER, cvc);
-    }
-
    public CkCardApi(WalletModel cardType, String cvc) throws CardException {
        this.cardType = cardType;
        this.cardProtocol = new CardProtocol();
@@ -137,6 +133,8 @@ public class CkCardApi extends CardApi {
    public Service<Void> getInitializationService(byte[] entropy, StringProperty messageProperty) {
        if(cardType == WalletModel.TAPSIGNER) {
            return new CardImportPane.CardInitializationService(new Tapsigner(), cvc, entropy, messageProperty);
+        } else if(cardType == WalletModel.SATSCHIP) {
+            return new CardImportPane.CardInitializationService(new Satschip(), cvc, entropy, messageProperty);
        }

        return new CardInitializationService(entropy, messageProperty);
@@ -144,6 +142,10 @@ public class CkCardApi extends CardApi {

    @Override
    public Service<Keystore> getImportService(List<ChildNumber> derivation, StringProperty messageProperty) {
+        if(cardType == WalletModel.SATSCHIP) {
+            return new CardImportPane.CardImportService(new Satschip(), cvc, derivation, messageProperty);
+        }
+
        return new CardImportPane.CardImportService(new Tapsigner(), cvc, derivation, messageProperty);
    }

@@ -155,11 +157,11 @@ public class CkCardApi extends CardApi {
        ExtendedKey derivedXpubkey = ExtendedKey.fromDescriptor(Base58.encodeChecked(derivedXpub.xpub));

        Keystore keystore = new Keystore();
-        keystore.setLabel(WalletModel.TAPSIGNER.toDisplayString());
+        keystore.setLabel(cardType.toDisplayString());
        keystore.setKeyDerivation(keyDerivation);
        keystore.setSource(KeystoreSource.HW_AIRGAPPED);
        keystore.setExtendedPublicKey(derivedXpubkey);
-        keystore.setWalletModel(WalletModel.TAPSIGNER);
+        keystore.setWalletModel(cardType);

        return keystore;
    }
@@ -404,7 +406,7 @@ public class CkCardApi extends CardApi {
                @Override
                protected PSBT call() throws Exception {
                    CardStatus cardStatus = getStatus();
-                    if(cardStatus.getCardType() != WalletModel.TAPSIGNER) {
+                    if(cardStatus.getCardType() != WalletModel.TAPSIGNER && cardStatus.getCardType() != WalletModel.SATSCHIP) {
                        throw new IllegalStateException("Please use a " + WalletModel.TAPSIGNER.toDisplayString() + " to sign transactions.");
                    }

@@ -465,7 +467,7 @@ public class CkCardApi extends CardApi {
                @Override
                protected String call() throws Exception {
                    CardStatus cardStatus = getStatus();
-                    if(cardStatus.getCardType() != WalletModel.TAPSIGNER) {
+                    if(cardStatus.getCardType() != WalletModel.TAPSIGNER && cardStatus.getCardType() != WalletModel.SATSCHIP) {
                        throw new IllegalStateException("Please use a " + WalletModel.TAPSIGNER.toDisplayString() + " to sign messages.");
                    }

@@ -0,0 +1,20 @@
+package com.sparrowwallet.sparrow.io.ckcard;
+
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+public class Satschip extends Tapsigner {
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import the keystore from your Satschip by placing it on the card reader.";
+    }
+
+    @Override
+    public String getName() {
+        return "Satschip";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SATSCHIP;
+    }
+}
--- a/Show More
+++ b/Show More