use hwi 3.0.0 built on ubuntu 20.04 amd64

merge whirlpool 1.x client using decentralized soroban
fix npe on soroban counterparty timeout
2026-07-30 19:46:16 +00:00 · 2024-04-11 10:46:44 +02:00 · 2024-04-11 08:37:28 +02:00 · 2024-04-11 08:09:08 +02:00 · 2024-04-10 12:42:11 +02:00 · 2024-04-10 10:34:47 +02:00
327 changed files with 11826 additions and 3358 deletions
@@ -2,6 +2,9 @@ name: Package

 on: workflow_dispatch

+permissions:
+  contents: read
+
 jobs:
  build:
    runs-on: ${{ matrix.os }}
@@ -9,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'
@@ -28,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: |
@@ -45,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.7.5'
+def sparrowVersion = '1.8.5'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -24,7 +24,7 @@ if(System.getProperty("os.arch") == "aarch64") {
 def headless = "true".equals(System.getProperty("java.awt.headless"))

 def vTor = '4.7.13-4'
-def vKmpTor = '1.4.2'
+def vKmpTor = '1.4.3'
 def kmpOs = osName
 if(os.macOsX) {
    kmpOs = "macos"
@@ -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.4')
+    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'
@@ -105,7 +106,7 @@ dependencies {
    }
    implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-extract:${vTor}")
    implementation("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager:${vKmpTor}")
-    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.6.4')
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.7.1')
    implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
    implementation('org.controlsfx:controlsfx:11.1.0' ) {
        exclude group: 'org.openjfx', module: 'javafx-base'
@@ -118,25 +119,27 @@ dependencies {
    }
    implementation('dev.bwt:bwt-jni:0.1.8')
    implementation('net.sourceforge.javacsv:javacsv:2.0')
-    implementation('org.slf4j:jul-to-slf4j:1.7.30') {
+    implementation ('org.slf4j:slf4j-api:2.0.12')
+    implementation('org.slf4j:jul-to-slf4j:2.0.12') {
        exclude group: 'org.slf4j'
    }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.36')
+    implementation('com.sparrowwallet.bokmakierie:bokmakierie:1.0')
+    implementation('io.samourai.code.whirlpool:whirlpool-client:1.0.6')
+    implementation('io.samourai.code.wallet:java-http-client:2.0.2')
    implementation('io.reactivex.rxjava2:rxjava:2.2.15')
    implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
    implementation('org.apache.commons:commons-lang3:3.7')
+    implementation('org.apache.commons:commons-compress:1.25.0')
    implementation('net.sourceforge.streamsupport:streamsupport:1.7.0')
    implementation('com.github.librepdf:openpdf:1.3.30')
    implementation('com.googlecode.lanterna:lanterna:3.1.1')
    implementation('net.coobird:thumbnailator:0.4.18')
    implementation('com.github.hervegirod:fxsvgimage:1.0b2')
    implementation('com.sparrowwallet:toucan:0.9.0')
-    testImplementation('junit:junit:4.13.1')
-}
-
-application {
-    mainModule = 'com.sparrowwallet.sparrow'
-    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+    implementation('com.jcraft:jzlib:1.1.3')
+    testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
+    testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.0')
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
 }

 compileJava {
@@ -157,10 +160,14 @@ processResources {
 }

 test {
-    jvmArgs '--add-opens=java.base/java.io=com.google.gson'
+    useJUnitPlatform()
+    jvmArgs = ["--add-opens=java.base/java.io=ALL-UNNAMED", "--add-opens=java.base/java.io=com.google.gson"]
 }

-run {
+application {
+    mainModule = 'com.sparrowwallet.sparrow'
+    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+
    applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError",
                                 "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
                                 "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls",
@@ -182,7 +189,7 @@ run {
                                 "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
                                 "--add-opens=java.base/java.io=com.google.gson",
                                 "--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow",
-                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core.jvm"]
+                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]

    if(os.macOsX) {
        applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
@@ -206,8 +213,6 @@ jlink {
        uses 'org.flywaydb.core.extensibility.FlywayExtension'
        uses 'org.flywaydb.core.internal.database.DatabaseType'
        uses 'org.eclipse.jetty.http.HttpFieldPreEncoder'
-        uses 'org.eclipse.jetty.websocket.api.extensions.Extension'
-        uses 'org.eclipse.jetty.websocket.common.RemoteEndpointFactory'
    }

    options = ['--strip-native-commands', '--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*']
@@ -236,12 +241,15 @@ 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=kotlin.stdlib=kotlinx.coroutines.core.jvm"]
+                   "--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) {
            jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
@@ -260,7 +268,7 @@ jlink {
        appVersion = "${sparrowVersion}"
        skipInstaller = os.macOsX || properties.skipInstallers
        imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/asc.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
        if(os.windows) {
            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-menu-group', 'Sparrow', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
            imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
@@ -405,41 +413,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 +433,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 +492,21 @@ extraJavaModuleInfo {
        exports('co.nstant.in.cbor.model')
        exports('co.nstant.in.cbor.builder')
    }
-    module('nightjar-0.2.36.jar', 'com.sparrowwallet.nightjar', '0.2.36') {
-        requires('com.google.common')
-        requires('net.sourceforge.streamsupport')
-        requires('org.slf4j')
-        requires('org.bouncycastle.provider')
-        requires('com.fasterxml.jackson.databind')
-        requires('com.fasterxml.jackson.annotation')
-        requires('com.fasterxml.jackson.core')
-        requires('logback.classic')
-        requires('org.json')
-        requires('io.reactivex.rxjava2')
-        exports('com.samourai.http.client')
-        exports('com.samourai.tor.client')
-        exports('com.samourai.wallet.api.backend')
-        exports('com.samourai.wallet.api.backend.beans')
-        exports('com.samourai.wallet.client.indexHandler')
-        exports('com.samourai.wallet.hd')
-        exports('com.samourai.wallet.util')
-        exports('com.samourai.wallet.bip47.rpc')
-        exports('com.samourai.wallet.bip47.rpc.java')
-        exports('com.samourai.wallet.cahoots')
-        exports('com.samourai.wallet.cahoots.psbt')
-        exports('com.samourai.wallet.cahoots.stonewallx2')
-        exports('com.samourai.soroban.cahoots')
-        exports('com.samourai.soroban.client')
-        exports('com.samourai.soroban.client.cahoots')
-        exports('com.samourai.soroban.client.meeting')
-        exports('com.samourai.soroban.client.rpc')
-        exports('com.samourai.wallet.send')
-        exports('com.samourai.whirlpool.client.event')
-        exports('com.samourai.whirlpool.client.wallet')
-        exports('com.samourai.whirlpool.client.wallet.beans')
-        exports('com.samourai.whirlpool.client.wallet.data.dataSource')
-        exports('com.samourai.whirlpool.client.wallet.data.dataPersister')
-        exports('com.samourai.whirlpool.client.whirlpool')
-        exports('com.samourai.whirlpool.client.whirlpool.beans')
-        exports('com.samourai.whirlpool.client.wallet.data.pool')
-        exports('com.samourai.whirlpool.client.wallet.data.utxo')
-        exports('com.samourai.whirlpool.client.wallet.data.utxoConfig')
-        exports('com.samourai.whirlpool.client.wallet.data.supplier')
-        exports('com.samourai.whirlpool.client.mix.handler')
-        exports('com.samourai.whirlpool.client.mix.listener')
-        exports('com.samourai.whirlpool.protocol.beans')
-        exports('com.samourai.whirlpool.protocol.rest')
-        exports('com.samourai.whirlpool.client.tx0')
-        exports('com.samourai.wallet.segwit.bech32')
-        exports('com.samourai.whirlpool.client.wallet.data.chain')
-        exports('com.samourai.whirlpool.client.wallet.data.wallet')
-        exports('com.samourai.whirlpool.client.wallet.data.minerFee')
-        exports('com.samourai.whirlpool.client.wallet.data.walletState')
-        exports('com.sparrowwallet.nightjar.http')
-        exports('com.sparrowwallet.nightjar.stomp')
-        exports('com.sparrowwallet.nightjar.tor')
+    module('commons-codec-1.10.jar', 'commons.codec', '1.10') {
+        exports('org.apache.commons.codec')
    }
-    module('throwing-supplier-1.0.3.jar', 'zeroleak.throwingsupplier', '1.0.3') {
-        exports('com.zeroleak.throwingsupplier')
+    module('logback-core-1.2.13.jar', 'ch.qos.logback.core', '1.2.13') {
+        exports('ch.qos.logback.core')
    }
-    module('okhttp-2.7.5.jar', 'com.squareup.okhttp', '2.7.5') {
-        exports('com.squareup.okhttp')
+    module('jackson-datatype-jsr310-2.13.2.jar', 'jackson-datatype-jsr310', '2.13.2') {
+        exports('com.fasterxml.jackson.datatype.jsr310')
+    }
+    module('json-20240205.jar', 'org.json', '20240205') {
+        exports('org.json')
+    }
+    module('scrypt-1.4.0.jar', 'scrypt', '1.4.0') {
+        exports('com.lambdaworks.codec')
+        exports('com.lambdaworks.crypto')
    }
    module('okio-1.6.0.jar', 'com.squareup.okio', '1.6.0') {
        exports('okio')
@@ -574,22 +514,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')
    }
@@ -605,19 +535,6 @@ extraJavaModuleInfo {
        requires('javafx.graphics')
        requires('java.xml')
    }
-    module('kotlinx-coroutines-core-jvm-1.6.4.jar', 'kotlinx.coroutines.core.jvm', '1.6.4') {
-        exports('kotlinx.coroutines')
-        requires('kotlin.stdlib')
-        requires('java.instrument')
-        uses('kotlinx.coroutines.CoroutineExceptionHandler')
-        uses('kotlinx.coroutines.internal.MainDispatcherFactory')
-    }
-    module('kotlinx-coroutines-javafx-1.6.4.jar', 'kotlinx.coroutines.javafx', '1.6.4') {
-        exports('kotlinx.coroutines.javafx')
-        requires('kotlinx.coroutines.core.jvm')
-        requires('kotlin.stdlib')
-        requires('javafx.graphics')
-    }
    module("kmp-tor-jvm-${vKmpTor}.jar", 'kmp.tor.jvm', "${vTor}-${vKmpTor}") {
        exports('io.matthewnelson.kmp.tor')
        requires('kmp.tor.binary.extract.jvm')
@@ -625,7 +542,7 @@ extraJavaModuleInfo {
        requires('kmp.tor.manager.common.jvm')
        requires('kmp.tor.controller.common.jvm')
        requires('kotlin.stdlib')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
        requires('java.management')
    }
    if(kmpOs == "linux" && kmpArch == "arm64") {
@@ -652,7 +569,7 @@ extraJavaModuleInfo {
        requires('kmp.tor.controller.common.jvm')
        requires('kmp.tor.manager.common.jvm')
        requires('kotlin.stdlib')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
        requires('kotlinx.atomicfu')
        requires('kmp.tor.controller.jvm')
        requires('kmp.tor.common.jvm')
@@ -685,7 +602,7 @@ extraJavaModuleInfo {
        exports('io.matthewnelson.kmp.tor.controller.internal.controller')
        requires('kmp.tor.common.jvm')
        requires('kmp.tor.controller.common.jvm')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
        requires('kotlin.stdlib')
        requires('kotlinx.atomicfu')
        requires('encoding.core.jvm')
@@ -703,7 +620,7 @@ extraJavaModuleInfo {
        requires('kmp.tor.manager.common.jvm')
        requires('kmp.tor.controller.common.jvm')
        requires('kotlin.stdlib')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
    }
    module("kmp-tor-ext-callback-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.common.jvm', "${vKmpTor}") {
        exports('io.matthewnelson.kmp.tor.ext.callback.manager.common')
@@ -717,14 +634,14 @@ extraJavaModuleInfo {
        exports('io.matthewnelson.kmp.tor.binary.geoip')
        exports('kmptor')
    }
-    module("encoding-base16-jvm-1.2.1.jar", 'encoding.base16.jvm', "1.2.1") {
+    module("base16-jvm-2.0.0.jar", 'encoding.base16.jvm', "2.0.0") {
        exports('io.matthewnelson.encoding.base16')
        requires('encoding.core.jvm')
        requires('kotlin.stdlib')
    }
-    module("encoding-base32-jvm-1.2.1.jar", 'encoding.base32.jvm', "1.2.1")
-    module("encoding-base64-jvm-1.2.1.jar", 'encoding.base64.jvm', "1.2.1")
-    module("encoding-core-jvm-1.2.1.jar", 'encoding.core.jvm', "1.2.1") {
+    module("base32-jvm-2.0.0.jar", 'encoding.base32.jvm', "2.0.0")
+    module("base64-jvm-2.0.0.jar", 'encoding.base64.jvm', "2.0.0")
+    module("core-jvm-2.0.0.jar", 'encoding.core.jvm', "2.0.0") {
        exports('io.matthewnelson.encoding.core')
        requires('kotlin.stdlib')
    }
@@ -732,15 +649,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.4"
+GIT_TAG="1.8.4"
 ```

 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.7.5</string>
+  <string>1.8.5</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,6 +21,8 @@ import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
@@ -77,6 +79,7 @@ import java.util.*;
 import java.util.stream.Collectors;

 import static com.sparrowwallet.sparrow.AppServices.*;
+import static com.sparrowwallet.sparrow.control.DownloadVerifierDialog.*;

 public class AppController implements Initializable {
    private static final Logger log = LoggerFactory.getLogger(AppController.class);
@@ -107,6 +110,9 @@ public class AppController implements Initializable {
    @FXML
    private MenuItem exportWallet;

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

@@ -166,6 +172,9 @@ public class AppController implements Initializable {
    @FXML
    private MenuItem lockAllWallets;

+    @FXML
+    private MenuItem showWalletSummary;
+
    @FXML
    private MenuItem searchWallet;

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

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

    @FXML
    private StackPane rootStack;
@@ -210,6 +219,10 @@ public class AppController implements Initializable {

    private Timeline statusTimeline;

+    private SendToManyDialog sendToManyDialog;
+
+    private DownloadVerifierDialog downloadVerifierDialog;
+
    private Tab previouslySelectedTab;

    private boolean subTabsVisible;
@@ -218,6 +231,8 @@ public class AppController implements Initializable {

    private final Set<Wallet> emptyLoadingWallets = new LinkedHashSet<>();

+    private final Map<File, File> renamedWallets = new HashMap<>();
+
    private final ChangeListener<Boolean> serverToggleOnlineListener = (observable, oldValue, newValue) -> {
        Platform.runLater(() -> setServerToggleTooltip(getCurrentBlockHeight()));
    };
@@ -267,7 +282,7 @@ public class AppController implements Initializable {

        rootStack.setOnDragOver(event -> {
            if(event.getGestureSource() != rootStack && event.getDragboard().hasFiles()) {
-                event.acceptTransferModes(TransferMode.COPY_OR_MOVE);
+                event.acceptTransferModes(TransferMode.LINK);
            }
            event.consume();
        });
@@ -276,9 +291,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);
@@ -320,6 +333,10 @@ public class AppController implements Initializable {
            EventManager.get().post(new OpenWalletsEvent(tabs.getScene().getWindow(), Collections.emptyList()));
        });

+        tabs.setPickOnBounds(false);
+
+        registerShortcuts();
+
        BitcoinUnit unit = Config.get().getBitcoinUnit();
        if(unit == null) {
            unit = BitcoinUnit.AUTO;
@@ -328,6 +345,9 @@ public class AppController implements Initializable {
        final BitcoinUnit selectedUnit = unit;
        Optional<Toggle> selectedUnitToggle = bitcoinUnit.getToggles().stream().filter(toggle -> selectedUnit.equals(toggle.getUserData())).findFirst();
        selectedUnitToggle.ifPresent(toggle -> bitcoinUnit.selectToggle(toggle));
+        Optional<Toggle> otherUnitToggle = bitcoinUnit.getToggles().stream().filter(toggle ->
+                (List.of(BitcoinUnit.AUTO, BitcoinUnit.SATOSHIS).contains(selectedUnit) && BitcoinUnit.BTC.equals(toggle.getUserData()) || (selectedUnit == BitcoinUnit.BTC && BitcoinUnit.SATOSHIS.equals(toggle.getUserData())))).findFirst();
+        otherUnitToggle.ifPresent(toggle -> ((RadioMenuItem)toggle).setAccelerator(new KeyCodeCombination(KeyCode.B, KeyCombination.SHORTCUT_DOWN)));

        UnitFormat format = Config.get().getUnitFormat();
        if(format == null) {
@@ -360,7 +380,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);
@@ -370,9 +400,11 @@ public class AppController implements Initializable {
        savePSBTBinary.disableProperty().bind(saveTransaction.visibleProperty());
        showPSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
        exportWallet.setDisable(true);
+        renameWallet.disableProperty().bind(exportWallet.disableProperty());
        deleteWallet.disableProperty().bind(exportWallet.disableProperty());
        closeTab.setDisable(true);
        lockWallet.setDisable(true);
+        showWalletSummary.disableProperty().bind(exportWallet.disableProperty());
        searchWallet.disableProperty().bind(exportWallet.disableProperty());
        refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
        sendToMany.disableProperty().bind(exportWallet.disableProperty());
@@ -397,6 +429,22 @@ public class AppController implements Initializable {
        setNetworkLabel();
    }

+    private void registerShortcuts() {
+        org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
+        if(platform == org.controlsfx.tools.Platform.OSX) {
+            tabs.getScene().addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+                if(event.isShortcutDown() && event.isAltDown() && (event.getCode() == KeyCode.LEFT || event.getCode() == KeyCode.RIGHT)) {
+                    int currentIndex = tabs.getSelectionModel().getSelectedIndex();
+                    if(event.getCode() == KeyCode.LEFT && currentIndex > 0) {
+                        tabs.getSelectionModel().select(currentIndex - 1);
+                    } else if(event.getCode() == KeyCode.RIGHT && currentIndex < tabs.getTabs().size() - 1) {
+                        tabs.getSelectionModel().select(currentIndex + 1);
+                    }
+                }
+            });
+        }
+    }
+
    private void setPlatformApplicationMenu() {
        org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
        if(platform == org.controlsfx.tools.Platform.OSX) {
@@ -440,6 +488,7 @@ public class AppController implements Initializable {

    public void showIntroduction(ActionEvent event) {
        WelcomeDialog welcomeDialog = new WelcomeDialog();
+        welcomeDialog.initOwner(rootStack.getScene().getWindow());
        Optional<Mode> optionalMode = welcomeDialog.showAndWait();
        if(optionalMode.isPresent() && optionalMode.get().equals(Mode.ONLINE)) {
            openPreferences(PreferenceGroup.SERVER);
@@ -464,7 +513,17 @@ public class AppController implements Initializable {
    }

    public void submitBugReport(ActionEvent event) {
-        AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/submitbugreport");
+        ButtonType supportType = new ButtonType("Get Support", ButtonBar.ButtonData.LEFT);
+        ButtonType bugType = new ButtonType("Submit Bug Report", ButtonBar.ButtonData.YES);
+        Optional<ButtonType> optResponse = showWarningDialog("Submit Bug Report", "Please note that this facility is for bug reports and feature requests only. There is a community of Sparrow users who can assist with support requests.", supportType, bugType);
+
+        if(optResponse.isPresent()) {
+            if(optResponse.get() == bugType) {
+                AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/submitbugreport");
+            } else {
+                openSupport(event);
+            }
+        }
    }

    public void showAbout(ActionEvent event) {
@@ -517,7 +576,8 @@ public class AppController implements Initializable {
    }

    public void showInstallUdevMessage() {
-        TextAreaDialog dialog = new TextAreaDialog("sudo " + Config.get().getHwi().getAbsolutePath() + " installudevrules");
+        TextAreaDialog dialog = new TextAreaDialog("sudo " + Config.get().getHwi().getAbsolutePath() + " installudevrules", false);
+        dialog.initOwner(rootStack.getScene().getWindow());
        dialog.setTitle("Install Udev Rules");
        dialog.getDialogPane().setHeaderText("Installing udev rules ensures devices can connect over USB.\nThis command requires root privileges.\nOpen a shell and enter the following:");
        dialog.showAndWait();
@@ -535,9 +595,11 @@ public class AppController implements Initializable {
        );

        AppServices.moveToActiveWindowScreen(window, 800, 450);
-        File file = fileChooser.showOpenDialog(window);
-        if (file != null) {
-            openTransactionFile(file);
+        List<File> files = fileChooser.showOpenMultipleDialog(window);
+        if(files != null) {
+            for(File file : files) {
+                openTransactionFile(file);
+            }
        }
    }

@@ -579,13 +641,14 @@ public class AppController implements Initializable {
            } catch(TransactionParseException e) {
                showErrorDialog("Invalid transaction", e.getMessage());
            } catch(Exception e) {
-                showErrorDialog("Invalid file", e.getMessage());
+                showErrorDialog("Invalid file", "Cannot recognise the format of the " + file.getName() + " file.");
            }
        }
    }

    public void openTransactionFromText(ActionEvent event) {
        TextAreaDialog dialog = new TextAreaDialog();
+        dialog.initOwner(rootStack.getScene().getWindow());
        dialog.setTitle("Open from text");
        dialog.getDialogPane().setHeaderText("Paste a transaction or PSBT:");
        Optional<String> text = dialog.showAndWait();
@@ -604,6 +667,7 @@ public class AppController implements Initializable {

    public void openTransactionFromId(ActionEvent event) {
        TransactionIdDialog dialog = new TransactionIdDialog();
+        dialog.initOwner(rootStack.getScene().getWindow());
        Optional<Sha256Hash> optionalTxId = dialog.showAndWait();
        if(optionalTxId.isPresent()) {
            Sha256Hash txId = optionalTxId.get();
@@ -631,6 +695,7 @@ public class AppController implements Initializable {

    public void openTransactionFromQR(ActionEvent event) {
        QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(rootStack.getScene().getWindow());
        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
        if(optionalResult.isPresent()) {
            QRScanDialog.Result result = optionalResult.get();
@@ -692,8 +757,11 @@ public class AppController implements Initializable {
            Transaction transaction = transactionTabData.getTransaction();

            try {
-                UR ur = UR.fromBytes(transaction.bitcoinSerialize());
-                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur);
+                byte[] txBytes = transaction.bitcoinSerialize();
+                UR ur = UR.fromBytes(txBytes);
+                BBQR bbqr = new BBQR(BBQRType.TXN, txBytes);
+                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, false, false);
+                qrDisplayDialog.initOwner(rootStack.getScene().getWindow());
                qrDisplayDialog.showAndWait();
            } catch(Exception e) {
                log.error("Error creating UR", e);
@@ -790,8 +858,11 @@ public class AppController implements Initializable {
        if(tabData.getType() == TabData.TabType.TRANSACTION) {
            TransactionTabData transactionTabData = (TransactionTabData)tabData;

-            CryptoPSBT cryptoPSBT = new CryptoPSBT(transactionTabData.getPsbt().serialize());
-            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR());
+            byte[] psbtBytes = transactionTabData.getPsbt().serialize();
+            CryptoPSBT cryptoPSBT = new CryptoPSBT(psbtBytes);
+            BBQR bbqr = new BBQR(BBQRType.PSBT, psbtBytes);
+            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR(), bbqr, false, true, false);
+            qrDisplayDialog.initOwner(rootStack.getScene().getWindow());
            qrDisplayDialog.show();
        }
    }
@@ -836,6 +907,10 @@ public class AppController implements Initializable {
        }
    }

+    public void renameWallet(ActionEvent event) {
+        renameWallet(getSelectedWalletForm());
+    }
+
    public void deleteWallet(ActionEvent event) {
        deleteWallet(getSelectedWalletForm());
    }
@@ -901,19 +976,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));
@@ -926,11 +1028,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);
+            }
        }
    }

@@ -953,6 +1063,7 @@ public class AppController implements Initializable {

    public void newWallet(ActionEvent event) {
        WalletNameDialog dlg = new WalletNameDialog();
+        dlg.initOwner(rootStack.getScene().getWindow());
        Optional<WalletNameDialog.NameAndBirthDate> optNameAndBirthDate = dlg.showAndWait();
        if(optNameAndBirthDate.isPresent()) {
            WalletNameDialog.NameAndBirthDate nameAndBirthDate = optNameAndBirthDate.get();
@@ -974,9 +1085,11 @@ public class AppController implements Initializable {
        fileChooser.setInitialDirectory(Storage.getWalletsDir());

        AppServices.moveToActiveWindowScreen(window, 800, 450);
-        File file = fileChooser.showOpenDialog(window);
-        if(file != null) {
-            openWalletFile(file, forceSameWindow);
+        List<File> files = fileChooser.showOpenMultipleDialog(window);
+        if(files != null) {
+            for(File file : files) {
+                openWalletFile(file, forceSameWindow);
+            }
        }
    }

@@ -1002,6 +1115,7 @@ public class AppController implements Initializable {
                loadWalletService.start();
            } else {
                WalletPasswordDialog dlg = new WalletPasswordDialog(storage.getWalletName(null), WalletPasswordDialog.PasswordRequirement.LOAD);
+                dlg.initOwner(rootStack.getScene().getWindow());
                Optional<SecureString> optionalPassword = dlg.showAndWait();
                if(optionalPassword.isEmpty()) {
                    return;
@@ -1070,6 +1184,7 @@ public class AppController implements Initializable {
    public void importWallet(ActionEvent event) {
        List<WalletForm> selectedWalletForms = getSelectedWalletForms();
        WalletImportDialog dlg = new WalletImportDialog(selectedWalletForms);
+        dlg.initOwner(rootStack.getScene().getWindow());
        Optional<Wallet> optionalWallet = dlg.showAndWait();
        if(optionalWallet.isPresent()) {
            Wallet wallet = optionalWallet.get();
@@ -1107,6 +1222,7 @@ public class AppController implements Initializable {
            try(FileInputStream inputStream = new FileInputStream(file)) {
                if(importer.isEncrypted(file) && password == null) {
                    WalletPasswordDialog dlg = new WalletPasswordDialog(file.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    dlg.initOwner(rootStack.getScene().getWindow());
                    Optional<SecureString> optionalPassword = dlg.showAndWait();
                    if(optionalPassword.isPresent()) {
                        password = optionalPassword.get();
@@ -1129,6 +1245,7 @@ public class AppController implements Initializable {

    private void addImportedWallet(Wallet wallet) {
        WalletNameDialog nameDlg = new WalletNameDialog(wallet.getName(), true, wallet.getBirthDate());
+        nameDlg.initOwner(rootStack.getScene().getWindow());
        Optional<WalletNameDialog.NameAndBirthDate> optNameAndBirthDate = nameDlg.showAndWait();
        if(optNameAndBirthDate.isPresent()) {
            WalletNameDialog.NameAndBirthDate nameAndBirthDate = optNameAndBirthDate.get();
@@ -1174,6 +1291,7 @@ public class AppController implements Initializable {

        Storage storage = new Storage(Storage.getWalletFile(wallet.getName()));
        WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getName(), WalletPasswordDialog.PasswordRequirement.UPDATE_NEW);
+        dlg.initOwner(rootStack.getScene().getWindow());
        Optional<SecureString> password = dlg.showAndWait();
        if(password.isPresent()) {
            if(password.get().length() == 0) {
@@ -1239,7 +1357,8 @@ public class AppController implements Initializable {
    public void exportWallet(ActionEvent event) {
        WalletForm selectedWalletForm = getSelectedWalletForm();
        if(selectedWalletForm != null) {
-            WalletExportDialog dlg = new WalletExportDialog(selectedWalletForm.getWallet());
+            WalletExportDialog dlg = new WalletExportDialog(selectedWalletForm);
+            dlg.initOwner(rootStack.getScene().getWindow());
            Optional<Wallet> wallet = dlg.showAndWait();
            if(wallet.isPresent()) {
                //Successful export
@@ -1257,6 +1376,7 @@ public class AppController implements Initializable {

    private void openPreferences(PreferenceGroup preferenceGroup) {
        PreferencesDialog preferencesDialog = new PreferencesDialog(preferenceGroup);
+        preferencesDialog.initOwner(rootStack.getScene().getWindow());
        preferencesDialog.showAndWait();
        configureSwitchServer();
        serverToggle.setDisable(!Config.get().hasServer());
@@ -1267,8 +1387,7 @@ public class AppController implements Initializable {
        WalletForm selectedWalletForm = getSelectedWalletForm();
        if(selectedWalletForm != null) {
            Wallet wallet = selectedWalletForm.getWallet();
-            if(wallet.getKeystores().size() == 1 &&
-                    (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
+            if(wallet.getKeystores().size() == 1) {
                //Can sign and verify
                messageSignDialog = new MessageSignDialog(wallet);
            }
@@ -1279,10 +1398,18 @@ public class AppController implements Initializable {
            messageSignDialog = new MessageSignDialog();
        }

+        messageSignDialog.initOwner(rootStack.getScene().getWindow());
        messageSignDialog.showAndWait();
    }

    public void sendToMany(ActionEvent event) {
+        if(sendToManyDialog != null) {
+            Stage stage = (Stage)sendToManyDialog.getDialogPane().getScene().getWindow();
+            stage.setAlwaysOnTop(true);
+            stage.setAlwaysOnTop(false);
+            return;
+        }
+
        WalletForm selectedWalletForm = getSelectedWalletForm();
        if(selectedWalletForm != null) {
            Wallet wallet = selectedWalletForm.getWallet();
@@ -1291,11 +1418,14 @@ public class AppController implements Initializable {
                bitcoinUnit = wallet.getAutoUnit();
            }

-            SendToManyDialog sendToManyDialog = new SendToManyDialog(bitcoinUnit);
+            sendToManyDialog = new SendToManyDialog(bitcoinUnit);
+            sendToManyDialog.initOwner(rootStack.getScene().getWindow());
+            sendToManyDialog.initModality(Modality.NONE);
            Optional<List<Payment>> optPayments = sendToManyDialog.showAndWait();
+            sendToManyDialog = null;
            optPayments.ifPresent(payments -> {
                if(!payments.isEmpty()) {
-                    EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getWalletUtxos().keySet())));
+                    EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getSpendableUtxos().keySet())));
                    Platform.runLater(() -> EventManager.get().post(new SendPaymentsEvent(wallet, payments)));
                }
            });
@@ -1310,6 +1440,7 @@ public class AppController implements Initializable {
        }

        PrivateKeySweepDialog dialog = new PrivateKeySweepDialog(wallet);
+        dialog.initOwner(rootStack.getScene().getWindow());
        Optional<Transaction> optTransaction = dialog.showAndWait();
        optTransaction.ifPresent(transaction -> addTransactionTab(null, null, transaction));
    }
@@ -1323,6 +1454,7 @@ public class AppController implements Initializable {
                if(wallet.isEncrypted()) {
                    Wallet copy = wallet.copy();
                    WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    dlg.initOwner(rootStack.getScene().getWindow());
                    Optional<SecureString> password = dlg.showAndWait();
                    if(password.isPresent()) {
                        Storage storage = selectedWalletForm.getStorage();
@@ -1336,6 +1468,7 @@ public class AppController implements Initializable {
                            try {
                                soroban.setHDWallet(copy);
                                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
                                if(Config.get().isSameAppMixing()) {
                                    counterpartyDialog.initModality(Modality.NONE);
                                }
@@ -1363,6 +1496,7 @@ public class AppController implements Initializable {
                } else {
                    soroban.setHDWallet(wallet);
                    CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                    counterpartyDialog.initOwner(rootStack.getScene().getWindow());
                    if(Config.get().isSameAppMixing()) {
                        counterpartyDialog.initModality(Modality.NONE);
                    }
@@ -1370,6 +1504,7 @@ public class AppController implements Initializable {
                }
            } else {
                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                counterpartyDialog.initOwner(rootStack.getScene().getWindow());
                if(Config.get().isSameAppMixing()) {
                    counterpartyDialog.initModality(Modality.NONE);
                }
@@ -1382,10 +1517,28 @@ public class AppController implements Initializable {
        WalletForm selectedWalletForm = getSelectedWalletForm();
        if(selectedWalletForm != null) {
            PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId());
+            payNymDialog.initOwner(rootStack.getScene().getWindow());
            payNymDialog.showAndWait();
        }
    }

+    public void verifyDownload(ActionEvent event) {
+        if(downloadVerifierDialog != null) {
+            Stage stage = (Stage)downloadVerifierDialog.getDialogPane().getScene().getWindow();
+            stage.setAlwaysOnTop(true);
+            stage.setAlwaysOnTop(false);
+            if(event.getSource() instanceof File file) {
+                downloadVerifierDialog.setSignatureFile(file);
+            }
+            return;
+        }
+
+        downloadVerifierDialog = new DownloadVerifierDialog(event.getSource() instanceof File file ? file : null);
+        downloadVerifierDialog.initOwner(rootStack.getScene().getWindow());
+        downloadVerifierDialog.showAndWait();
+        downloadVerifierDialog = null;
+    }
+
    public void minimizeToTray(ActionEvent event) {
        AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
    }
@@ -1427,13 +1580,52 @@ public class AppController implements Initializable {
                TabPane subTabs = (TabPane) selectedTab.getContent();
                List<WalletForm> walletForms = subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm()).collect(Collectors.toList());
                if(!walletForms.isEmpty()) {
-                    SearchWalletDialog searchWalletDialog = new SearchWalletDialog(walletForms);
-                    Optional<Entry> optEntry = searchWalletDialog.showAndWait();
-                    if(optEntry.isPresent()) {
-                        Entry entry = optEntry.get();
-                        EventManager.get().post(new FunctionActionEvent(entry.getWalletFunction(), entry.getWallet()));
-                        Platform.runLater(() -> EventManager.get().post(new SelectEntryEvent(entry)));
-                    }
+                    searchWallets(walletForms);
+                }
+            }
+        }
+    }
+
+    public void searchAllWallets(ActionEvent event) {
+        List<WalletForm> allWalletForms = new ArrayList<>();
+        for(Tab tab : tabs.getTabs()) {
+            TabData tabData = (TabData)tab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane)tab.getContent();
+                allWalletForms.addAll(subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm())
+                        .filter(walletForm -> walletForm.getWallet().isValid() && !walletForm.isLocked()).collect(Collectors.toList()));
+            }
+        }
+
+        if(allWalletForms.isEmpty()) {
+            showErrorDialog("No wallets", "There are no open and unlocked wallets to search.");
+        } else {
+            searchWallets(allWalletForms);
+        }
+    }
+
+    private void searchWallets(List<WalletForm> walletForms) {
+        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)));
+        }
+    }
+
+    public void showWalletSummary(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        if(selectedTab != null) {
+            TabData tabData = (TabData) selectedTab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane) selectedTab.getContent();
+                List<WalletForm> walletForms = subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm()).collect(Collectors.toList());
+                if(!walletForms.isEmpty()) {
+                    WalletSummaryDialog walletSummaryDialog = new WalletSummaryDialog(walletForms);
+                    walletSummaryDialog.initOwner(rootStack.getScene().getWindow());
+                    walletSummaryDialog.showAndWait();
                }
            }
        }
@@ -1524,6 +1716,11 @@ public class AppController implements Initializable {

            tabs.getTabs().add(tab);
            tabs.getSelectionModel().select(tab);
+
+            File oldWalletFile = renamedWallets.remove(storage.getWalletFile());
+            if(oldWalletFile != null) {
+                deleteStorage(new Storage(oldWalletFile), false);
+            }
        } else {
            for(Tab walletTab : tabs.getTabs()) {
                TabData tabData = (TabData)walletTab.getUserData();
@@ -1600,6 +1797,9 @@ public class AppController implements Initializable {
            subTabLabel.setGraphic(getSubTabGlyph(wallet));
            subTabLabel.setContentDisplay(ContentDisplay.TOP);
            subTabLabel.setAlignment(Pos.TOP_CENTER);
+            if(isSubTabLabelTruncated(subTabLabel, label)) {
+                subTabLabel.setTooltip(new Tooltip(label));
+            }
            subTab.setGraphic(subTabLabel);
            FXMLLoader walletLoader = new FXMLLoader(getClass().getResource("wallet/wallet.fxml"));
            subTab.setContent(walletLoader.load());
@@ -1853,6 +2053,7 @@ public class AppController implements Initializable {
            tabs.getTabs().add(index + 1, tab);
            tabs.getTabs().addListener(tabsChangeListener);
            tabs.getSelectionModel().select(tab);
+            EventManager.get().post(new RequestOpenWalletsEvent());   //Rearrange recent files list
        });
        MenuItem moveLeft = new MenuItem("Move Left");
        moveLeft.setOnAction(event -> {
@@ -1862,6 +2063,7 @@ public class AppController implements Initializable {
            tabs.getTabs().add(index - 1, tab);
            tabs.getTabs().addListener(tabsChangeListener);
            tabs.getSelectionModel().select(tab);
+            EventManager.get().post(new RequestOpenWalletsEvent());   //Rearrange recent files list
        });
        contextMenu.getItems().addAll(moveRight, moveLeft);

@@ -1944,12 +2146,38 @@ public class AppController implements Initializable {
        }
    }

+    private void renameWallet(WalletForm selectedWalletForm) {
+        WalletNameDialog walletNameDialog = new WalletNameDialog(selectedWalletForm.getMasterWallet().getName(), false, null, true);
+        walletNameDialog.initOwner(rootStack.getScene().getWindow());
+        Optional<WalletNameDialog.NameAndBirthDate> optName = walletNameDialog.showAndWait();
+        if(optName.isPresent()) {
+            File walletFile = Storage.getWalletFile(optName.get().getName() + "." + PersistenceType.DB.getExtension());
+            if(walletFile.exists()) {
+                showErrorDialog("Error renaming wallet", "Wallet file " + walletFile.getAbsolutePath() + " already exists.");
+                return;
+            }
+
+            Storage.CopyWalletService copyWalletService = new Storage.CopyWalletService(selectedWalletForm.getWallet(), walletFile);
+            copyWalletService.setOnSucceeded(event -> {
+                renamedWallets.put(walletFile, selectedWalletForm.getStorage().getWalletFile());
+                tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
+                openWalletFile(walletFile, true);
+            });
+            copyWalletService.setOnFailed(event -> {
+                log.error("Error renaming wallet", event.getSource().getException());
+                showErrorDialog("Error renaming wallet", event.getSource().getException().getMessage());
+            });
+            copyWalletService.start();
+        }
+    }
+
    private void deleteWallet(WalletForm selectedWalletForm) {
        Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Delete " + selectedWalletForm.getWallet().getMasterName() + "?", "The wallet file and any backups will be deleted. Are you sure?", ButtonType.NO, ButtonType.YES);
        if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
            Storage storage = selectedWalletForm.getStorage();
            if(selectedWalletForm.getMasterWallet().isEncrypted()) {
                WalletPasswordDialog dlg = new WalletPasswordDialog(selectedWalletForm.getWallet().getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                dlg.initOwner(rootStack.getScene().getWindow());
                Optional<SecureString> password = dlg.showAndWait();
                if(password.isPresent()) {
                    Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
@@ -1959,7 +2187,7 @@ public class AppController implements Initializable {

                        try {
                            tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
-                            deleteStorage(storage);
+                            deleteStorage(storage, true);
                        } finally {
                            encryptionFullKey.clear();
                            password.get().clear();
@@ -1981,15 +2209,15 @@ public class AppController implements Initializable {
                }
            } else {
                tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
-                deleteStorage(storage);
+                deleteStorage(storage, true);
            }
        }
    }

-    private void deleteStorage(Storage storage) {
+    private void deleteStorage(Storage storage, boolean deleteBackups) {
        if(storage.isClosed()) {
            Platform.runLater(() -> {
-                Storage.DeleteWalletService deleteWalletService = new Storage.DeleteWalletService(storage);
+                Storage.DeleteWalletService deleteWalletService = new Storage.DeleteWalletService(storage, deleteBackups);
                deleteWalletService.setDelay(Duration.seconds(3));
                deleteWalletService.setPeriod(Duration.hours(1));
                deleteWalletService.setOnSucceeded(event -> {
@@ -2005,7 +2233,7 @@ public class AppController implements Initializable {
                deleteWalletService.start();
            });
        } else {
-            Platform.runLater(() -> deleteStorage(storage));
+            Platform.runLater(() -> deleteStorage(storage, deleteBackups));
        }
    }

@@ -2017,10 +2245,16 @@ public class AppController implements Initializable {
        rename.setOnAction(event -> {
            Label subTabLabel = (Label)subTab.getGraphic();
            WalletLabelDialog walletLabelDialog = new WalletLabelDialog(subTabLabel.getText());
+            walletLabelDialog.initOwner(rootStack.getScene().getWindow());
            Optional<String> optLabel = walletLabelDialog.showAndWait();
            if(optLabel.isPresent()) {
                String label = optLabel.get();
                subTabLabel.setText(label);
+                if(isSubTabLabelTruncated(subTabLabel, label)) {
+                    subTabLabel.setTooltip(new Tooltip(label));
+                } else {
+                    subTabLabel.setTooltip(null);
+                }

                Wallet renamedWallet = AppServices.get().getWallet(walletId);
                renamedWallet.setLabel(label);
@@ -2045,9 +2279,18 @@ public class AppController implements Initializable {
            contextMenu.getItems().add(delete);
        }

+        contextMenu.setOnShowing(event -> {
+            Wallet renameWallet = AppServices.get().getWallet(walletId);
+            rename.setDisable(!renameWallet.isValid());
+        });
+
        return contextMenu;
    }

+    private boolean isSubTabLabelTruncated(Label subTabLabel, String label) {
+        return TextUtils.computeTextWidth(subTabLabel.getFont(), label, 0.0D) > (90-6);
+    }
+
    private void configureSwitchServer() {
        switchServer.getItems().clear();

@@ -2542,7 +2785,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);
@@ -2797,6 +3040,14 @@ public class AppController implements Initializable {
    public void bitcoinUnitChanged(BitcoinUnitChangedEvent event) {
        Optional<Toggle> selectedToggle = bitcoinUnit.getToggles().stream().filter(toggle -> event.getBitcoinUnit().equals(toggle.getUserData())).findFirst();
        selectedToggle.ifPresent(toggle -> bitcoinUnit.selectToggle(toggle));
+        bitcoinUnit.getToggles().forEach(toggle -> {
+            RadioMenuItem menuItem = (RadioMenuItem)toggle;
+            if(List.of(BitcoinUnit.AUTO, BitcoinUnit.SATOSHIS).contains(event.getBitcoinUnit()) && BitcoinUnit.BTC.equals(toggle.getUserData()) || (event.getBitcoinUnit() == BitcoinUnit.BTC && BitcoinUnit.SATOSHIS.equals(toggle.getUserData()))) {
+                menuItem.setAccelerator(new KeyCodeCombination(KeyCode.B, KeyCombination.SHORTCUT_DOWN));
+            } else {
+                menuItem.setAccelerator(null);
+            }
+        });
    }

    @Subscribe
@@ -2849,6 +3100,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,7 +24,6 @@ import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
-import com.sparrowwallet.sparrow.paynym.PayNymService;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Application;
@@ -34,6 +33,7 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import javafx.concurrent.Worker;
 import javafx.fxml.FXMLLoader;
@@ -63,11 +63,14 @@ import java.io.IOException;
 import java.net.*;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 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);

@@ -78,13 +81,17 @@ public class AppServices {
    private static final int RATES_PERIOD_SECS = 5 * 60;
    private static final int VERSION_CHECK_PERIOD_HOURS = 24;
    private static final int CONNECTION_DELAY_SECS = 2;
+    private static final int RATES_DELAY_SECS_DEFAULT = 2;
+    private static final int RATES_DELAY_SECS_WINDOWS = 5;
    private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
    private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
    private static final String TOR_DEFAULT_PROXY_CIRCUIT_ID = "default";

    public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50);
-    public static final List<Long> FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L);
+    public static final List<Long> LONG_FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L, 2048L, 4096L, 8192L);
+    public static final List<Long> FEE_RATES_RANGE = LONG_FEE_RATES_RANGE.subList(0, LONG_FEE_RATES_RANGE.size() - 3);
    public static final double FALLBACK_FEE_RATE = 20000d / 1000;
+    public static final double TESTNET_FALLBACK_FEE_RATE = 1000d / 1000;

    private static AppServices INSTANCE;

@@ -94,7 +101,7 @@ public class AppServices {

    private InteractionServices interactionServices;

-    private static PayNymService payNymService;
+    private static HttpClientService httpClientService;

    private final Application application;

@@ -110,6 +117,8 @@ public class AppServices {

    private ElectrumServer.ConnectionService connectionService;

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

    private VersionCheckService versionCheckService;
@@ -158,6 +167,11 @@ public class AppServices {
                connectionService.cancel();
                ratesService.cancel();
                versionCheckService.cancel();
+
+                if(httpClientService != null) {
+                    HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
+                    shutdownService.start();
+                }
            }
        }
    };
@@ -181,6 +195,7 @@ public class AppServices {
    public void start() {
        Config config = Config.get();
        connectionService = createConnectionService();
+        feeRatesService = createFeeRatesService();
        ratesService = createRatesService(config.getExchangeSource(), config.getFiatCurrency());
        versionCheckService = createVersionCheckService();
        torService = createTorService();
@@ -194,6 +209,8 @@ public class AppServices {
            } else {
                restartServices();
            }
+        } else {
+            EventManager.get().post(new DisconnectionEvent());
        }

        addURIHandlers();
@@ -245,8 +262,8 @@ public class AppServices {
            versionCheckService.cancel();
        }

-        if(payNymService != null) {
-            PayNymService.ShutdownService shutdownService = new PayNymService.ShutdownService(payNymService);
+        if(httpClientService != null) {
+            HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
            shutdownService.start();
        }

@@ -277,8 +294,15 @@ public class AppServices {
            onlineProperty.setValue(true);
            onlineProperty.addListener(onlineServicesListener);

-            if(connectionService.getValue() != null) {
-                EventManager.get().post(connectionService.getValue());
+            FeeRatesUpdatedEvent event = connectionService.getValue();
+            if(event != null) {
+                EventManager.get().post(event);
+            }
+
+            FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
+            feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
+            if(event instanceof ConnectionEvent && Network.get().equals(Network.MAINNET) && feeRatesSource.isExternal()) {
+                EventManager.get().post(new FeeRatesSourceChangedEvent(feeRatesSource));
            }
        });
        connectionService.setOnFailed(failEvent -> {
@@ -349,10 +373,21 @@ public class AppServices {
        return connectionService;
    }

+    private ElectrumServer.FeeRatesService createFeeRatesService() {
+        ElectrumServer.FeeRatesService feeRatesService = new ElectrumServer.FeeRatesService();
+        feeRatesService.setOnSucceeded(workerStateEvent -> {
+            EventManager.get().post(feeRatesService.getValue());
+        });
+
+        return feeRatesService;
+    }
+
    private ExchangeSource.RatesService createRatesService(ExchangeSource exchangeSource, Currency currency) {
        ExchangeSource.RatesService ratesService = new ExchangeSource.RatesService(
                exchangeSource == null ? DEFAULT_EXCHANGE_SOURCE : exchangeSource,
                currency == null ? DEFAULT_FIAT_CURRENCY : currency);
+        //Delay startup on first run, Windows requires a longer delay
+        ratesService.setDelay(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS ? Duration.seconds(RATES_DELAY_SECS_WINDOWS) : Duration.seconds(RATES_DELAY_SECS_DEFAULT));
        ratesService.setPeriod(Duration.seconds(RATES_PERIOD_SECS));
        ratesService.setRestartOnFailure(true);

@@ -511,18 +546,17 @@ public class AppServices {
        return get().interactionServices;
    }

-    public static PayNymService getPayNymService() {
-        if(payNymService == null) {
-            HostAndPort torProxy = getTorProxy();
-            payNymService = new PayNymService(torProxy);
+    public static HttpClientService getHttpClientService() {
+        HostAndPort torProxy = getTorProxy();
+        if(httpClientService == null) {
+            httpClientService = new HttpClientService(torProxy);
        } else {
-            HostAndPort torProxy = getTorProxy();
-            if(!Objects.equals(payNymService.getTorProxy(), torProxy)) {
-                payNymService.setTorProxy(getTorProxy());
+            if(!Objects.equals(httpClientService.getTorProxy(), torProxy)) {
+                httpClientService.setTorProxy(getTorProxy());
            }
        }

-        return payNymService;
+        return httpClientService;
    }

    public static HostAndPort getTorProxy() {
@@ -563,8 +597,17 @@ public class AppServices {
        return windowIcon;
    }

+    public static boolean isReducedWindowHeight() {
+        Window activeWindow = getActiveWindow();
+        return (activeWindow != null && activeWindow.getHeight() < getReducedWindowHeight());
+    }
+
    public static boolean isReducedWindowHeight(Node node) {
-        return (node.getScene() != null && node.getScene().getWindow().getHeight() < 768);
+        return (node.getScene() != null && node.getScene().getWindow().getHeight() < getReducedWindowHeight());
+    }
+
+    private static double getReducedWindowHeight() {
+        return org.controlsfx.tools.Platform.getCurrent() != org.controlsfx.tools.Platform.OSX ? 802d : 768d;  //Check for menu bar of ~34px
    }

    public Application getApplication() {
@@ -651,15 +694,19 @@ public class AppServices {

    public static Double getDefaultFeeRate() {
        int defaultTarget = TARGET_BLOCKS_RANGE.get((TARGET_BLOCKS_RANGE.size() / 2) - 1);
-        return getTargetBlockFeeRates() == null ? FALLBACK_FEE_RATE : getTargetBlockFeeRates().get(defaultTarget);
+        return getTargetBlockFeeRates() == null ? getFallbackFeeRate() : getTargetBlockFeeRates().get(defaultTarget);
    }

    public static Double getMinimumFeeRate() {
        Optional<Double> optMinFeeRate = getTargetBlockFeeRates().values().stream().min(Double::compareTo);
-        Double minRate = optMinFeeRate.orElse(FALLBACK_FEE_RATE);
+        Double minRate = optMinFeeRate.orElse(getFallbackFeeRate());
        return Math.max(minRate, Transaction.DUST_RELAY_TX_FEE);
    }

+    public static double getFallbackFeeRate() {
+        return Network.get() == Network.MAINNET ? FALLBACK_FEE_RATE : TESTNET_FALLBACK_FEE_RATE;
+    }
+
    public static Map<Integer, Double> getTargetBlockFeeRates() {
        return targetBlockFeeRates;
    }
@@ -669,6 +716,10 @@ public class AppServices {
    }

    private void addMempoolRateSizes(Set<MempoolRateSize> rateSizes) {
+        if(rateSizes.isEmpty()) {
+            return;
+        }
+
        LocalDateTime dateMinute = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES);
        if(mempoolHistogram.isEmpty()) {
            mempoolHistogram.put(Date.from(dateMinute.minusMinutes(1).atZone(ZoneId.systemDefault()).toInstant()), rateSizes);
@@ -678,6 +729,12 @@ public class AppServices {

        Date yesterday = Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant());
        mempoolHistogram.keySet().removeIf(date -> date.before(yesterday));
+
+        ZonedDateTime twoHoursAgo = LocalDateTime.now().minusHours(2).atZone(ZoneId.systemDefault());
+        mempoolHistogram.keySet().removeIf(date -> {
+            ZonedDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault());
+            return dateTime.isBefore(twoHoursAgo) && (dateTime.getMinute() % 10 != 0);
+        });
    }

    public static Double getMinimumRelayFeeRate() {
@@ -755,7 +812,7 @@ public class AppServices {
    }

    public static Window getActiveWindow() {
-        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : null);
+        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : (Stage.getWindows().iterator().hasNext() ? Stage.getWindows().iterator().next() : null));
    }

    public static void moveToActiveWindowScreen(Dialog<?> dialog) {
@@ -828,6 +885,25 @@ public class AppServices {
        }
    }

+    public static void openFileUriArgumentsAfterWalletLoading(Window window) {
+        if(!argFiles.isEmpty() || !argUris.isEmpty()) {
+            Service<Void> service = new Service<>() {
+                @Override
+                protected Task<Void> createTask() {
+                    return new Task<>() {
+                        @Override
+                        protected Void call() {
+                            Platform.runLater(() -> openFileUriArguments(window));
+                            return null;
+                        }
+                    };
+                }
+            };
+            service.setExecutor(Storage.LoadWalletService.getSingleThreadedExecutor());
+            service.start();
+        }
+    }
+
    public static void openFileUriArguments(Window window) {
        openFiles(argFiles, window);
        argFiles.clear();
@@ -854,6 +930,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));
                }
@@ -897,7 +975,7 @@ public class AppServices {

            if(wallet != null) {
                final Wallet sendingWallet = wallet;
-                EventManager.get().post(new SendActionEvent(sendingWallet, new ArrayList<>(sendingWallet.getWalletUtxos().keySet()), true));
+                EventManager.get().post(new SendActionEvent(sendingWallet, new ArrayList<>(sendingWallet.getSpendableUtxos().keySet()), true));
                Platform.runLater(() -> EventManager.get().post(new SendPaymentsEvent(sendingWallet, List.of(bitcoinURI.toPayment()))));
            }
        } catch(Exception e) {
@@ -937,6 +1015,7 @@ public class AppServices {
                    Storage storage = AppServices.get().getOpenWallets().get(wallet);
                    Wallet copy = wallet.copy();
                    WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    dlg.initOwner(getActiveWindow());
                    Optional<SecureString> password = dlg.showAndWait();
                    if(password.isPresent()) {
                        Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
@@ -999,6 +1078,7 @@ public class AppServices {
            wallet = wallets.iterator().next();
        } else {
            ChoiceDialog<Wallet> walletChoiceDialog = new ChoiceDialog<>(wallets.iterator().next(), wallets);
+            walletChoiceDialog.initOwner(getActiveWindow());
            walletChoiceDialog.setTitle("Choose Wallet");
            walletChoiceDialog.setHeaderText("Choose a wallet to " + actionDescription);
            Image image = new Image("/image/sparrow-small.png");
@@ -1022,8 +1102,6 @@ public class AppServices {
    public void newConnection(ConnectionEvent event) {
        currentBlockHeight = event.getBlockHeight();
        System.setProperty(Network.BLOCK_HEIGHT_PROPERTY, Integer.toString(currentBlockHeight));
-        targetBlockFeeRates = event.getTargetBlockFeeRates();
-        addMempoolRateSizes(event.getMempoolRateSizes());
        minimumRelayFeeRate = Math.max(event.getMinimumRelayFeeRate(), Transaction.DEFAULT_MIN_RELAY_FEE);
        latestBlockHeader = event.getBlockHeader();
        Config.get().addRecentServer();
@@ -1046,17 +1124,22 @@ public class AppServices {
    @Subscribe
    public void feesUpdated(FeeRatesUpdatedEvent event) {
        targetBlockFeeRates = event.getTargetBlockFeeRates();
-        addMempoolRateSizes(event.getMempoolRateSizes());
+    }
+
+    @Subscribe
+    public void mempoolRateSizes(MempoolRateSizesUpdatedEvent event) {
+        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;
+    }
 }
@@ -15,13 +15,13 @@ import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

-import static com.sparrowwallet.sparrow.AppServices.moveToActiveWindowScreen;
-import static com.sparrowwallet.sparrow.AppServices.setStageIcon;
+import static com.sparrowwallet.sparrow.AppServices.*;

 public class DefaultInteractionServices implements InteractionServices {
    @Override
    public Optional<ButtonType> showAlert(String title, String content, Alert.AlertType alertType, Node graphic, ButtonType... buttons) {
        Alert alert = new Alert(alertType, content, buttons);
+        alert.initOwner(getActiveWindow());
        setStageIcon(alert.getDialogPane().getScene().getWindow());
        alert.getDialogPane().getScene().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
        alert.setTitle(title);
@@ -53,6 +53,8 @@ public class DefaultInteractionServices implements InteractionServices {
            alert.getDialogPane().setPrefHeight(200 + numLines * 20);
        }

+        alert.setResizable(true);
+
        moveToActiveWindowScreen(alert);
        return alert.showAndWait();
    }
@@ -60,6 +62,7 @@ public class DefaultInteractionServices implements InteractionServices {
    @Override
    public Optional<String> requestPassphrase(String walletName, Keystore keystore) {
        KeystorePassphraseDialog passphraseDialog = new KeystorePassphraseDialog(walletName, keystore);
+        passphraseDialog.initOwner(getActiveWindow());
        return passphraseDialog.showAndWait();
    }
 }
@@ -45,6 +45,7 @@ public class SparrowDesktop extends Application {
        GlyphFontRegistry.register(new FontAwesome5());
        GlyphFontRegistry.register(new FontAwesome5Brands());
        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
+        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Italic.ttf"), 11);
        URL.setURLStreamHandlerFactory(protocol -> WalletIcon.PROTOCOL.equals(protocol) ? new WalletIcon.WalletIconStreamHandler() : null);

        AppServices.initialize(this);
@@ -79,6 +80,7 @@ public class SparrowDesktop extends Application {
        }

        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
+        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_NETWORKS_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));

        if(Config.get().getAppHeight() != null && Config.get().getAppWidth() != null) {
            mainStage.setWidth(Config.get().getAppWidth());
@@ -106,7 +108,7 @@ public class SparrowDesktop extends Application {
            }
        }

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

        AppServices.get().start();
    }
@@ -16,9 +16,9 @@ import java.io.File;
 import java.util.*;

 public class SparrowWallet {
-    public static final String APP_ID = "com.sparrowwallet.sparrow";
+    public static final String APP_ID = "sparrow";
    public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.7.5";
+    public static final String APP_VERSION = "1.8.5";
    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());
@@ -17,7 +17,11 @@ import org.controlsfx.glyphfont.Glyph;
 import java.util.ArrayList;
 import java.util.List;

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

@@ -53,13 +57,15 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {

        List<StandardAccount> availableAccounts = new ArrayList<>();
        for(StandardAccount standardAccount : StandardAccount.values()) {
-            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(standardAccount)) {
+            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.isWhirlpoolAccount(standardAccount) && availableAccounts.size() <= MAX_SHOWN_ACCOUNTS) {
                availableAccounts.add(standardAccount);
            }
        }

        if(WhirlpoolServices.canWalletMix(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
-            availableAccounts.add(StandardAccount.WHIRLPOOL_PREMIX);
+            availableAccounts.add(WHIRLPOOL_PREMIX);
+        } else if(WhirlpoolServices.canWatchPostmix(masterWallet) && !existingIndexes.contains(WHIRLPOOL_POSTMIX.getAccountNumber())) {
+            availableAccounts.add(WHIRLPOOL_POSTMIX);
        }

        final ButtonType discoverButtonType = new javafx.scene.control.ButtonType("Discover", ButtonBar.ButtonData.LEFT);
@@ -82,10 +88,14 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {
                    return "None Available";
                }

-                if(StandardAccount.WHIRLPOOL_ACCOUNTS.contains(account)) {
+                if(account == WHIRLPOOL_PREMIX) {
                    return "Whirlpool Accounts";
                }

+                if(account == WHIRLPOOL_POSTMIX) {
+                    return "Whirlpool Postmix (No mixing)";
+                }
+
                return account.getName();
            }

@@ -40,7 +40,7 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
            if(utxoEntry != null) {
                Address address = addressStatus.getAddress();
                setText(address.toString());
-                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode()), false));
+                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode()), false, getTreeTableView()));
                Tooltip tooltip = new Tooltip();
                tooltip.setShowDelay(Duration.millis(250));
                tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate(), addressStatus.isDustAttack()));
@@ -4,8 +4,7 @@ import com.google.common.base.Throwables;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
-import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
@@ -26,12 +25,17 @@ import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.smartcardio.CardException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Optional;

 import static com.sparrowwallet.sparrow.io.CardApi.isReaderAvailable;

@@ -39,7 +43,7 @@ public class CardImportPane extends TitledDescriptionPane {
    private static final Logger log = LoggerFactory.getLogger(CardImportPane.class);

    private final KeystoreCardImport importer;
-    private final List<ChildNumber> derivation;
+    private List<ChildNumber> derivation;
    protected Button importButton;
    private final SimpleStringProperty pin = new SimpleStringProperty("");

@@ -70,21 +74,21 @@ public class CardImportPane extends TitledDescriptionPane {
            return;
        }

-        if(pin.get().length() < 6) {
-            setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
-            setContent(getPinEntry());
-            showHideLink.setVisible(false);
-            setExpanded(true);
-            importButton.setDisable(false);
-            return;
-        }
-
        StringProperty messageProperty = new SimpleStringProperty();
        messageProperty.addListener((observable, oldValue, newValue) -> {
            Platform.runLater(() -> setDescription(newValue));
        });

        try {
+            if(pin.get().length() < importer.getWalletModel().getMinPinLength()) {
+                setDescription(pin.get().isEmpty() ? (!importer.getWalletModel().hasDefaultPin() && !importer.isInitialized() ? "Choose a PIN code" : "Enter PIN code") : "PIN code too short");
+                setContent(getPinAndDerivationEntry());
+                showHideLink.setVisible(false);
+                setExpanded(true);
+                importButton.setDisable(false);
+                return;
+            }
+
            if(!importer.isInitialized()) {
                setDescription("Card not initialized");
                setContent(getInitializationPanel(messageProperty));
@@ -106,7 +110,7 @@ public class CardImportPane extends TitledDescriptionPane {
            Throwable rootCause = Throwables.getRootCause(event.getSource().getException());
            if(rootCause instanceof CardAuthorizationException) {
                setError(rootCause.getMessage(), null);
-                setContent(getPinEntry());
+                setContent(getPinAndDerivationEntry());
            } else {
                log.error("Error importing keystore from card", event.getSource().getException());
                setError("Import Error", rootCause.getMessage());
@@ -117,6 +121,75 @@ public class CardImportPane extends TitledDescriptionPane {
    }

    private Node getInitializationPanel(StringProperty messageProperty) {
+        if(importer.getWalletModel().requiresSeedInitialization()) {
+            return getSeedInitializationPanel(messageProperty);
+        }
+
+        return getEntropyInitializationPanel(messageProperty);
+    }
+
+    private Node getSeedInitializationPanel(StringProperty messageProperty) {
+        VBox confirmationBox = new VBox(5);
+        CustomPasswordField confirmationPin = new ViewPasswordField();
+        confirmationPin.setPromptText("Re-enter chosen PIN");
+        confirmationBox.getChildren().add(confirmationPin);
+
+        Button initializeButton = new Button("Initialize");
+        initializeButton.setDefaultButton(true);
+        initializeButton.setOnAction(event -> {
+            initializeButton.setDisable(true);
+            if(!pin.get().equals(confirmationPin.getText())) {
+                setError("PIN Error", "The confirmation PIN did not match");
+                return;
+            }
+            int pinSize = pin.get().length();
+            if(pinSize < importer.getWalletModel().getMinPinLength() || pinSize > importer.getWalletModel().getMaxPinLength()) {
+                setError("PIN Error", "PIN length must be between " + importer.getWalletModel().getMinPinLength() + " and " + importer.getWalletModel().getMaxPinLength() + " characters");
+                return;
+            }
+
+            SeedEntryDialog seedEntryDialog = new SeedEntryDialog(importer.getWalletModel().toDisplayString() + " Seed Words", 12);
+            seedEntryDialog.initOwner(this.getScene().getWindow());
+            Optional<List<String>> optWords = seedEntryDialog.showAndWait();
+            if(optWords.isPresent()) {
+                try {
+                    List<String> mnemonicWords = optWords.get();
+                    Bip39MnemonicCode.INSTANCE.check(mnemonicWords);
+                    DeterministicSeed seed = new DeterministicSeed(mnemonicWords, "", System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
+                    byte[] seedBytes = seed.getSeedBytes();
+
+                    CardInitializationService cardInitializationService = new CardInitializationService(importer, pin.get(), seedBytes, messageProperty);
+                    cardInitializationService.setOnSucceeded(successEvent -> {
+                        AppServices.showSuccessDialog("Card Initialized", "The card was successfully initialized.\n\nYou can now import the keystore.");
+                        setDescription("Leave card on reader");
+                        setExpanded(false);
+                        importButton.setDisable(false);
+                    });
+                    cardInitializationService.setOnFailed(failEvent -> {
+                        log.error("Error initializing card", failEvent.getSource().getException());
+                        AppServices.showErrorDialog("Card Initialization Failed", "The card was not initialized.\n\n" + failEvent.getSource().getException().getMessage());
+                        initializeButton.setDisable(false);
+                    });
+                    cardInitializationService.start();
+                } catch(MnemonicException e) {
+                    log.error("Invalid seed entered", e);
+                    AppServices.showErrorDialog("Invalid seed entered", "The seed was invalid.\n\n" + e.getMessage());
+                    initializeButton.setDisable(false);
+                }
+            } else {
+                initializeButton.setDisable(false);
+            }
+        });
+
+        HBox contentBox = new HBox(20);
+        contentBox.getChildren().addAll(confirmationBox, initializeButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        HBox.setHgrow(confirmationBox, Priority.ALWAYS);
+
+        return contentBox;
+    }
+
+    private Node getEntropyInitializationPanel(StringProperty messageProperty) {
        VBox initTypeBox = new VBox(5);
        RadioButton automatic = new RadioButton("Automatic (Recommended)");
        RadioButton advanced = new RadioButton("Advanced");
@@ -169,6 +242,13 @@ public class CardImportPane extends TitledDescriptionPane {
        return contentBox;
    }

+    private Node getPinAndDerivationEntry() {
+        VBox vBox = new VBox();
+        vBox.getChildren().add(getPinEntry());
+        vBox.getChildren().add(getDerivationEntry());
+        return vBox;
+    }
+
    private Node getPinEntry() {
        VBox vBox = new VBox();

@@ -183,7 +263,7 @@ public class CardImportPane extends TitledDescriptionPane {
        contentBox.setAlignment(Pos.TOP_RIGHT);
        contentBox.setSpacing(20);
        contentBox.getChildren().add(pinField);
-        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPadding(new Insets(10, 30, 0, 30));
        contentBox.setPrefHeight(50);

        vBox.getChildren().add(contentBox);
@@ -191,6 +271,51 @@ public class CardImportPane extends TitledDescriptionPane {
        return vBox;
    }

+    private Node getDerivationEntry() {
+        VBox vBox = new VBox();
+
+        CheckBox checkBox = new CheckBox("Use Custom Derivation");
+        Label customLabel = new Label("Derivation:");
+        TextField customDerivation = new TextField(KeyDerivation.writePath(derivation));
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+        validationSupport.registerValidator(customDerivation, Validator.combine(
+                Validator.createEmptyValidator("Derivation is required"),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid derivation", !KeyDerivation.isValid(newValue))
+        ));
+
+        customDerivation.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue.isEmpty() || !KeyDerivation.isValid(newValue)) {
+                importButton.setDisable(true);
+            } else {
+                importButton.setDisable(false);
+                derivation = KeyDerivation.parsePath(newValue);
+            }
+        });
+
+        checkBox.managedProperty().bind(checkBox.visibleProperty());
+        customLabel.managedProperty().bind(customLabel.visibleProperty());
+        customDerivation.managedProperty().bind(customDerivation.visibleProperty());
+        customLabel.visibleProperty().bind(checkBox.visibleProperty().not());
+        customDerivation.visibleProperty().bind(checkBox.visibleProperty().not());
+
+        checkBox.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            checkBox.setVisible(false);
+        });
+
+        HBox derivationBox = new HBox();
+        derivationBox.setAlignment(Pos.CENTER_LEFT);
+        derivationBox.setSpacing(20);
+        derivationBox.getChildren().addAll(checkBox, customLabel, customDerivation);
+        derivationBox.setPadding(new Insets(10, 30, 10, 30));
+        derivationBox.setPrefHeight(50);
+
+        vBox.getChildren().addAll(derivationBox);
+
+        return vBox;
+    }
+
    public static class CardInitializationService extends Service<Void> {
        private final KeystoreCardImport cardImport;
        private final String pin;
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.wallet.WalletModel;
 import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -22,20 +23,25 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
    private final CheckBox backupFirst;
    private final ButtonType okButtonType;

-    public CardPinDialog() {
+    public CardPinDialog(WalletModel walletModel, boolean backupOnly) {
        this.existingPin = new ViewPasswordField();
        this.newPin = new ViewPasswordField();
        this.newPinConfirm = new ViewPasswordField();
        this.backupFirst = new CheckBox();

+        if(backupOnly) {
+            newPin.textProperty().bind(existingPin.textProperty());
+            newPinConfirm.textProperty().bind(existingPin.textProperty());
+        }
+
        final DialogPane dialogPane = getDialogPane();
-        setTitle("Change Card PIN");
-        dialogPane.setHeaderText("Enter the current PIN, and then the new PIN twice. PIN must be between 6 and 32 digits.");
+        setTitle(backupOnly ? "Backup Card" : "Change Card PIN");
+        dialogPane.setHeaderText(backupOnly ? "Enter the current card PIN." : "Enter the current PIN, and then the new PIN twice. PIN must be between 6 and 32 digits.");
        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
        AppServices.setStageIcon(dialogPane.getScene().getWindow());
        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
        dialogPane.setPrefWidth(380);
-        dialogPane.setPrefHeight(260);
+        dialogPane.setPrefHeight(backupOnly ? 135 : 260);
        AppServices.moveToActiveWindowScreen(this);

        Glyph lock = new Glyph("FontAwesome", FontAwesome.Glyph.LOCK);
@@ -63,24 +69,33 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
        backupField.setText("Backup First:");
        backupField.getInputs().add(backupFirst);

-        fieldset.getChildren().addAll(currentField, newField, confirmField, backupField);
+        if(backupOnly) {
+            fieldset.getChildren().addAll(currentField);
+        } else {
+            fieldset.getChildren().addAll(currentField, newField, confirmField);
+        }
+
+        if(walletModel.supportsBackup()) {
+            fieldset.getChildren().add(backupField);
+        }
+
        form.getChildren().add(fieldset);
        dialogPane.setContent(form);

        ValidationSupport validationSupport = new ValidationSupport();
        Platform.runLater( () -> {
            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
-            validationSupport.registerValidator(existingPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", existingPin.getText().length() < 6 || existingPin.getText().length() > 32));
-            validationSupport.registerValidator(newPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", newPin.getText().length() < 6 || newPin.getText().length() > 32));
+            validationSupport.registerValidator(existingPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", existingPin.getText().length() < walletModel.getMinPinLength() || existingPin.getText().length() > walletModel.getMaxPinLength()));
+            validationSupport.registerValidator(newPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", newPin.getText().length() < walletModel.getMinPinLength() || newPin.getText().length() > walletModel.getMaxPinLength()));
            validationSupport.registerValidator(newPinConfirm, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "PIN confirmation does not match", !newPinConfirm.getText().equals(newPin.getText())));
        });

-        okButtonType = new javafx.scene.control.ButtonType("Change", ButtonBar.ButtonData.OK_DONE);
+        okButtonType = new javafx.scene.control.ButtonType(backupOnly ? "Backup" : "Change", ButtonBar.ButtonData.OK_DONE);
        dialogPane.getButtonTypes().addAll(okButtonType);
        Button okButton = (Button) dialogPane.lookupButton(okButtonType);
        okButton.setPrefWidth(130);
-        BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> existingPin.getText().length() < 6 || existingPin.getText().length() > 32
-                        || newPin.getText().length() < 6 || newPin.getText().length() > 32
+        BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> existingPin.getText().length() < walletModel.getMinPinLength() || existingPin.getText().length() > walletModel.getMaxPinLength()
+                        || newPin.getText().length() < walletModel.getMinPinLength() || newPin.getText().length() > walletModel.getMaxPinLength()
                        || !newPin.getText().equals(newPinConfirm.getText()),
                existingPin.textProperty(), newPin.textProperty(), newPinConfirm.textProperty());
        okButton.disableProperty().bind(isInvalid);
@@ -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";
            }
@@ -12,7 +12,7 @@ import java.util.regex.Pattern;

 public class CoinTextFormatter extends TextFormatter<String> {
    public CoinTextFormatter(UnitFormat unitFormat) {
-        super(new CoinFilter(unitFormat));
+        super(new CoinFilter(unitFormat == null ? UnitFormat.DOT : unitFormat));
    }

    public UnitFormat getUnitFormat() {
@@ -29,7 +29,7 @@ public class CoinTextFormatter extends TextFormatter<String> {
        private final Pattern coinValidation;

        public CoinFilter(UnitFormat unitFormat) {
-            this.unitFormat = unitFormat == null ? UnitFormat.DOT : unitFormat;
+            this.unitFormat = unitFormat;
            this.coinFormat = new DecimalFormat("###,###.########", unitFormat.getDecimalFormatSymbols());
            this.coinValidation = Pattern.compile("[\\d" + Pattern.quote(unitFormat.getGroupingSeparator()) + "]*(" + Pattern.quote(unitFormat.getDecimalSeparator()) + "\\d{0,8})?");
        }
@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.control;

 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
@@ -17,6 +18,7 @@ import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
+import javafx.scene.control.TreeTableColumn;
 import javafx.scene.control.TreeTableView;
 import javafx.scene.layout.StackPane;

@@ -28,6 +30,7 @@ import java.util.Optional;
 public class CoinTreeTable extends TreeTableView<Entry> {
    private BitcoinUnit bitcoinUnit;
    private UnitFormat unitFormat;
+    private CurrencyRate currencyRate;

    public BitcoinUnit getBitcoinUnit() {
        return bitcoinUnit;
@@ -64,6 +67,18 @@ public class CoinTreeTable extends TreeTableView<Entry> {
        }
    }

+    public CurrencyRate getCurrencyRate() {
+        return currencyRate;
+    }
+
+    public void setCurrencyRate(CurrencyRate currencyRate) {
+        this.currencyRate = currencyRate;
+
+        if(!getChildren().isEmpty()) {
+            refresh();
+        }
+    }
+
    public void updateHistoryStatus(WalletHistoryStatusEvent event) {
        if(getRoot() != null) {
            Entry entry = getRoot().getValue();
@@ -94,6 +109,7 @@ public class CoinTreeTable extends TreeTableView<Entry> {
            hyperlink.setTranslateY(30);
            hyperlink.setOnAction(event -> {
                WalletBirthDateDialog dlg = new WalletBirthDateDialog(wallet.getBirthDate(), false);
+                dlg.initOwner(this.getScene().getWindow());
                Optional<Date> optDate = dlg.showAndWait();
                if(optDate.isPresent()) {
                    Storage storage = AppServices.get().getOpenWallets().get(wallet);
@@ -119,4 +135,12 @@ public class CoinTreeTable extends TreeTableView<Entry> {
        stackPane.setAlignment(Pos.CENTER);
        return stackPane;
    }
+
+    public void setSortColumn(int columnIndex, TreeTableColumn.SortType sortType) {
+        if(columnIndex >= 0 && columnIndex < getColumns().size() && getSortOrder().isEmpty() && !getRoot().getChildren().isEmpty()) {
+            TreeTableColumn<Entry, ?> column = getColumns().get(columnIndex);
+            column.setSortType(sortType == null ? TreeTableColumn.SortType.DESCENDING : sortType);
+            getSortOrder().add(column);
+        }
+    }
 }
@@ -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);
@@ -1,6 +1,5 @@
 package com.sparrowwallet.sparrow.control;

-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import javafx.geometry.Pos;
@@ -12,6 +11,8 @@ import javafx.util.Duration;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

+import static com.sparrowwallet.sparrow.control.EntryCell.HashIndexEntryContextMenu;
+
 public class DateCell extends TreeTableCell<Entry, Entry> {
    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");

@@ -36,11 +37,11 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
                UtxoEntry utxoEntry = (UtxoEntry)entry;
                if(utxoEntry.getHashIndex().getHeight() <= 0) {
                    setText("Unconfirmed " + (utxoEntry.getHashIndex().getHeight() < 0 ? "Parent " : "") + (utxoEntry.getWallet().isWhirlpoolMixWallet() ? "(Not yet mixable)" : (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)")));
-                    setContextMenu(null);
+                    setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), utxoEntry));
                } else if(utxoEntry.getHashIndex().getDate() != null) {
                    String date = DATE_FORMAT.format(utxoEntry.getHashIndex().getDate());
                    setText(date);
-                    setContextMenu(new DateContextMenu(date, utxoEntry.getHashIndex()));
+                    setContextMenu(new DateContextMenu(getTreeTableView(), utxoEntry, date));
                } else {
                    setText("Unknown");
                    setContextMenu(null);
@@ -56,8 +57,10 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
        }
    }

-    private static class DateContextMenu extends ContextMenu {
-        public DateContextMenu(String date, BlockTransactionHashIndex reference) {
+    private static class DateContextMenu extends HashIndexEntryContextMenu {
+        public DateContextMenu(TreeTableView<Entry> treeTableView, UtxoEntry utxoEntry, String date) {
+            super(treeTableView, utxoEntry);
+
            MenuItem copyDate = new MenuItem("Copy Date");
            copyDate.setOnAction(AE -> {
                hide();
@@ -70,7 +73,7 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
            copyHeight.setOnAction(AE -> {
                hide();
                ClipboardContent content = new ClipboardContent();
-                content.putString(reference.getHeight() > 0 ? Integer.toString(reference.getHeight()) : "Mempool");
+                content.putString(utxoEntry.getHashIndex().getHeight() > 0 ? Integer.toString(utxoEntry.getHashIndex().getHeight()) : "Mempool");
                Clipboard.getSystemClipboard().setContent(content);
            });

@@ -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());
@@ -300,7 +300,7 @@ public class DevicePane extends TitledDescriptionPane {

        if(importButton instanceof SplitMenuButton importMenuButton) {
            if(wallet.getScriptType() == null) {
-                ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH};
+                ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH, ScriptType.P2TR};
                for(ScriptType scriptType : scriptTypes) {
                    MenuItem item = new MenuItem(scriptType.getDescription());
                    final List<ChildNumber> derivation = scriptType.getDefaultDerivation();
@@ -673,8 +673,8 @@ public class DevicePane extends TitledDescriptionPane {
            try {
                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
                if(!cardApi.isInitialized()) {
-                    if(pin.get().length() < 6) {
-                        setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
+                    if(pin.get().length() < device.getModel().getMinPinLength()) {
+                        setDescription(pin.get().isEmpty() ? (device.getModel().hasDefaultPin() ? "Enter PIN code" : "Choose a PIN code") : "PIN code too short");
                        setContent(getCardPinEntry(importButton));
                        showHideLink.setVisible(false);
                        setExpanded(true);
@@ -795,7 +795,7 @@ public class DevicePane extends TitledDescriptionPane {
    }

    private void handleCardOperation(Service<?> service, ButtonBase operationButton, String operationDescription, boolean pinRequired, EventHandler<WorkerStateEvent> successHandler) {
-        if(pinRequired && pin.get().length() < 6) {
+        if(pinRequired && pin.get().length() < device.getModel().getMinPinLength()) {
            setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
            setContent(getCardPinEntry(operationButton));
            showHideLink.setVisible(false);
@@ -940,7 +940,7 @@ public class DevicePane extends TitledDescriptionPane {
            try {
                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
                if(!cardApi.isInitialized()) {
-                    if(pin.get().length() < 6) {
+                    if(pin.get().length() < device.getModel().getMinPinLength()) {
                        setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
                        setContent(getCardPinEntry(getAddressButton));
                        showHideLink.setVisible(false);
@@ -1047,6 +1047,75 @@ public class DevicePane extends TitledDescriptionPane {
    }

    private Node getCardInitializationPanel(CardApi cardApi, ButtonBase operationButton, DeviceOperation deviceOperation) {
+        if(device.getModel().requiresSeedInitialization()) {
+            return getCardSeedInitializationPanel(cardApi, operationButton, deviceOperation);
+        }
+
+        return getCardEntropyInitializationPanel(cardApi, operationButton, deviceOperation);
+    }
+
+    private Node getCardSeedInitializationPanel(CardApi cardApi, ButtonBase operationButton, DeviceOperation deviceOperation) {
+        VBox confirmationBox = new VBox(5);
+        CustomPasswordField confirmationPin = new ViewPasswordField();
+        confirmationPin.setPromptText("Re-enter chosen PIN");
+        confirmationBox.getChildren().add(confirmationPin);
+
+        Button initializeButton = new Button("Initialize");
+        initializeButton.setDefaultButton(true);
+        initializeButton.setOnAction(event -> {
+            initializeButton.setDisable(true);
+            if(!pin.get().equals(confirmationPin.getText())) {
+                setError("PIN Error", "The confirmation PIN did not match");
+                return;
+            }
+            int pinSize = pin.get().length();
+            if(pinSize < device.getModel().getMinPinLength() || pinSize > device.getModel().getMaxPinLength()) {
+                setError("PIN Error", "PIN length must be between " + device.getModel().getMinPinLength() + " and " + device.getModel().getMaxPinLength() + " characters");
+                return;
+            }
+
+            SeedEntryDialog seedEntryDialog = new SeedEntryDialog(device.getModel().toDisplayString() + " Seed Words", 12);
+            seedEntryDialog.initOwner(this.getScene().getWindow());
+            Optional<List<String>> optWords = seedEntryDialog.showAndWait();
+            if(optWords.isPresent()) {
+                try {
+                    List<String> mnemonicWords = optWords.get();
+                    Bip39MnemonicCode.INSTANCE.check(mnemonicWords);
+                    DeterministicSeed seed = new DeterministicSeed(mnemonicWords, "", System.currentTimeMillis(), DeterministicSeed.Type.BIP39);
+                    byte[] seedBytes = seed.getSeedBytes();
+
+                    Service<Void> cardInitializationService = cardApi.getInitializationService(seedBytes, messageProperty);
+                    cardInitializationService.setOnSucceeded(successEvent -> {
+                        AppServices.showSuccessDialog("Card Initialized", "The card was successfully initialized.\n\nYou can now import the keystore.");
+                        operationButton.setDisable(false);
+                        setDefaultStatus();
+                        setExpanded(false);
+                    });
+                    cardInitializationService.setOnFailed(failEvent -> {
+                        log.error("Error initializing card", failEvent.getSource().getException());
+                        AppServices.showErrorDialog("Card Initialization Failed", "The card was not initialized.\n\n" + failEvent.getSource().getException().getMessage());
+                        initializeButton.setDisable(false);
+                    });
+                    cardInitializationService.start();
+                } catch(MnemonicException e) {
+                    log.error("Invalid seed entered", e);
+                    AppServices.showErrorDialog("Invalid seed entered", "The seed was invalid.\n\n" + e.getMessage());
+                    initializeButton.setDisable(false);
+                }
+            } else {
+                initializeButton.setDisable(false);
+            }
+        });
+
+        HBox contentBox = new HBox(20);
+        contentBox.getChildren().addAll(confirmationBox, initializeButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        HBox.setHgrow(confirmationBox, Priority.ALWAYS);
+
+        return contentBox;
+    }
+
+    private Node getCardEntropyInitializationPanel(CardApi cardApi, ButtonBase operationButton, DeviceOperation deviceOperation) {
        VBox initTypeBox = new VBox(5);
        RadioButton automatic = new RadioButton("Automatic (Recommended)");
        RadioButton advanced = new RadioButton("Advanced");
@@ -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 { }
+}
@@ -36,7 +36,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
    private static final Logger log = LoggerFactory.getLogger(EntryCell.class);

    public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-    private static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*)\\(Replaced By Fee( #)?(\\d+)?\\).*");
+    public static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*?)( \\(Replaced By Fee( #)?(\\d+)?\\)).*?");

    private static EntryCell lastCell;

@@ -100,7 +100,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                actionBox.getChildren().add(viewTransactionButton);

                BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
-                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() &&
+                if(blockTransaction.getHeight() <= 0 && canRBF(blockTransaction) &&
                        Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                    Button increaseFeeButton = new Button("");
                    increaseFeeButton.setGraphic(getIncreaseFeeRBFGlyph());
@@ -124,7 +124,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                NodeEntry nodeEntry = (NodeEntry)entry;
                Address address = nodeEntry.getAddress();
                setText(address.toString());
-                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry, true));
+                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry, true, getTreeTableView()));
                Tooltip tooltip = new Tooltip();
                tooltip.setShowDelay(Duration.millis(250));
                tooltip.setText(nodeEntry.getNode().toString());
@@ -149,6 +149,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                    signMessageButton.setGraphic(getSignMessageGlyph());
                    signMessageButton.setOnAction(event -> {
                        MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                        messageSignDialog.initOwner(getTreeTableView().getScene().getWindow());
                        messageSignDialog.showAndWait();
                    });
                    actionBox.getChildren().add(signMessageButton);
@@ -216,7 +217,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                .map(e -> (HashIndexEntry)e)
                .filter(e -> e.getType().equals(HashIndexEntry.Type.INPUT) && e.isSpendable())
                .map(e -> blockTransaction.getTransaction().getInputs().get((int)e.getHashIndex().getIndex()))
-                .filter(TransactionInput::isReplaceByFeeEnabled)
+                .filter(i -> Config.get().isMempoolFullRbf() || i.isReplaceByFeeEnabled())
                .map(txInput -> walletTxos.keySet().stream().filter(txo -> txo.getHash().equals(txInput.getOutpoint().getHash()) && txo.getIndex() == txInput.getOutpoint().getIndex()).findFirst().get())
                .collect(Collectors.toList());

@@ -230,31 +231,47 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                .filter(e -> e instanceof HashIndexEntry)
                .map(e -> (HashIndexEntry)e)
                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT))
-                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
+                .map(e -> blockTransaction.getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                .collect(Collectors.toList());

        List<TransactionOutput> consolidationOutputs = transactionEntry.getChildren().stream()
                .filter(e -> e instanceof HashIndexEntry)
                .map(e -> (HashIndexEntry)e)
                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.getKeyPurpose() == KeyPurpose.RECEIVE)
-                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
+                .map(e -> blockTransaction.getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                .collect(Collectors.toList());

+        boolean consolidationTransaction = consolidationOutputs.size() == blockTransaction.getTransaction().getOutputs().size() && consolidationOutputs.size() == 1;
        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum() - consolidationOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
        Transaction tx = blockTransaction.getTransaction();
        double vSize = tx.getVirtualSize();
-        int inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
-        List<BlockTransactionHashIndex> walletUtxos = new ArrayList<>(transactionEntry.getWallet().getWalletUtxos().keySet());
-        //Remove any UTXOs created by the transaction that is to be replaced
-        walletUtxos.removeIf(utxo -> ourOutputs.stream().anyMatch(output -> output.getHash().equals(utxo.getHash()) && output.getIndex() == utxo.getIndex()));
-        Collections.shuffle(walletUtxos);
-        while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty() && !cancelTransaction) {
-            //If there is insufficient change output, include another random UTXO so the fee can be increased
-            BlockTransactionHashIndex utxo = walletUtxos.remove(0);
-            utxos.add(utxo);
-            changeTotal += utxo.getValue();
-            vSize += inputSize;
+        if(changeTotal == 0) {
+            //Add change output length to vSize if change was not present on the original transaction
+            TransactionOutput changeOutput = new TransactionOutput(new Transaction(), 1L, transactionEntry.getWallet().getFreshNode(KeyPurpose.CHANGE).getOutputScript());
+            vSize += changeOutput.getLength();
        }
+        double inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? (double)tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
+        List<TxoFilter> txoFilters = List.of(new ExcludeTxoFilter(utxos), new SpentTxoFilter(blockTransaction.getHash()), new FrozenTxoFilter(), new CoinbaseTxoFilter(transactionEntry.getWallet()));
+        double feeRate = blockTransaction.getFeeRate() == null ? AppServices.getMinimumRelayFeeRate() : blockTransaction.getFeeRate();
+        List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
+                .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
+        Collections.shuffle(outputGroups);
+        while((double)changeTotal / vSize < getMaxFeeRate() && !outputGroups.isEmpty() && !cancelTransaction && !consolidationTransaction) {
+            //If there is insufficient change output, include another random output group so the fee can be increased
+            OutputGroup outputGroup = outputGroups.remove(0);
+            for(BlockTransactionHashIndex utxo : outputGroup.getUtxos()) {
+                utxos.add(utxo);
+                changeTotal += utxo.getValue();
+                vSize += inputSize;
+            }
+        }
+
+        Long fee = blockTransaction.getFee();
+        if(fee != null) {
+            //Replacement tx fees must be greater than the original tx fees by its minimum relay cost
+            fee += (long)Math.ceil(vSize * AppServices.getMinimumRelayFeeRate());
+        }
+        Long rbfFee = fee;

        List<TransactionOutput> externalOutputs = new ArrayList<>(blockTransaction.getTransaction().getOutputs());
        externalOutputs.removeAll(ourOutputs);
@@ -263,17 +280,21 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
        List<Payment> payments = externalOutputs.stream().map(txOutput -> {
            try {
                String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
-                Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(label);
+                label = REPLACED_BY_FEE_SUFFIX.matcher(label).replaceAll("$1");
+                String[] paymentLabels = label.split(", ");
+                if(externalOutputs.size() > 1 && externalOutputs.size() == paymentLabels.length) {
+                    label = paymentLabels[externalOutputs.indexOf(txOutput)];
+                }
+                Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel());
                if(matcher.matches()) {
-                    String base = matcher.group(1);
-                    if(matcher.groupCount() > 2 && matcher.group(3) != null) {
-                        int count = Integer.parseInt(matcher.group(3)) + 1;
-                        label = base + "(Replaced By Fee #" + count + ")";
+                    if(matcher.groupCount() > 3 && matcher.group(4) != null) {
+                        int count = Integer.parseInt(matcher.group(4)) + 1;
+                        label += " (Replaced By Fee #" + count + ")";
                    } else {
-                        label = base + "(Replaced By Fee #2)";
+                        label += " (Replaced By Fee #2)";
                    }
                } else {
-                    label += (label.isEmpty() ? "" : " ") + "(Replaced By Fee)";
+                    label += " (Replaced By Fee)";
                }

                if(txOutput.getScript().getToAddress() != null) {
@@ -315,7 +336,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
        }

        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
-        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, opReturns.isEmpty() ? null : opReturns, blockTransaction.getFee(), true)));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, opReturns.isEmpty() ? null : opReturns, rbfFee, true, blockTransaction)));
    }

    private static Double getMaxFeeRate() {
@@ -331,30 +352,57 @@ 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 utxo = ourOutputs.get(0);
+        BlockTransactionHashIndex cpfpUtxo = ourOutputs.get(0);
+        Address freshAddress = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress();
+        TransactionOutput txOutput = new TransactionOutput(new Transaction(), cpfpUtxo.getValue(), freshAddress.getOutputScript());
+        long dustThreshold = freshAddress.getScriptType().getDustThreshold(txOutput, Transaction.DUST_RELAY_TX_FEE);
+        double inputSize = freshAddress.getScriptType().getInputVbytes();
+        double vSize = inputSize + txOutput.getLength();
+
+        List<TxoFilter> txoFilters = List.of(new ExcludeTxoFilter(List.of(cpfpUtxo)), new SpentTxoFilter(), new FrozenTxoFilter(), new CoinbaseTxoFilter(transactionEntry.getWallet()));
+        double feeRate = blockTransaction.getFeeRate() == null ? AppServices.getMinimumRelayFeeRate() : blockTransaction.getFeeRate();
+        List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
+                .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
+        Collections.shuffle(outputGroups);
+
+        List<BlockTransactionHashIndex> utxos = new ArrayList<>();
+        utxos.add(cpfpUtxo);
+        long inputTotal = cpfpUtxo.getValue();
+        while((inputTotal - (long)(getMaxFeeRate() * vSize)) < dustThreshold && !outputGroups.isEmpty()) {
+            //If there is insufficient input value, include another random output group so the fee can be increased
+            OutputGroup outputGroup = outputGroups.remove(0);
+            for(BlockTransactionHashIndex utxo : outputGroup.getUtxos()) {
+                utxos.add(utxo);
+                inputTotal += utxo.getValue();
+                vSize += inputSize;
+            }
+        }

-        WalletNode freshNode = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE);
        String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
        label += (label.isEmpty() ? "" : " ") + "(CPFP)";
-        Payment payment = new Payment(freshNode.getAddress(), label, utxo.getValue(), true);
+        Payment payment = new Payment(freshAddress, label, inputTotal, true);

-        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), List.of(utxo)));
-        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), null, blockTransaction.getFee(), false)));
+        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, List.of(payment), null, blockTransaction.getFee(), true, null)));
+    }
+
+    private static boolean canRBF(BlockTransaction blockTransaction) {
+        return Config.get().isMempoolFullRbf() || blockTransaction.getTransaction().isReplaceByFee();
    }

    private static boolean canSignMessage(WalletNode walletNode) {
        Wallet wallet = walletNode.getWallet();
-        return wallet.getKeystores().size() == 1 && wallet.getScriptType() != ScriptType.P2TR &&
-                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB || wallet.getKeystores().get(0).getWalletModel().isCard()) &&
-                (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
+        return wallet.getKeystores().size() == 1 && (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
    }

    private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
@@ -427,7 +475,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB";
            }

-            tooltip += "\nRBF: " + (transactionEntry.getBlockTransaction().getTransaction().isReplaceByFee() ? "Enabled" : "Disabled");
+            tooltip += "\nRBF: " + (canRBF(transactionEntry.getBlockTransaction()) ? "Enabled" : "Disabled");
        }

        return tooltip;
@@ -504,7 +552,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
            });
            getItems().add(viewTransaction);

-            if(blockTransaction.getTransaction().isReplaceByFee() && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+            if(canRBF(blockTransaction) && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                MenuItem increaseFee = new MenuItem("Increase Fee (RBF)");
                increaseFee.setGraphic(getIncreaseFeeRBFGlyph());
                increaseFee.setOnAction(AE -> {
@@ -515,7 +563,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                getItems().add(increaseFee);
            }

-            if(blockTransaction.getTransaction().isReplaceByFee() && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+            if(canRBF(blockTransaction) && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                MenuItem cancelTx = new MenuItem("Cancel Transaction (RBF)");
                cancelTx.setGraphic(getCancelTransactionRBFGlyph());
                cancelTx.setOnAction(AE -> {
@@ -537,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 -> {
@@ -564,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 -> {
@@ -578,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 -> {
@@ -586,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 -> {
@@ -594,13 +650,12 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                content.putString(blockTransaction.getHeight() > 0 ? Integer.toString(blockTransaction.getHeight()) : "Mempool");
                Clipboard.getSystemClipboard().setContent(content);
            });
-
-            getItems().addAll(viewTransaction, openBlockExplorer, copyDate, copyTxid, copyHeight);
+            getItems().add(copyHeight);
        }
    }

    public static class AddressContextMenu extends ContextMenu {
-        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry, boolean addUtxoItems) {
+        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry, boolean addUtxoItems, TreeTableView<Entry> treetable) {
            if(nodeEntry == null || !nodeEntry.getWallet().isBip47()) {
                MenuItem receiveToAddress = new MenuItem("Receive To");
                receiveToAddress.setGraphic(getReceiveGlyph());
@@ -618,6 +673,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                signVerifyMessage.setOnAction(AE -> {
                    hide();
                    MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                    messageSignDialog.initOwner(treetable.getScene().getWindow());
                    messageSignDialog.showAndWait();
                });
                getItems().add(signVerifyMessage);
@@ -691,7 +747,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
        }
    }

-    private static class HashIndexEntryContextMenu extends ContextMenu {
+    static class HashIndexEntryContextMenu extends ContextMenu {
        public HashIndexEntryContextMenu(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
            MenuItem viewTransaction = new MenuItem("View Transaction");
            viewTransaction.setGraphic(getViewTransactionGlyph());
@@ -747,6 +803,8 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
        cell.getStyleClass().remove("transaction-row");
        cell.getStyleClass().remove("node-row");
        cell.getStyleClass().remove("utxo-row");
+        cell.getStyleClass().remove("unconfirmed-row");
+        cell.getStyleClass().remove("summary-row");
        cell.getStyleClass().remove("address-cell");
        cell.getStyleClass().remove("hashindex-row");
        cell.getStyleClass().remove("confirming");
@@ -781,6 +839,10 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
                if(hashIndexEntry.isSpent()) {
                    cell.getStyleClass().add("spent");
                }
+            } else if(entry instanceof WalletSummaryDialog.UnconfirmedEntry) {
+                cell.getStyleClass().add("unconfirmed-row");
+            } else if(entry instanceof WalletSummaryDialog.SummaryEntry) {
+                cell.getStyleClass().add("summary-row");
            }
        }
    }
@@ -0,0 +1,132 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.net.FeeRatesSource;
+import javafx.application.Platform;
+import javafx.scene.Node;
+import javafx.scene.control.Slider;
+import javafx.util.StringConverter;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.sparrowwallet.sparrow.AppServices.*;
+
+public class FeeRangeSlider extends Slider {
+    public FeeRangeSlider() {
+        super(0, FEE_RATES_RANGE.size() - 1, 0);
+        setMajorTickUnit(1);
+        setMinorTickCount(0);
+        setSnapToTicks(false);
+        setShowTickLabels(true);
+        setShowTickMarks(true);
+        setBlockIncrement(Math.log(1.02) / Math.log(2));
+
+        setLabelFormatter(new StringConverter<>() {
+            @Override
+            public String toString(Double object) {
+                Long feeRate = LONG_FEE_RATES_RANGE.get(object.intValue());
+                if(isLongFeeRange() && feeRate >= 1000) {
+                    return feeRate / 1000 + "k";
+                }
+                return Long.toString(feeRate);
+            }
+
+            @Override
+            public Double fromString(String string) {
+                return null;
+            }
+        });
+
+        updateTrackHighlight();
+
+        valueProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                updateMaxFeeRange(newValue.doubleValue());
+            }
+        });
+    }
+
+    public double getFeeRate() {
+        return Math.pow(2.0, getValue());
+    }
+
+    public void setFeeRate(double feeRate) {
+        double value = Math.log(feeRate) / Math.log(2);
+        updateMaxFeeRange(value);
+        setValue(value);
+    }
+
+    private void updateMaxFeeRange(double value) {
+        if(value >= getMax() && !isLongFeeRange()) {
+            setMax(LONG_FEE_RATES_RANGE.size() - 1);
+            updateTrackHighlight();
+        } else if(value == getMin() && isLongFeeRange()) {
+            setMax(FEE_RATES_RANGE.size() - 1);
+            updateTrackHighlight();
+        }
+    }
+
+    private boolean isLongFeeRange() {
+        return getMax() > FEE_RATES_RANGE.size() - 1;
+    }
+
+    public void updateTrackHighlight() {
+        addFeeRangeTrackHighlight(0);
+    }
+
+    private void addFeeRangeTrackHighlight(int count) {
+        Platform.runLater(() -> {
+            Node track = lookup(".track");
+            if(track != null) {
+                Map<Integer, Double> targetBlocksFeeRates = getTargetBlocksFeeRates();
+                String highlight = "";
+                if(targetBlocksFeeRates.get(Integer.MAX_VALUE) != null) {
+                    highlight += "#a0a1a766 " + getPercentageOfFeeRange(targetBlocksFeeRates.get(Integer.MAX_VALUE)) + "%, ";
+                }
+                highlight += "#41a9c966 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_TWO_HOURS - 1) + "%, ";
+                highlight += "#fba71b66 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_HOUR - 1) + "%, ";
+                highlight += "#c8416466 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_HALF_HOUR - 1) + "%";
+
+                track.setStyle("-fx-background-color: " +
+                        "-fx-shadow-highlight-color, " +
+                        "linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), " +
+                        "linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)), " +
+                        "linear-gradient(to right, " + highlight + ")");
+            } else if(count < 20) {
+                addFeeRangeTrackHighlight(count+1);
+            }
+        });
+    }
+
+    private Map<Integer, Double> getTargetBlocksFeeRates() {
+        Map<Integer, Double> retrievedFeeRates = AppServices.getTargetBlockFeeRates();
+        if(retrievedFeeRates == null) {
+            retrievedFeeRates = TARGET_BLOCKS_RANGE.stream().collect(Collectors.toMap(java.util.function.Function.identity(), v -> getFallbackFeeRate(),
+                    (u, v) -> { throw new IllegalStateException("Duplicate target blocks"); },
+                    LinkedHashMap::new));
+        }
+
+        return retrievedFeeRates;
+    }
+
+    private int getPercentageOfFeeRange(Map<Integer, Double> targetBlocksFeeRates, Integer minTargetBlocks) {
+        List<Integer> rates = new ArrayList<>(targetBlocksFeeRates.keySet());
+        Collections.reverse(rates);
+        for(Integer targetBlocks : rates) {
+            if(targetBlocks < minTargetBlocks) {
+                return getPercentageOfFeeRange(targetBlocksFeeRates.get(targetBlocks));
+            }
+        }
+
+        return 100;
+    }
+
+    private int getPercentageOfFeeRange(Double feeRate) {
+        double index = Math.log(feeRate) / Math.log(2);
+        if(isLongFeeRange()) {
+            index *= ((double)FEE_RATES_RANGE.size() / (LONG_FEE_RATES_RANGE.size())) * 0.99;
+        }
+        return (int)Math.round(index * 10.0);
+    }
+}
@@ -0,0 +1,94 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.CurrencyRate;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.TreeTableCell;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+import org.controlsfx.tools.Platform;
+
+import java.math.BigDecimal;
+import java.util.Currency;
+
+public class FiatCell extends TreeTableCell<Entry, Number> {
+    private final Tooltip tooltip;
+    private final FiatContextMenu contextMenu;
+
+    public FiatCell() {
+        super();
+        tooltip = new Tooltip();
+        contextMenu = new FiatContextMenu();
+        getStyleClass().add("coin-cell");
+        if(Platform.getCurrent() == Platform.OSX) {
+            getStyleClass().add("number-field");
+        }
+    }
+
+    @Override
+    protected void updateItem(Number amount, boolean empty) {
+        super.updateItem(amount, empty);
+
+        if(empty || amount == null) {
+            setText(null);
+            setGraphic(null);
+            setTooltip(null);
+            setContextMenu(null);
+        } else {
+            Entry entry = getTreeTableView().getTreeItem(getIndex()).getValue();
+            EntryCell.applyRowStyles(this, entry);
+
+            CoinTreeTable coinTreeTable = (CoinTreeTable) getTreeTableView();
+            UnitFormat format = coinTreeTable.getUnitFormat();
+            CurrencyRate currencyRate = coinTreeTable.getCurrencyRate();
+
+            if(currencyRate != null && currencyRate.isAvailable()) {
+                Currency currency = currencyRate.getCurrency();
+                double btcRate = currencyRate.getBtcRate();
+
+                BigDecimal satsBalance = BigDecimal.valueOf(amount.longValue());
+                BigDecimal btcBalance = satsBalance.divide(BigDecimal.valueOf(Transaction.SATOSHIS_PER_BITCOIN));
+                BigDecimal fiatBalance = btcBalance.multiply(BigDecimal.valueOf(btcRate));
+
+                String label = format.formatCurrencyValue(fiatBalance.doubleValue());
+                tooltip.setText("1 BTC = " + currency.getSymbol() + " " + format.formatCurrencyValue(btcRate));
+
+                setText(label);
+                setGraphic(null);
+                setTooltip(tooltip);
+                setContextMenu(contextMenu);
+            } else {
+                setText(null);
+                setGraphic(null);
+                setTooltip(null);
+                setContextMenu(null);
+            }
+        }
+    }
+
+    private class FiatContextMenu extends ContextMenu {
+        public FiatContextMenu() {
+            MenuItem copyValue = new MenuItem("Copy Value");
+            copyValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(getText());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            MenuItem copyRate = new MenuItem("Copy Rate");
+            copyRate.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(getTooltip().getText());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            getItems().addAll(copyValue, copyRate);
+        }
+    }
+}
@@ -150,6 +150,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {

    private void importQR() {
        QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(this.getScene().getWindow());
        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
        if(optionalResult.isPresent()) {
            QRScanDialog.Result result = optionalResult.get();
@@ -4,12 +4,14 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.hummingbird.registry.RegistryType;
+import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -116,6 +118,7 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {

                if(keystore.getSource() == KeystoreSource.HW_USB || keystore.getWalletModel().isCard()) {
                    TextAreaDialog dialog = new TextAreaDialog(message, false);
+                    dialog.initOwner(this.getScene().getWindow());
                    dialog.setTitle("Sign " + exporter.getName() + " Export");
                    dialog.getDialogPane().setHeaderText("The following text needs to be signed by the device.\nClick OK to continue.");
                    dialog.showAndWait();
@@ -126,6 +129,7 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {
                    List<String> operationFingerprints = List.of(keystore.getKeyDerivation().getMasterFingerprint());

                    DeviceSignMessageDialog deviceSignMessageDialog = new DeviceSignMessageDialog(operationFingerprints, wallet, message, keystore.getKeyDerivation());
+                    deviceSignMessageDialog.initOwner(this.getScene().getWindow());
                    Optional<String> optSignature = deviceSignMessageDialog.showAndWait();
                    if(optSignature.isPresent()) {
                        exporter.addSignature(keystore, optSignature.get(), baos);
@@ -151,10 +155,13 @@ public class FileKeystoreExportPane extends TitledDescriptionPane {
            } else {
                QRDisplayDialog qrDisplayDialog;
                if(exporter instanceof Bip129) {
-                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), baos.toByteArray(), false);
+                    UR ur = UR.fromBytes(baos.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, baos.toByteArray());
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, true, false);
                } else {
                    qrDisplayDialog = new QRDisplayDialog(baos.toString(StandardCharsets.UTF_8));
                }
+                qrDisplayDialog.initOwner(buttonBox.getScene().getWindow());
                qrDisplayDialog.showAndWait();
            }
        } catch(Exception e) {
@@ -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;
@@ -111,19 +121,16 @@ public class FileWalletExportPane extends TitledDescriptionPane {
        if(wallet.isEncrypted() && exporter.walletExportRequiresDecryption()) {
            Wallet copy = wallet.copy();
            WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+            dlg.initOwner(buttonBox.getScene().getWindow());
            Optional<SecureString> password = dlg.showAndWait();
            if(password.isPresent()) {
                final String walletId = AppServices.get().getOpenWallets().get(wallet).getWalletId(wallet);
+                String walletPassword = password.get().asString();
                Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(copy, password.get());
                decryptWalletService.setOnSucceeded(workerStateEvent -> {
                    EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Done"));
                    Wallet decryptedWallet = decryptWalletService.getValue();
-
-                    try {
-                        exportWallet(file, decryptedWallet);
-                    } finally {
-                        decryptedWallet.clearPrivate();
-                    }
+                    exportWallet(file, decryptedWallet, walletPassword);
                });
                decryptWalletService.setOnFailed(workerStateEvent -> {
                    EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Failed"));
@@ -133,28 +140,46 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                decryptWalletService.start();
            }
        } else {
-            exportWallet(file, wallet);
+            exportWallet(file, wallet, null);
        }
    }

-    private void exportWallet(File file, Wallet exportWallet) {
+    private void exportWallet(File file, Wallet exportWallet, String password) {
        try {
            if(file != null) {
-                try(OutputStream outputStream = new FileOutputStream(file)) {
-                    exporter.exportWallet(exportWallet, outputStream);
+                FileWalletExportService fileWalletExportService = new FileWalletExportService(exporter, file, exportWallet, password);
+                fileWalletExportService.setOnSucceeded(event -> {
                    EventManager.get().post(new WalletExportEvent(exportWallet));
-                }
+                });
+                fileWalletExportService.setOnFailed(event -> {
+                    Throwable e = event.getSource().getException();
+                    String errorMessage = e.getMessage();
+                    if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                        errorMessage = e.getCause().getMessage();
+                    }
+                    setError("Export Error", errorMessage);
+                });
+                fileWalletExportService.start();
            } else {
                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                exporter.exportWallet(exportWallet, outputStream);
+                exporter.exportWallet(exportWallet, outputStream, password);
                QRDisplayDialog qrDisplayDialog;
                if(exporter instanceof CoboVaultMultisig) {
                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
-                } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig || exporter instanceof Bip129) {
+                } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig) {
                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), false);
+                } else if(exporter instanceof Bip129) {
+                    UR ur = UR.fromBytes(outputStream.toByteArray());
+                    BBQR bbqr = new BBQR(BBQRType.UNICODE, outputStream.toByteArray());
+                    qrDisplayDialog = new QRDisplayDialog(ur, bbqr, false, true, false);
+                } else if(exporter instanceof Descriptor) {
+                    OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(exportWallet, KeyPurpose.DEFAULT_PURPOSES, null);
+                    CryptoOutput cryptoOutput = getCryptoOutput(exportWallet);
+                    qrDisplayDialog = new DescriptorQRDisplayDialog(exportWallet.getFullDisplayName(), outputDescriptor.toString(true), cryptoOutput.toUR());
                } else {
                    qrDisplayDialog = new QRDisplayDialog(outputStream.toString(StandardCharsets.UTF_8));
                }
+                qrDisplayDialog.initOwner(buttonBox.getScene().getWindow());
                qrDisplayDialog.showAndWait();
            }
        } catch(Exception e) {
@@ -163,6 +188,42 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                errorMessage = e.getCause().getMessage();
            }
            setError("Export Error", errorMessage);
+        } finally {
+            if(file == null && password != null) {
+                exportWallet.clearPrivate();
+            }
+        }
+    }
+
+    public static class FileWalletExportService extends Service<Void> {
+        private final WalletExport exporter;
+        private final File file;
+        private final Wallet wallet;
+        private final String password;
+
+        public FileWalletExportService(WalletExport exporter, File file, Wallet wallet, String password) {
+            this.exporter = exporter;
+            this.file = file;
+            this.wallet = wallet;
+            this.password = password;
+        }
+
+        @Override
+        protected Task<Void> createTask() {
+            return new Task<>() {
+                @Override
+                protected Void call() throws Exception {
+                    try(OutputStream outputStream = new FileOutputStream(file)) {
+                        exporter.exportWallet(wallet, outputStream, password);
+                    } finally {
+                        if(password != null) {
+                            wallet.clearPrivate();
+                        }
+                    }
+
+                    return null;
+                }
+            };
        }
    }
 }
@@ -12,7 +12,7 @@ public class FileWalletImportPane extends FileImportPane {
    private final WalletImport importer;

    public FileWalletImportPane(WalletImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable(), true);
+        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable(), importer.isWalletImportFileFormatAvailable());
        this.importer = importer;
    }

@@ -1,21 +1,32 @@
 package com.sparrowwallet.sparrow.control;

 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.Theme;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.net.MempoolRateSize;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
+import javafx.geometry.Pos;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.chart.*;
-import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
+import javafx.scene.control.*;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
+import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;

 import java.text.DateFormat;
@@ -27,16 +38,100 @@ import java.util.stream.Collectors;

 public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
    private static final DateFormat dateFormatter = new SimpleDateFormat("HH:mm");
-    public static final int MAX_PERIOD_HOURS = 2;
+    public static final int DEFAULT_MAX_PERIOD_HOURS = 2;
    private static final double Y_VALUE_BREAK_MVB = 3.0;
+    private static final List<Integer> FEE_RATES_INTERVALS = List.of(1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200, 250, 300, 350, 400, 500, 600, 700, 800);

+    private int maxPeriodHours = DEFAULT_MAX_PERIOD_HOURS;
    private Tooltip tooltip;

+    private MempoolSizeFeeRatesChart expandedChart;
+    private final EventHandler<MouseEvent> expandedChartHandler = new EventHandler<>() {
+        @Override
+        public void handle(MouseEvent event) {
+            if(!event.isConsumed() && event.getButton() != MouseButton.SECONDARY) {
+                Stage stage = new Stage(StageStyle.UNDECORATED);
+                stage.setTitle("Mempool by vBytes");
+                stage.initOwner(MempoolSizeFeeRatesChart.this.getScene().getWindow());
+                stage.initModality(Modality.WINDOW_MODAL);
+                stage.setResizable(false);
+
+                StackPane scenePane = new StackPane();
+                if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+                    scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+                }
+
+                scenePane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+                if(Config.get().getTheme() == Theme.DARK) {
+                    scenePane.getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+                }
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+
+                VBox vBox = new VBox(20);
+                vBox.setPadding(new Insets(20, 20, 20, 20));
+
+                expandedChart = new MempoolSizeFeeRatesChart();
+                expandedChart.initialize();
+                expandedChart.getStyleClass().add("vsizeChart");
+                expandedChart.update(AppServices.getMempoolHistogram());
+                expandedChart.setLegendVisible(false);
+                expandedChart.setAnimated(false);
+                expandedChart.setPrefWidth(700);
+
+                HBox buttonBox = new HBox();
+                buttonBox.setAlignment(Pos.CENTER);
+
+                ToggleGroup periodGroup = new ToggleGroup();
+                ToggleButton period2 = new ToggleButton("2H");
+                ToggleButton period24 = new ToggleButton("24H");
+                SegmentedButton periodButtons = new SegmentedButton(period2, period24);
+                periodButtons.setToggleGroup(periodGroup);
+                periodGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
+                    expandedChart.maxPeriodHours = (newValue == period2 ? 2 : 24);
+                    expandedChart.update(AppServices.getMempoolHistogram());
+                });
+
+                Optional<Date> optEarliest = AppServices.getMempoolHistogram().keySet().stream().findFirst();
+                period24.setDisable(optEarliest.isEmpty() || optEarliest.get().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().isAfter(LocalDateTime.now().minusHours(2)));
+
+                Region region = new Region();
+                HBox.setHgrow(region, Priority.SOMETIMES);
+
+                Button button = new Button("Close");
+                button.setOnAction(e -> {
+                    stage.close();
+                });
+                buttonBox.getChildren().addAll(periodButtons, region, button);
+                vBox.getChildren().addAll(expandedChart, buttonBox);
+                scenePane.getChildren().add(vBox);
+
+                Scene scene = new Scene(scenePane);
+                AppServices.onEscapePressed(scene, stage::close);
+                AppServices.setStageIcon(stage);
+                stage.setScene(scene);
+                stage.setOnShowing(e -> {
+                    AppServices.moveToActiveWindowScreen(stage, 800, 460);
+                });
+                stage.setOnHidden(e -> {
+                    expandedChart = null;
+                });
+                stage.show();
+            }
+        }
+    };
+
+    public MempoolSizeFeeRatesChart() {
+        super(new CategoryAxis(), new NumberAxis());
+    }
+
    public MempoolSizeFeeRatesChart(@NamedArg("xAxis") Axis<String> xAxis, @NamedArg("yAxis") Axis<Number> yAxis) {
        super(xAxis, yAxis);
+        setOnMouseClicked(expandedChartHandler);
    }

    public void initialize() {
+        getStyleClass().add("vsizeChart");
        setCreateSymbols(false);
        setCursor(Cursor.CROSSHAIR);
        setVerticalGridLinesVisible(false);
@@ -78,17 +173,18 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
            }
        });

-        long previousFeeRate = 0;
-        for(Long feeRate : AppServices.FEE_RATES_RANGE) {
+        for(int i = 0; i < FEE_RATES_INTERVALS.size(); i++) {
+            int feeRate = FEE_RATES_INTERVALS.get(i);
+            int nextFeeRate = (i == FEE_RATES_INTERVALS.size() - 1 ? Integer.MAX_VALUE : FEE_RATES_INTERVALS.get(i+1));
            XYChart.Series<String, Number> series = new XYChart.Series<>();
-            series.setName(feeRate + "+ sats/vB");
+            series.setName(feeRate + "-" + (nextFeeRate == Integer.MAX_VALUE ? 900 : nextFeeRate));
            long seriesTotalVSize = 0;

            for(Date date : periodRateSizes.keySet()) {
                Set<MempoolRateSize> rateSizes = periodRateSizes.get(date);
                long totalVSize = 0;
                for(MempoolRateSize rateSize : rateSizes) {
-                    if(rateSize.getFee() > previousFeeRate && rateSize.getFee() <= feeRate) {
+                    if(rateSize.getFee() >= feeRate && rateSize.getFee() < nextFeeRate) {
                        totalVSize += rateSize.getVSize();
                    }
                }
@@ -100,8 +196,19 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
            if(seriesTotalVSize > 0) {
                getData().add(series);
            }
+        }

-            previousFeeRate = feeRate;
+        for(int i = 0; i < getData().size(); i++) {
+            Series<String, Number> series = getData().get(i);
+            Set<Node> nodes = lookupAll(".series" + i);
+            for(Node node : nodes) {
+                if(node.getStyleClass().contains("chart-series-area-line")) {
+                    node.setStyle("-fx-stroke: VSIZE" + series.getName() + "_COLOR; -fx-opacity: 0.2;");
+                } else {
+                    node.setStyle("-fx-fill: VSIZE" + series.getName() + "_COLOR; -fx-opacity: 0.5;");
+                }
+                node.getStyleClass().remove("default-color" + i);
+            }
        }

        final double maxMvB = getMaxMvB(getData());
@@ -131,6 +238,10 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
            numberAxis.setTickLabelsVisible(false);
            numberAxis.setOpacity(0);
        }
+
+        if(expandedChart != null) {
+            expandedChart.update(mempoolRateSizes);
+        }
    }

    private Map<Date, Set<MempoolRateSize>> getPeriodRateSizes(Map<Date, Set<MempoolRateSize>> mempoolRateSizes) {
@@ -138,7 +249,7 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
            return mempoolRateSizes;
        }

-        LocalDateTime period = LocalDateTime.now().minusHours(MAX_PERIOD_HOURS);
+        LocalDateTime period = LocalDateTime.now().minusHours(maxPeriodHours);
        return mempoolRateSizes.entrySet().stream().filter(entry -> {
            LocalDateTime dateTime = entry.getKey().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
            return dateTime.isAfter(period);
@@ -200,11 +311,9 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
                        double mvb = kvb / 1000;
                        if(mvb >= 0.01 || (maxMvB < Y_VALUE_BREAK_MVB && mvb > 0.001)) {
                            String amount = (maxMvB < Y_VALUE_BREAK_MVB ? (int)kvb + " kvB" : String.format("%.2f", mvb) + " MvB");
-                            Label label = new Label(series.getName() + ": " + amount);
+                            Label label = new Label(series.getName() + " sats/vB: " + amount);
                            Glyph circle = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CIRCLE);
-                            if(i < 8) {
-                                circle.setStyle("-fx-text-fill: CHART_COLOR_" + (i+1));
-                            }
+                            circle.setStyle("-fx-text-fill: VSIZE" + series.getName() + "_COLOR; -fx-opacity: 0.7;");
                            label.setGraphic(circle);
                            getChildren().add(label);
                        }
@@ -5,16 +5,16 @@ import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.crypto.Bip322;
 import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.event.OpenWalletsEvent;
-import com.sparrowwallet.sparrow.event.RequestOpenWalletsEvent;
-import com.sparrowwallet.sparrow.event.StorageEvent;
-import com.sparrowwallet.sparrow.event.TimedEvent;
+import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Storage;
 import javafx.application.Platform;
 import javafx.scene.control.*;
@@ -22,6 +22,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.SegmentedButton;
+import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
@@ -37,6 +38,8 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Optional;

+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+
 public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
    private static final Logger log = LoggerFactory.getLogger(MessageSignDialog.class);

@@ -46,9 +49,10 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
    private final ToggleGroup formatGroup;
    private final ToggleButton formatTrezor;
    private final ToggleButton formatElectrum;
+    private final ToggleButton formatBip322;
    private final Wallet wallet;
    private WalletNode walletNode;
-    private boolean electrumSignatureFormat;
+    private boolean canSign;
    private boolean closed;

    /**
@@ -89,10 +93,12 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
    public MessageSignDialog(Wallet wallet, WalletNode walletNode, String title, String msg, ButtonType... buttons) {
        if(walletNode != null) {
            checkWalletSigning(walletNode.getWallet());
+            this.canSign = canSign(walletNode.getWallet());
        }

        if(wallet != null) {
            checkWalletSigning(wallet);
+            this.canSign = canSign(wallet);
        }

        this.wallet = wallet;
@@ -125,7 +131,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        address = new TextField();
        address.getStyleClass().add("id");
        address.setEditable(walletNode == null);
-        address.setTooltip(new Tooltip("Only Legacy (P2PKH), Nested Segwit (P2SH-P2WPKH) and Native Segwit (P2WPKH) singlesig addresses can sign"));
+        address.setTooltip(new Tooltip("Only singlesig addresses can sign"));
        addressField.getInputs().add(address);

        if(walletNode != null) {
@@ -136,17 +142,18 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        messageField.setText("Message:");
        message = new TextArea();
        message.setWrapText(true);
-        message.setPrefRowCount(10);
-        message.setStyle("-fx-pref-height: 180px");
+        message.setPrefRowCount(8);
+        message.setStyle("-fx-pref-height: 160px");
        messageField.getInputs().add(message);

        Field signatureField = new Field();
        signatureField.setText("Signature:");
        signature = new TextArea();
        signature.getStyleClass().add("id");
-        signature.setPrefRowCount(2);
-        signature.setStyle("-fx-pref-height: 60px");
+        signature.setPrefRowCount(4);
+        signature.setStyle("-fx-pref-height: 80px");
        signature.setWrapText(true);
+        signature.setOnMouseClicked(event -> signature.selectAll());
        signatureField.getInputs().add(signature);

        Field formatField = new Field();
@@ -154,16 +161,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        formatGroup = new ToggleGroup();
        formatElectrum = new ToggleButton("Standard (Electrum)");
        formatTrezor = new ToggleButton("BIP137 (Trezor)");
-        SegmentedButton formatButtons = new SegmentedButton(formatElectrum, formatTrezor);
+        formatBip322 = new ToggleButton("BIP322 (Simple)");
+        SegmentedButton formatButtons = new SegmentedButton(formatElectrum, formatTrezor, formatBip322);
        formatButtons.setToggleGroup(formatGroup);
        formatField.getInputs().add(formatButtons);

-        formatGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
-            electrumSignatureFormat = (newValue == formatElectrum);
-        });
-
-        formatButtons.setDisable(wallet != null && walletNode != null && wallet.getScriptType() == ScriptType.P2PKH);
-
        fieldset.getChildren().addAll(addressField, messageField, signatureField, formatField);
        form.getChildren().add(fieldset);
        dialogPane.setContent(form);
@@ -176,6 +178,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            formatButtons.setDisable(true);
        }

+        ButtonType showQrButtonType = new javafx.scene.control.ButtonType("Sign by QR", ButtonBar.ButtonData.LEFT);
        ButtonType signButtonType = new javafx.scene.control.ButtonType("Sign", ButtonBar.ButtonData.BACK_PREVIOUS);
        ButtonType verifyButtonType = new javafx.scene.control.ButtonType("Verify", ButtonBar.ButtonData.NEXT_FORWARD);
        ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -194,10 +197,20 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                });
            }
        } else {
-            dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);
+            dialogPane.getButtonTypes().addAll(showQrButtonType, signButtonType, verifyButtonType, doneButtonType);
+
+            Button showQrButton = (Button) dialogPane.lookupButton(showQrButtonType);
+            showQrButton.setDisable(wallet == null);
+            showQrButton.setGraphic(getGlyph(new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QRCODE)));
+            showQrButton.setGraphicTextGap(5);
+            showQrButton.setOnAction(event -> {
+                showQr();
+            });

            Button signButton = (Button) dialogPane.lookupButton(signButtonType);
-            signButton.setDisable(wallet == null);
+            signButton.setDisable(!canSign);
+            signButton.setGraphic(getGlyph(getSignGlyph()));
+            signButton.setGraphicTextGap(5);
            signButton.setOnAction(event -> {
                signMessage();
            });
@@ -209,7 +222,8 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            });

            boolean validAddress = isValidAddress();
-            signButton.setDisable(!validAddress || (wallet == null));
+            showQrButton.setDisable(!validAddress || (wallet == null));
+            signButton.setDisable(!validAddress || !canSign);
            verifyButton.setDisable(!validAddress);

            ValidationSupport validationSupport = new ValidationSupport();
@@ -220,13 +234,17 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {

            address.textProperty().addListener((observable, oldValue, newValue) -> {
                boolean valid = isValidAddress();
-                signButton.setDisable(!valid || (wallet == null));
+                showQrButton.setDisable(!valid || (wallet == null));
+                signButton.setDisable(!valid || !canSign);
                verifyButton.setDisable(!valid);

-                if(valid && wallet != null) {
+                if(valid) {
                    try {
                        Address address = getAddress();
-                        setWalletNodeFromAddress(wallet, address);
+                        setFormatFromScriptType(address.getScriptType());
+                        if(wallet != null) {
+                            setWalletNodeFromAddress(wallet, address);
+                        }
                    } catch(InvalidAddressException e) {
                        //can't happen
                    }
@@ -249,7 +267,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {

        AppServices.onEscapePressed(dialogPane.getScene(), () -> setResult(ButtonBar.ButtonData.CANCEL_CLOSE));
        AppServices.moveToActiveWindowScreen(this);
-        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
+        setResultConverter(dialogButton -> dialogButton == showQrButtonType || dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());

        Platform.runLater(() -> {
            if(address.getText().isEmpty()) {
@@ -258,7 +276,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                message.requestFocus();
            }

-            formatGroup.selectToggle(formatElectrum);
+            if(wallet != null && walletNode != null) {
+                setFormatFromScriptType(wallet.getScriptType());
+            } else {
+                formatGroup.selectToggle(formatElectrum);
+            }
        });
    }

@@ -266,9 +288,12 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        if(wallet.getKeystores().size() != 1) {
            throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
        }
-        if(!wallet.getKeystores().get(0).hasPrivateKey() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB && !wallet.getKeystores().get(0).getWalletModel().isCard()) {
-            throw new IllegalArgumentException("Cannot sign messages using a wallet without private keys or a connected keystore");
-        }
+    }
+
+    private boolean canSign(Wallet wallet) {
+        return wallet.getKeystores().get(0).hasPrivateKey()
+                || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB
+                || wallet.getKeystores().get(0).getWalletModel().isCard();
    }

    private Address getAddress()throws InvalidAddressException {
@@ -279,20 +304,10 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        return signature.getText();
    }

-    /**
-     * Use the Electrum signing format, which uses the non-segwit compressed signing parameters for both segwit types (p2sh-p2wpkh and p2wpkh)
-     *
-     * @param electrumSignatureFormat
-     */
-    public void setElectrumSignatureFormat(boolean electrumSignatureFormat) {
-        formatGroup.selectToggle(electrumSignatureFormat ? formatElectrum : formatTrezor);
-        this.electrumSignatureFormat = electrumSignatureFormat;
-    }
-
    private boolean isValidAddress() {
        try {
            Address address = getAddress();
-            return address.getScriptType() != ScriptType.P2TR && (address.getScriptType().isAllowed(PolicyType.SINGLE) || address.getScriptType() == ScriptType.P2SH);
+            return address.getScriptType().isAllowed(PolicyType.SINGLE) || address.getScriptType() == ScriptType.P2SH;
        } catch (InvalidAddressException e) {
            return false;
        }
@@ -302,12 +317,36 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        walletNode = wallet.getWalletAddresses().get(address);
    }

+    private void setFormatFromScriptType(ScriptType scriptType) {
+        formatElectrum.setDisable(scriptType == ScriptType.P2TR);
+        formatTrezor.setDisable(scriptType == ScriptType.P2TR || scriptType == ScriptType.P2PKH);
+        formatBip322.setDisable(scriptType != ScriptType.P2WPKH && scriptType != ScriptType.P2TR);
+        if(scriptType == ScriptType.P2TR) {
+            formatGroup.selectToggle(formatBip322);
+        } else if(formatGroup.getSelectedToggle() == null || scriptType == ScriptType.P2PKH || (scriptType != ScriptType.P2WPKH && formatBip322.isSelected())) {
+            formatGroup.selectToggle(formatElectrum);
+        }
+    }
+
+    private boolean isBip322() {
+        return formatBip322.isSelected();
+    }
+
+    private boolean isElectrumSignatureFormat() {
+        return formatElectrum.isSelected();
+    }
+
    private void signMessage() {
        if(walletNode == null) {
            AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
            return;
        }

+        if(!canSign) {
+            AppServices.showErrorDialog("Wallet can't sign", "This wallet cannot sign a message.");
+            return;
+        }
+
        //Note we can expect a single keystore due to the check in the constructor
        Wallet signingWallet = walletNode.getWallet();
        if(signingWallet.getKeystores().get(0).hasPrivateKey()) {
@@ -325,8 +364,14 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        try {
            Keystore keystore = decryptedWallet.getKeystores().get(0);
            ECKey privKey = keystore.getKey(walletNode);
-            ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType();
-            String signatureText = privKey.signMessage(message.getText().trim(), scriptType);
+            String signatureText;
+            if(isBip322()) {
+                ScriptType scriptType = decryptedWallet.getScriptType();
+                signatureText = Bip322.signMessageBip322(scriptType, message.getText().trim(), privKey);
+            } else {
+                ScriptType scriptType = isElectrumSignatureFormat() ? ScriptType.P2PKH : decryptedWallet.getScriptType();
+                signatureText = privKey.signMessage(message.getText().trim(), scriptType);
+            }
            signature.clear();
            signature.appendText(signatureText);
            privKey.clear();
@@ -340,6 +385,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        List<String> fingerprints = List.of(deviceWallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint());
        KeyDerivation fullDerivation = deviceWallet.getKeystores().get(0).getKeyDerivation().extend(walletNode.getDerivation());
        DeviceSignMessageDialog deviceSignMessageDialog = new DeviceSignMessageDialog(fingerprints, deviceWallet, message.getText().trim(), fullDerivation);
+        deviceSignMessageDialog.initOwner(getDialogPane().getScene().getWindow());
        Optional<String> optSignature = deviceSignMessageDialog.showAndWait();
        if(optSignature.isPresent()) {
            signature.clear();
@@ -353,16 +399,33 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            //http://www.secg.org/download/aid-780/sec1-v2.pdf section 4.1.6
            boolean verified = false;
            try {
-                ECKey signedMessageKey = ECKey.signedMessageToKey(message.getText().trim(), signature.getText().trim(), false);
+                ECKey signedMessageKey = ECKey.signedMessageToKey(message.getText().trim(), signature.getText().trim(), true);
                verified = verifyMessage(signedMessageKey);
+                if(verified) {
+                    formatGroup.selectToggle(formatElectrum);
+                }
            } catch(SignatureException e) {
                //ignore
            }

            if(!verified) {
                try {
-                    ECKey electrumSignedMessageKey = ECKey.signedMessageToKey(message.getText(), signature.getText(), true);
+                    ECKey electrumSignedMessageKey = ECKey.signedMessageToKey(message.getText(), signature.getText(), false);
                    verified = verifyMessage(electrumSignedMessageKey);
+                    if(verified) {
+                        formatGroup.selectToggle(formatTrezor);
+                    }
+                } catch(SignatureException e) {
+                    //ignore
+                }
+            }
+
+            if(!verified && Bip322.isSupported(getAddress().getScriptType()) && !signature.getText().trim().isEmpty()) {
+                try {
+                    verified = Bip322.verifyMessageBip322(getAddress().getScriptType(), getAddress(), message.getText().trim(), signature.getText().trim());
+                    if(verified) {
+                        formatGroup.selectToggle(formatBip322);
+                    }
                } catch(SignatureException e) {
                    //ignore
                }
@@ -395,6 +458,60 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        return providedAddress.equals(signedMessageAddress);
    }

+    private void showQr() {
+        if(walletNode == null) {
+            AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
+            return;
+        }
+
+        //Note we can expect a single keystore due to the check in the constructor
+        KeyDerivation firstDerivation = walletNode.getWallet().getKeystores().get(0).getKeyDerivation();
+        String derivationPath = KeyDerivation.writePath(firstDerivation.extend(walletNode.getDerivation()).getDerivation(), false);
+
+        String qrText = "signmessage " + derivationPath + " ascii:" + message.getText().trim();
+        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(qrText, true);
+        qrDisplayDialog.initOwner(getDialogPane().getScene().getWindow());
+        Optional<ButtonType> optButtonType = qrDisplayDialog.showAndWait();
+        if(optButtonType.isPresent() && optButtonType.get().getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+            scanQr();
+        }
+    }
+
+    private void scanQr() {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
+        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
+        if(optionalResult.isPresent()) {
+            QRScanDialog.Result result = optionalResult.get();
+            if(result.payload != null) {
+                signature.clear();
+                signature.appendText(result.payload);
+            } else if(result.exception != null) {
+                log.error("Error scanning QR", result.exception);
+                showErrorDialog("Error scanning QR", result.exception.getMessage());
+            } else {
+                AppServices.showErrorDialog("Invalid QR Code", "Cannot parse QR code into a signature.");
+            }
+        }
+    }
+
+    protected Glyph getSignGlyph() {
+        if(wallet != null) {
+            if(wallet.containsSource(KeystoreSource.HW_USB)) {
+                return new Glyph(FontAwesome5Brands.FONT_NAME, FontAwesome5Brands.Glyph.USB);
+            } else if(wallet.getKeystores().get(0).getWalletModel().isCard()) {
+                return new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WIFI);
+            }
+        }
+
+        return new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
+    }
+
+    private static Glyph getGlyph(Glyph glyph) {
+        glyph.setFontSize(11);
+        return glyph;
+    }
+
    @Subscribe
    public void openWallets(OpenWalletsEvent event) {
        Storage storage = event.getStorage(wallet);
@@ -404,6 +521,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        }

        WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+        dlg.initOwner(getDialogPane().getScene().getWindow());
        Optional<SecureString> password = dlg.showAndWait();
        if(password.isPresent()) {
            Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(walletNode.getWallet().copy(), password.get());
@@ -415,7 +533,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            });
            decryptWalletService.setOnFailed(workerStateEvent -> {
                EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Failed"));
-                AppServices.showErrorDialog("Incorrect Password", decryptWalletService.getException().getMessage());
+                AppServices.showErrorDialog("Incorrect Password", "The password was incorrect.");
            });
            EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.START, "Decrypting wallet..."));
            decryptWalletService.start();
@@ -70,7 +70,7 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
    }

    private void setMixFail(MixFailReason mixFailReason, String mixError, Long mixErrorTimestamp) {
-        if(mixFailReason != MixFailReason.CANCEL) {
+        if(mixFailReason.isError()) {
            long elapsed = mixErrorTimestamp == null ? 0L : System.currentTimeMillis() - mixErrorTimestamp;
            if(elapsed >= ERROR_DISPLAY_MILLIS) {
                //Old error, don't set again.
@@ -116,22 +116,10 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
            progressIndicator.setProgress(mixProgress.getMixStep().getProgressPercent() == 100 ? -1 : mixProgress.getMixStep().getProgressPercent() / 100.0);
            setGraphic(progressIndicator);
            Tooltip tt = new Tooltip();
-            String status = mixProgress.getMixStep().getMessage().substring(0, 1).toUpperCase(Locale.ROOT) + mixProgress.getMixStep().getMessage().substring(1);
+            String status = mixProgress.getMixStep().getMessage().replaceAll("_", " ");
+            status = status.substring(0, 1).toUpperCase(Locale.ROOT) + status.substring(1).toLowerCase(Locale.ROOT);
            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);
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -14,17 +15,16 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
 import javafx.stage.FileChooser;
 import org.controlsfx.control.spreadsheet.*;
 import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;

 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -40,7 +40,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
    private final BooleanProperty initializedProperty = new SimpleBooleanProperty(false);
    private final BooleanProperty wordsSelectedProperty = new SimpleBooleanProperty(false);

-    private final List<TablePosition> selectedCells = new ArrayList<>();
+    private final ObservableList<TablePosition> selectedCells = FXCollections.observableArrayList();

    public MnemonicGridDialog() {
        DialogPane dialogPane = new MnemonicGridDialogPane();
@@ -48,7 +48,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
        setTitle("Border Wallets Grid");
        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
        dialogPane.getStylesheets().add(AppServices.class.getResource("grid.css").toExternalForm());
-        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid. Note the order of selection is important!");
+        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid.\nThe order of selection is important!");
        javafx.scene.image.Image image = new Image("/image/border-wallets.png");
        dialogPane.setGraphic(new ImageView(image));

@@ -56,37 +56,56 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
        Grid grid = getGrid(emptyWordGrid);

        spreadsheetView = new SpreadsheetView(grid);
-        spreadsheetView.addEventFilter(MouseEvent.MOUSE_PRESSED, event -> {
-            try {
-                Field f = event.getClass().getDeclaredField(Platform.getCurrent() == Platform.OSX ? "metaDown" : "controlDown");
-                f.setAccessible(true);
-                f.set(event, true);
-            } catch(IllegalAccessException | NoSuchFieldException e) {
-                //ignore
-            }
-        });
        spreadsheetView.setId("grid");
        spreadsheetView.setEditable(false);
        spreadsheetView.setFixingColumnsAllowed(false);
        spreadsheetView.setFixingRowsAllowed(false);
+        spreadsheetView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);

        spreadsheetView.getSelectionModel().getSelectedCells().addListener(new ListChangeListener<>() {
            @Override
            public void onChanged(Change<? extends TablePosition> c) {
                while(c.next()) {
-                    if(c.wasRemoved()) {
-                        selectedCells.removeAll(c.getRemoved());
-                    }
                    if(c.wasAdded()) {
-                        selectedCells.addAll(c.getAddedSubList());
+                        for(TablePosition<?, ?> pos : c.getAddedSubList()) {
+                            if(selectedCells.contains(pos)) {
+                                selectedCells.remove(pos);
+                            } else {
+                                selectedCells.add(pos);
+                            }
+                        }
                    }
                }

-                int numWords = c.getList().size();
+                int numWords = selectedCells.size();
                wordsSelectedProperty.set(numWords == 11 || numWords == 23);
            }
        });

+        selectedCells.addListener((ListChangeListener<? super TablePosition>) c -> {
+            while(c.next()) {
+                if(c.wasRemoved()) {
+                    for(TablePosition<?,?> pos : c.getRemoved()) {
+                        SpreadsheetCell cell = spreadsheetView.getGrid().getRows().get(pos.getRow()).get(pos.getColumn());
+                        cell.getStyleClass().remove("selection");
+                        cell.setGraphic(null);
+                    }
+                }
+                if(c.wasAdded()) {
+                    for(TablePosition<?,?> pos : c.getAddedSubList()) {
+                        SpreadsheetCell cell = spreadsheetView.getGrid().getRows().get(pos.getRow()).get(pos.getColumn());
+                        cell.getStyleClass().add("selection");
+                    }
+                }
+                for(int i = 0; i < selectedCells.size(); i++) {
+                    Text index = new Text(Integer.toString(i+1));
+                    index.setFont(Font.font(8));
+                    SpreadsheetCell cell = spreadsheetView.getGrid().getRows().get(selectedCells.get(i).getRow()).get(selectedCells.get(i).getColumn());
+                    cell.setGraphic(index);
+                }
+            }
+        });
+
        StackPane stackPane = new StackPane();
        stackPane.getChildren().add(spreadsheetView);
        dialogPane.setContent(stackPane);
@@ -104,7 +123,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
        final ButtonType loadCsvButtonType = new javafx.scene.control.ButtonType("Load PDF...", ButtonBar.ButtonData.LEFT);
        dialogPane.getButtonTypes().add(loadCsvButtonType);

-        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate Grid...", ButtonBar.ButtonData.HELP);
+        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate Grid...", ButtonBar.ButtonData.HELP_2);
        dialogPane.getButtonTypes().add(generateButtonType);

        final ButtonType clearButtonType = new javafx.scene.control.ButtonType("Clear Selection", ButtonBar.ButtonData.OTHER);
@@ -118,8 +137,9 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
            return data == ButtonBar.ButtonData.OK_DONE ? getSelectedWords() : null;
        });

-        dialogPane.setPrefWidth(850);
+        dialogPane.setPrefWidth(952);
        dialogPane.setPrefHeight(500);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
        AppServices.setStageIcon(dialogPane.getScene().getWindow());
        AppServices.moveToActiveWindowScreen(this);
    }
@@ -151,20 +171,31 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
        List<String> abbreviations = selectedCells.stream()
                .map(position -> (String)spreadsheetView.getGrid().getRows().get(position.getRow()).get(position.getColumn()).getItem()).collect(Collectors.toList());

+        boolean isInteger = abbreviations.stream().allMatch(Utils::isNumber);
+        boolean isHex = abbreviations.stream().allMatch(Utils::isHex);
+
        List<String> words = new ArrayList<>();
        for(String abbreviation : abbreviations) {
-            for(String word : Bip39MnemonicCode.INSTANCE.getWordList()) {
-                if((abbreviation.length() == 3 && word.equals(abbreviation)) || (abbreviation.length() >= 4 && word.startsWith(abbreviation))) {
-                    words.add(word);
-                    break;
+            if(isInteger) {
+                try {
+                    int index = Integer.parseInt(abbreviation);
+                    words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
+                } catch(NumberFormatException e) {
+                    //ignore
+                }
+            } else if(isHex) {
+                try {
+                    int index = Integer.parseInt(abbreviation, 16);
+                    words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
+                } catch(NumberFormatException e) {
+                    //ignore
+                }
+            } else {
+                for(String word : Bip39MnemonicCode.INSTANCE.getWordList()) {
+                    if((abbreviation.length() == 3 && word.equals(abbreviation)) || (abbreviation.length() >= 4 && word.startsWith(abbreviation))) {
+                        words.add(word);
+                    }
                }
-            }
-
-            try {
-                int index = Integer.parseInt(abbreviation);
-                words.add(Bip39MnemonicCode.INSTANCE.getWordList().get(index - 1));
-            } catch(NumberFormatException e) {
-                //ignore
            }
        }

@@ -235,6 +266,8 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                        try(BufferedInputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
                            String[][] wordGrid = PdfUtils.getWordGrid(inputStream);
                            spreadsheetView.setGrid(getGrid(wordGrid));
+                            selectedCells.clear();
+                            spreadsheetView.getSelectionModel().clearSelection();
                            initializedProperty.set(true);
                        } catch(Exception e) {
                            AppServices.showErrorDialog("Cannot load PDF", e.getMessage());
@@ -243,18 +276,21 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                });

                button = loadButton;
-            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.HELP) {
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.HELP_2) {
                Button generateButton = new Button(buttonType.getText());
                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                ButtonBar.setButtonData(generateButton, buttonData);
                generateButton.setOnAction(event -> {
-                    SeedEntryDialog seedEntryDialog = new SeedEntryDialog(12);
+                    SeedEntryDialog seedEntryDialog = new SeedEntryDialog("Border Wallets Entropy Grid Recovery Seed", 12);
+                    seedEntryDialog.initOwner(getDialogPane().getScene().getWindow());
                    Optional<List<String>> optWords = seedEntryDialog.showAndWait();
                    if(optWords.isPresent()) {
                        List<String> mnemonicWords = optWords.get();
                        List<String> shuffledWordList = shuffle(mnemonicWords);
                        String[][] wordGrid = toGrid(shuffledWordList);
                        spreadsheetView.setGrid(getGrid(wordGrid));
+                        selectedCells.clear();
+                        spreadsheetView.getSelectionModel().clearSelection();
                        initializedProperty.set(true);

                        if(seedEntryDialog.isGenerated()) {
@@ -269,6 +305,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                ButtonBar.setButtonData(clearButton, buttonData);
                clearButton.setOnAction(event -> {
+                    selectedCells.clear();
                    spreadsheetView.getSelectionModel().clearSelection();
                });

@@ -18,8 +18,8 @@ public class MnemonicKeystoreEntryPane extends MnemonicKeystorePane {

    private boolean generated;

-    public MnemonicKeystoreEntryPane(int numWords) {
-        super(DeterministicSeed.Type.BIP39.getName(), "Enter seed words", "", "image/" + WalletModel.SEED.getType() + ".png");
+    public MnemonicKeystoreEntryPane(String name, int numWords) {
+        super(name, "Enter seed words", "", "image/" + WalletModel.SEED.getType() + ".png");
        showHideLink.setVisible(false);
        buttonBox.getChildren().clear();

@@ -33,6 +33,7 @@ import java.util.Optional;
 public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
    protected final Wallet wallet;
    private final KeystoreMnemonicImport importer;
+    private final KeyDerivation defaultDerivation;

    private SplitMenuButton importButton;

@@ -43,10 +44,11 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
    private Button confirmButton;
    private List<String> generatedMnemonicCode;

-    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer) {
+    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer, KeyDerivation defaultDerivation) {
        super(importer.getName(), "Create or enter seed", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
        this.wallet = wallet;
        this.importer = importer;
+        this.defaultDerivation = defaultDerivation;

        createImportButton();
        buttonBox.getChildren().add(importButton);
@@ -59,7 +61,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
        importButton.getStyleClass().add("default-button");
        importButton.setOnAction(event -> {
            importButton.setDisable(true);
-            importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
+            importKeystore(getDefaultDerivation(), false);
        });
        String[] accounts = new String[] {"Import Default Account #0", "Import Account #1", "Import Account #2", "Import Account #3", "Import Account #4", "Import Account #5", "Import Account #6", "Import Account #7", "Import Account #8", "Import Account #9"};
        int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
@@ -77,6 +79,10 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
        importButton.setVisible(false);
    }

+    private List<ChildNumber> getDefaultDerivation() {
+        return defaultDerivation == null || defaultDerivation.getDerivation().isEmpty() ? wallet.getScriptType().getDefaultDerivation() : defaultDerivation.getDerivation();
+    }
+
    protected void enterMnemonic(int numWords) {
        generatedMnemonicCode = null;
        super.enterMnemonic(numWords);
@@ -243,7 +249,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
            setDescription("Ready to import");
            showHideLink.setText("Show Derivation...");
            showHideLink.setVisible(false);
-            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+            setContent(getDerivationEntry(getDefaultDerivation()));
        }
    }

@@ -254,6 +260,7 @@ public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
            if(!dryrun) {
                if(passphraseProperty.get() != null && !passphraseProperty.get().isEmpty()) {
                    KeystorePassphraseDialog keystorePassphraseDialog = new KeystorePassphraseDialog(null, keystore, true);
+                    keystorePassphraseDialog.initOwner(this.getScene().getWindow());
                    Optional<String> optPassphrase = keystorePassphraseDialog.showAndWait();
                    if(optPassphrase.isEmpty() || !optPassphrase.get().equals(passphraseProperty.get())) {
                        throw new ImportException("Re-entered passphrase did not match");
@@ -97,6 +97,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {

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

    protected void scanQR() {
        QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(this.getScene().getWindow());
        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
        if(optionalResult.isPresent()) {
            QRScanDialog.Result result = optionalResult.get();
@@ -109,6 +109,7 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {

        List<List<ChildNumber>> derivations = ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE).stream().map(ScriptType::getDefaultDerivation).collect(Collectors.toList());
        derivations.add(List.of(new ChildNumber(0, true)));
+        derivations.add(ScriptType.P2PKH.getDefaultDerivation(1)); //Bisq segwit misderivation

        for(ScriptType scriptType : ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE)) {
            for(List<ChildNumber> derivation : derivations) {
@@ -110,6 +110,7 @@ public class PayNymCell extends ListCell<PayNym> {
            MenuItem rename = new MenuItem("Rename Contact...");
            rename.setOnAction(event -> {
                WalletLabelDialog walletLabelDialog = new WalletLabelDialog(payNym.nymName(), "Contact");
+                walletLabelDialog.initOwner(PayNymCell.this.getScene().getWindow());
                Optional<String> optLabel = walletLabelDialog.showAndWait();
                if(optLabel.isPresent()) {
                    int index = getListView().getItems().indexOf(payNym);
@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;

 import com.google.common.base.Throwables;
+import com.google.common.eventbus.Subscribe;
 import com.google.common.io.Files;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.address.Address;
@@ -14,6 +15,9 @@ import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTInput;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.event.FeeRatesUpdatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.CardApi;
 import com.sparrowwallet.sparrow.io.Config;
@@ -46,10 +50,7 @@ import tornadofx.control.Form;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;

 import static com.sparrowwallet.drongo.protocol.ScriptType.P2TR;
@@ -62,6 +63,8 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
    private final CopyableLabel keyAddress;
    private final ComboBoxTextField toAddress;
    private final ComboBox<Wallet> toWallet;
+    private final FeeRangeSlider feeRange;
+    private final CopyableLabel feeRate;

    public PrivateKeySweepDialog(Wallet wallet) {
        final DialogPane dialogPane = getDialogPane();
@@ -146,7 +149,24 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
        stackPane.getChildren().addAll(toWallet, toAddress);
        toAddressField.getInputs().add(stackPane);

-        fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField);
+        Field feeRangeField = new Field();
+        feeRangeField.setText("Fee range:");
+        feeRange = new FeeRangeSlider();
+        feeRange.setMaxWidth(320);
+        feeRangeField.getInputs().add(feeRange);
+
+        Field feeRateField = new Field();
+        feeRateField.setText("Fee rate:");
+        feeRate = new CopyableLabel();
+        feeRateField.getInputs().add(feeRate);
+
+        feeRange.valueProperty().addListener((observable, oldValue, newValue) -> {
+            updateFeeRate();
+        });
+        feeRange.setFeeRate(AppServices.getDefaultFeeRate());
+        updateFeeRate();
+
+        fieldset.getChildren().addAll(keyField, keyScriptTypeField, addressField, toAddressField, feeRangeField, feeRateField);
        form.getChildren().add(fieldset);
        dialogPane.setContent(form);

@@ -170,6 +190,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {

            boolean isValidKey = isValidKey();
            createButton.setDisable(!isValidKey || !isValidToAddress());
+            setScriptTypes(isValidKey);
            if(isValidKey) {
                setFromAddress();
            }
@@ -201,6 +222,11 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
        setResultConverter(dialogButton -> null);
        dialogPane.setPrefWidth(680);

+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+
        ValidationSupport validationSupport = new ValidationSupport();
        Platform.runLater(() -> {
            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
@@ -224,6 +250,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {

    private void decryptKey() {
        PassphraseDialog passphraseDialog = new PassphraseDialog();
+        passphraseDialog.initOwner(getDialogPane().getScene().getWindow());
        Optional<String> optPassphrase = passphraseDialog.showAndWait();
        if(optPassphrase.isPresent()) {
            try {
@@ -263,8 +290,19 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
        keyAddress.setText(address.toString());
    }

+    private void setScriptTypes(boolean isValidKey) {
+        boolean compressed = !isValidKey || getPrivateKey().getKey().isCompressed();
+        if(compressed && !keyScriptType.getItems().equals(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE))) {
+            keyScriptType.getItems().addAll(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE).stream().filter(s -> !keyScriptType.getItems().contains(s)).collect(Collectors.toList()));
+        } else if(!compressed && !keyScriptType.getItems().equals(List.of(ScriptType.P2PKH))) {
+            keyScriptType.getSelectionModel().select(0);
+            keyScriptType.getItems().removeIf(scriptType -> scriptType != ScriptType.P2PKH);
+        }
+    }
+
    private void scanPrivateKey() {
        QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
        Optional<QRScanDialog.Result> result = qrScanDialog.showAndWait();
        if(result.isPresent() && result.get().payload != null) {
            key.setText(result.get().payload);
@@ -294,6 +332,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {

    private void unsealPrivateKey() {
        DeviceUnsealDialog deviceUnsealDialog = new DeviceUnsealDialog(Collections.emptyList());
+        deviceUnsealDialog.initOwner(getDialogPane().getScene().getWindow());
        Optional<DeviceUnsealDialog.DevicePrivateKey> optPrivateKey = deviceUnsealDialog.showAndWait();
        if(optPrivateKey.isPresent()) {
            DeviceUnsealDialog.DevicePrivateKey devicePrivateKey = optPrivateKey.get();
@@ -312,6 +351,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
            Date since = null;
            if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
                WalletBirthDateDialog addressScanDateDialog = new WalletBirthDateDialog(null, true);
+                addressScanDateDialog.initOwner(getDialogPane().getScene().getWindow());
                Optional<Date> optSince = addressScanDateDialog.showAndWait();
                if(optSince.isPresent()) {
                    since = optSince.get();
@@ -330,6 +370,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {

            if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
                ServiceProgressDialog serviceProgressDialog = new ServiceProgressDialog("Address Scan", "Scanning address for transactions...", "/image/sparrow.png", addressUtxosService);
+                serviceProgressDialog.initOwner(getDialogPane().getScene().getWindow());
                AppServices.moveToActiveWindowScreen(serviceProgressDialog);
            }

@@ -352,7 +393,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
        TransactionOutput sweepOutput = new TransactionOutput(noFeeTransaction, total, destAddress.getOutputScript());
        noFeeTransaction.addOutput(sweepOutput);

-        Double feeRate = AppServices.getDefaultFeeRate();
+        double feeRate = feeRange.getFeeRate();
        long fee = (long)Math.ceil(noFeeTransaction.getVirtualSize() * feeRate);
        if(feeRate == Transaction.DEFAULT_MIN_RELAY_FEE) {
            fee++;
@@ -378,11 +419,17 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
        transaction.addOutput(new TransactionOutput(transaction, total - fee, destAddress.getOutputScript()));

        PSBT psbt = new PSBT(transaction);
+        //Set witness UTXOs on PSBT inputs first - they are all required when hashing for a Taproot signature
+        for(int i = 0; i < txOutputs.size(); i++) {
+            TransactionOutput utxoOutput = txOutputs.get(i);
+            PSBTInput psbtInput = psbt.getPsbtInputs().get(i);
+            psbtInput.setWitnessUtxo(utxoOutput);
+        }
+
        for(int i = 0; i < txOutputs.size(); i++) {
            TransactionOutput utxoOutput = txOutputs.get(i);
            TransactionInput txInput = transaction.getInputs().get(i);
            PSBTInput psbtInput = psbt.getPsbtInputs().get(i);
-            psbtInput.setWitnessUtxo(utxoOutput);

            if(ScriptType.P2SH.isScriptType(utxoOutput.getScript())) {
                psbtInput.setRedeemScript(txInput.getScriptSig().getFirstNestedScript());
@@ -414,6 +461,16 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
        return glyph;
    }

+    private void updateFeeRate() {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        feeRate.setText(format.getCurrencyFormat().format(feeRange.getFeeRate()) + " sats/vB");
+    }
+
+    @Subscribe
+    public void feeRatesUpdated(FeeRatesUpdatedEvent event) {
+        feeRange.updateTrackHighlight();
+    }
+
    public class PassphraseDialog extends Dialog<String> {
        private final CustomPasswordField passphrase;

@@ -1,22 +1,28 @@
 package com.sparrowwallet.sparrow.control;

 public enum QRDensity {
-    NORMAL("Normal", 250),
-    LOW("Low", 80);
+    NORMAL("Normal", 400, 2000),
+    LOW("Low", 80, 1000);

    private final String name;
-    private final int maxFragmentLength;
+    private final int maxUrFragmentLength;
+    private final int maxBbqrFragmentLength;

-    QRDensity(String name, int maxFragmentLength) {
+    QRDensity(String name, int maxUrFragmentLength, int maxBbqrFragmentLength) {
        this.name = name;
-        this.maxFragmentLength = maxFragmentLength;
+        this.maxUrFragmentLength = maxUrFragmentLength;
+        this.maxBbqrFragmentLength = maxBbqrFragmentLength;
    }

    public String getName() {
        return name;
    }

-    public int getMaxFragmentLength() {
-        return maxFragmentLength;
+    public int getMaxUrFragmentLength() {
+        return maxUrFragmentLength;
+    }
+
+    public int getMaxBbqrFragmentLength() {
+        return maxBbqrFragmentLength;
    }
 }
@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;

 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.client.j2se.MatrixToImageConfig;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
@@ -13,6 +14,9 @@ import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.ImportException;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.UREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoder;
+import com.sparrowwallet.sparrow.io.bbqr.BBQREncoding;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.scene.Node;
@@ -29,21 +33,30 @@ import org.slf4j.LoggerFactory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Optional;

@SuppressWarnings("deprecation")
-public class QRDisplayDialog extends Dialog<UR> {
+public class QRDisplayDialog extends Dialog<ButtonType> {
    private static final Logger log = LoggerFactory.getLogger(QRDisplayDialog.class);

    private static final int MIN_FRAGMENT_LENGTH = 10;

    private static final int ANIMATION_PERIOD_MILLIS = 200;

-    private static final int QR_WIDTH = 480;
-    private static final int QR_HEIGHT = 480;
+    private static final int DEFAULT_QR_SIZE = 580;
+    private static final int REDUCED_QR_SIZE = 520;
+
+    private static final BBQREncoding DEFAULT_BBQR_ENCODING = BBQREncoding.ZLIB;
+
+    private final int qrSize = getQRSize();

    private final UR ur;
-    private UREncoder encoder;
+    private UREncoder urEncoder;
+
+    private final BBQR bbqr;
+    private BBQREncoder bbqrEncoder;
+    private boolean useBbqrEncoding;

    private final ImageView qrImageView;

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

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

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

-    public QRDisplayDialog(UR ur, boolean addLegacyEncodingOption) {
+    public QRDisplayDialog(UR ur, BBQR bbqr, boolean addLegacyEncodingOption, boolean addScanButton, boolean selectBbqrButton) {
        this.ur = ur;
-        this.addLegacyEncodingOption = addLegacyEncodingOption;
-        this.encoder = new UREncoder(ur, Config.get().getQrDensity().getMaxFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+        this.bbqr = bbqr;
+        this.addLegacyEncodingOption = bbqr == null && addLegacyEncodingOption;
+
+        this.urEncoder = new UREncoder(ur, Config.get().getQrDensity().getMaxUrFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+
+        if(bbqr != null) {
+            this.bbqrEncoder = new BBQREncoder(bbqr.type(), DEFAULT_BBQR_ENCODING, bbqr.data(), Config.get().getQrDensity().getMaxBbqrFragmentLength(), 0);
+            if(selectBbqrButton) {
+                useBbqrEncoding = true;
+            }
+        }

        final DialogPane dialogPane = new QRDisplayDialogPane();
        setDialogPane(dialogPane);
@@ -81,16 +103,16 @@ public class QRDisplayDialog extends Dialog<UR> {
        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 {
@@ -98,18 +120,36 @@ public class QRDisplayDialog extends Dialog<UR> {
            dialogPane.getButtonTypes().add(densityButtonType);
        }

-        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
-        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
+        if(bbqr != null) {
+            final ButtonType bbqrButtonType = new javafx.scene.control.ButtonType("Show BBQr", ButtonBar.ButtonData.BACK_PREVIOUS);
+            dialogPane.getButtonTypes().add(bbqrButtonType);
+        }
+
+        if(addScanButton) {
+            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.OK_DONE);
+            dialogPane.getButtonTypes().add(scanButtonType);
+        }
+
+        dialogPane.setPrefWidth(40 + qrSize + 40);
+        dialogPane.setPrefHeight(40 + qrSize + 85);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
        AppServices.moveToActiveWindowScreen(this);

-        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
+        setResultConverter(dialogButton -> dialogButton);
    }

    public QRDisplayDialog(String data) {
-        this.ur = null;
-        this.encoder = null;
+        this(data, false);
+    }

-        final DialogPane dialogPane = getDialogPane();
+    public QRDisplayDialog(String data, boolean addScanButton) {
+        this.ur = null;
+        this.bbqr = null;
+        this.urEncoder = null;
+        this.bbqrEncoder = null;
+
+        final DialogPane dialogPane = new QRDisplayDialogPane();
+        setDialogPane(dialogPane);
        AppServices.setStageIcon(dialogPane.getScene().getWindow());

        StackPane stackPane = new StackPane();
@@ -119,13 +159,24 @@ public class QRDisplayDialog extends Dialog<UR> {
        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
        qrImageView.setImage(getQrCode(data));

-        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
        dialogPane.getButtonTypes().addAll(cancelButtonType);
-        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
-        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
+
+        if(addScanButton) {
+            final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.OK_DONE);
+            dialogPane.getButtonTypes().add(scanButtonType);
+        }
+
+        dialogPane.setPrefWidth(40 + qrSize + 40);
+        dialogPane.setPrefHeight(40 + qrSize + 85);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
        AppServices.moveToActiveWindowScreen(this);

-        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
+        setResultConverter(dialogButton -> dialogButton);
+    }
+
+    private int getQRSize() {
+        return AppServices.isReducedWindowHeight() ? REDUCED_QR_SIZE : DEFAULT_QR_SIZE;
    }

    private void createAnimateQRService() {
@@ -137,9 +188,22 @@ public class QRDisplayDialog extends Dialog<UR> {
        });
    }

+    private boolean isSinglePart() {
+        if(useBbqrEncoding) {
+            return bbqrEncoder.isSinglePart();
+        } else if(!useLegacyEncoding) {
+            return urEncoder.isSinglePart();
+        } else {
+            return legacyParts.length == 1;
+        }
+    }
+
    private void nextPart() {
-        if(!useLegacyEncoding) {
-            String fragment = encoder.nextPart();
+        if(useBbqrEncoding) {
+            String fragment = bbqrEncoder.nextPart();
+            currentPart = fragment.toUpperCase(Locale.ROOT);
+        } else if(!useLegacyEncoding) {
+            String fragment = urEncoder.nextPart();
            currentPart = fragment.toUpperCase(Locale.ROOT);
        } else {
            currentPart = legacyParts[legacyPartIndex];
@@ -153,7 +217,7 @@ public class QRDisplayDialog extends Dialog<UR> {
    protected Image getQrCode(String fragment) {
        try {
            QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT);
+            BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, qrSize, qrSize, Map.of(EncodeHintType.MARGIN, "2"));

            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            MatrixToImageWriter.writeToStream(qrMatrix, "PNG", baos, new MatrixToImageConfig());
@@ -175,37 +239,23 @@ public class QRDisplayDialog extends Dialog<UR> {
                this.legacyParts = legacyEncoder.encode();
                this.useLegacyEncoding = true;

-                if(legacyParts.length == 1) {
-                    if(animateQRService != null) {
-                        animateQRService.cancel();
-                    }
-
-                    nextPart();
-                    qrImageView.setImage(getQrCode(currentPart));
-                } else if(animateQRService == null) {
-                    createAnimateQRService();
-                } else if(!animateQRService.isRunning()) {
-                    animateQRService.reset();
-                    animateQRService.start();
-                }
+                restartAnimation();
            } catch(UR.InvalidTypeException e) {
                //Can't happen
            }
        } else {
            this.useLegacyEncoding = false;
+            restartAnimation();
+        }
+    }

-            if(encoder.isSinglePart()) {
-                if(animateQRService != null) {
-                    animateQRService.cancel();
-                }
-
-                qrImageView.setImage(getQrCode(currentPart));
-            } else if(animateQRService == null) {
-                createAnimateQRService();
-            } else if(!animateQRService.isRunning()) {
-                animateQRService.reset();
-                animateQRService.start();
-            }
+    private void setUseBbqrEncoding(boolean useBbqrEncoding) {
+        if(useBbqrEncoding) {
+            this.useBbqrEncoding = true;
+            restartAnimation();
+        } else {
+            this.useBbqrEncoding = false;
+            restartAnimation();
        }
    }

@@ -214,12 +264,28 @@ public class QRDisplayDialog extends Dialog<UR> {
            animateQRService.cancel();
        }

-        this.encoder = new UREncoder(ur, Config.get().getQrDensity().getMaxFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
-        nextPart();
-        if(encoder.isSinglePart()) {
+        if(bbqr != null) {
+            this.bbqrEncoder = new BBQREncoder(bbqr.type(), DEFAULT_BBQR_ENCODING, bbqr.data(), Config.get().getQrDensity().getMaxBbqrFragmentLength(), 0);
+        }
+
+        this.urEncoder = new UREncoder(ur, Config.get().getQrDensity().getMaxUrFragmentLength(), MIN_FRAGMENT_LENGTH, 0);
+
+        restartAnimation();
+    }
+
+    private void restartAnimation() {
+        if(isSinglePart()) {
+            if(animateQRService != null) {
+                animateQRService.cancel();
+            }
+
+            nextPart();
            qrImageView.setImage(getQrCode(currentPart));
-        } else {
+        } else if(animateQRService == null) {
            createAnimateQRService();
+        } else if(!animateQRService.isRunning()) {
+            animateQRService.reset();
+            animateQRService.start();
        }
    }

@@ -264,7 +330,7 @@ public class QRDisplayDialog extends Dialog<UR> {
                    final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
                    ButtonBar.setButtonData(density, buttonData);
                    density.setOnAction(event -> {
-                        if(!initialDensityChange && !encoder.isSinglePart()) {
+                        if(!initialDensityChange && !isSinglePart()) {
                            Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Discard progress?", "Changing the QR code density means any progress on the receiving device must be discarded. Proceed?", ButtonType.NO, ButtonType.YES);
                            if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
                                initialDensityChange = true;
@@ -280,6 +346,25 @@ public class QRDisplayDialog extends Dialog<UR> {

                    return density;
                }
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.OK_DONE) {
+                Button scanButton = (Button)super.createButton(buttonType);
+                scanButton.setGraphicTextGap(5);
+                scanButton.setGraphic(getGlyph(FontAwesome5.Glyph.CAMERA));
+
+                return scanButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.BACK_PREVIOUS) {
+                ToggleButton bbqr = new ToggleButton(buttonType.getText());
+                bbqr.setGraphicTextGap(5);
+                bbqr.setGraphic(getGlyph(FontAwesome5.Glyph.QRCODE));
+                bbqr.setSelected(useBbqrEncoding);
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(bbqr, buttonData);
+
+                bbqr.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    setUseBbqrEncoding(newValue);
+                });
+
+                return bbqr;
            }

            return super.createButton(buttonType);
@@ -16,6 +16,7 @@ import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
 import com.sparrowwallet.drongo.wallet.DeterministicSeed;
 import com.sparrowwallet.drongo.wallet.SeedQR;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -24,9 +25,14 @@ import com.sparrowwallet.hummingbird.registry.*;
 import com.sparrowwallet.hummingbird.ResultType;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.URDecoder;
+import com.sparrowwallet.hummingbird.registry.pathcomponent.IndexPathComponent;
+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;
@@ -60,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;

@@ -77,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);
@@ -164,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);
@@ -188,30 +197,44 @@ 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));
                        } else {
                            result = new Result(new URException(urResult.error));
                        }
                    }
                }
+            } 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));
@@ -351,6 +374,17 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                    //Ignore, not parseable as a CompactSeedQR
                }

+                try {
+                    List<String> words = Arrays.asList(qrtext.split(" "));
+                    if(words.size() == 12 || words.size() == 15 || words.size() == 18 || words.size() == 21 || words.size() == 24) {
+                        Bip39MnemonicCode.INSTANCE.check(words);
+                        result = new Result(new DeterministicSeed(words, null, System.currentTimeMillis(), DeterministicSeed.Type.BIP39));
+                        return;
+                    }
+                } catch(Exception e) {
+                    //Ignore, not parseable as BIP39 seed words
+                }
+
                result = new Result(qrtext);
            }
        }
@@ -426,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"));
@@ -467,7 +534,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                if(cryptoHDKey.getOrigin() != null) {
                    if(!cryptoHDKey.getOrigin().getComponents().isEmpty()) {
                        PathComponent lastComponent = cryptoHDKey.getOrigin().getComponents().get(cryptoHDKey.getOrigin().getComponents().size() - 1);
-                        lastChild = new ChildNumber(lastComponent.getIndex(), lastComponent.isHardened());
+                        if(lastComponent instanceof IndexPathComponent indexPathComponent) {
+                            lastChild = new ChildNumber(indexPathComponent.getIndex(), indexPathComponent.isHardened());
+                        }
                        depth = cryptoHDKey.getOrigin().getComponents().size();
                    }
                    if(cryptoHDKey.getParentFingerprint() != null) {
@@ -485,18 +554,22 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
            if(cryptoOutput.getMultiKey() != null) {
                MultiKey multiKey = cryptoOutput.getMultiKey();
                Map<ExtendedKey, KeyDerivation> extendedPublicKeys = new LinkedHashMap<>();
+                Map<ExtendedKey, String> extendedPublicKeyLabels = new LinkedHashMap<>();
                for(CryptoHDKey cryptoHDKey : multiKey.getHdKeys()) {
                    ExtendedKey extendedKey = getExtendedKey(cryptoHDKey);
                    KeyDerivation keyDerivation = getKeyDerivation(cryptoHDKey.getOrigin());
                    extendedPublicKeys.put(extendedKey, keyDerivation);
+                    if(cryptoHDKey.getName() != null) {
+                        extendedPublicKeyLabels.put(extendedKey, cryptoHDKey.getName());
+                    }
                }
-                return new OutputDescriptor(scriptType, multiKey.getThreshold(), extendedPublicKeys);
+                return new OutputDescriptor(scriptType, multiKey.getThreshold(), extendedPublicKeys, new LinkedHashMap<>(), extendedPublicKeyLabels);
            } else if(cryptoOutput.getEcKey() != null) {
                throw new IllegalArgumentException("EC keys are currently unsupported");
            } else if(cryptoOutput.getHdKey() != null) {
                ExtendedKey extendedKey = getExtendedKey(cryptoOutput.getHdKey());
                KeyDerivation keyDerivation = getKeyDerivation(cryptoOutput.getHdKey().getOrigin());
-                return new OutputDescriptor(scriptType, extendedKey, keyDerivation);
+                return new OutputDescriptor(scriptType, extendedKey, keyDerivation, cryptoOutput.getHdKey().getName());
            }

            throw new IllegalStateException("CryptoOutput did not contain sufficient information");
@@ -543,12 +616,14 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {

        private KeyDerivation getKeyDerivation(CryptoKeypath cryptoKeypath) {
            if(cryptoKeypath != null) {
-                if(cryptoKeypath.getComponents().stream().anyMatch(PathComponent::isWildcard)) {
-                    throw new IllegalArgumentException("Wildcard derivation paths are not supported");
+                if(!cryptoKeypath.getComponents().stream().allMatch(pathComponent -> pathComponent instanceof IndexPathComponent)) {
+                    throw new IllegalArgumentException("Only indexed derivation path components are supported");
                }

-                List<ChildNumber> path = cryptoKeypath.getComponents().stream().map(comp -> new ChildNumber(comp.getIndex(), comp.isHardened())).collect(Collectors.toList());
-                return new KeyDerivation(Utils.bytesToHex(cryptoKeypath.getSourceFingerprint()), KeyDerivation.writePath(path));
+                List<ChildNumber> path = cryptoKeypath.getComponents().stream().map(comp -> (IndexPathComponent)comp)
+                        .map(comp -> new ChildNumber(comp.getIndex(), comp.isHardened())).collect(Collectors.toList());
+                String fingerprint = cryptoKeypath.getSourceFingerprint() == null ? KeystoreController.DEFAULT_WATCH_ONLY_FINGERPRINT : Utils.bytesToHex(cryptoKeypath.getSourceFingerprint());
+                return new KeyDerivation(fingerprint, KeyDerivation.writePath(path));
            }

            return null;
@@ -561,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,6 +1,8 @@
 package com.sparrowwallet.sparrow.control;

 import com.sparrowwallet.drongo.KeyPurpose;
+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.wallet.*;
@@ -21,6 +23,7 @@ import tornadofx.control.Form;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;

 public class SearchWalletDialog extends Dialog<Entry> {
    private static final Logger log = LoggerFactory.getLogger(SearchWalletDialog.class);
@@ -36,13 +39,16 @@ public class SearchWalletDialog extends Dialog<Entry> {
            throw new IllegalArgumentException("No wallets selected to search");
        }

+        boolean showWallet = walletForms.stream().map(WalletForm::getMasterWallet).distinct().limit(2).count() > 1;
+        boolean showAccount = walletForms.stream().anyMatch(walletForm -> !walletForm.getWallet().isMasterWallet() || !walletForm.getNestedWalletForms().isEmpty());
+
        final DialogPane dialogPane = getDialogPane();
        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
        dialogPane.getStylesheets().add(AppServices.class.getResource("dialog.css").toExternalForm());
        dialogPane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
        dialogPane.getStylesheets().add(AppServices.class.getResource("search.css").toExternalForm());
        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setHeaderText("Search Wallet");
+        dialogPane.setHeaderText(showWallet ? "Search All Wallets" : "Search Wallet");

        Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
        if(!image.isError()) {
@@ -69,11 +75,9 @@ public class SearchWalletDialog extends Dialog<Entry> {
        fieldset.getChildren().addAll(searchField);
        form.getChildren().add(fieldset);

-        boolean showWallet = walletForms.size() > 1 || walletForms.stream().anyMatch(walletForm -> !walletForm.getNestedWalletForms().isEmpty());
-
        results = new CoinTreeTable();
        results.setShowRoot(false);
-        results.setPrefWidth(showWallet ? 950 : 850);
+        results.setPrefWidth(showWallet || showAccount ? 950 : 850);
        results.setUnitFormat(walletForms.iterator().next().getWallet());
        results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
        results.setPlaceholder(new Label("No results"));
@@ -81,11 +85,19 @@ public class SearchWalletDialog extends Dialog<Entry> {
        if(showWallet) {
            TreeTableColumn<Entry, String> walletColumn = new TreeTableColumn<>("Wallet");
            walletColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
-                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getDisplayName());
+                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getMasterName());
            });
            results.getColumns().add(walletColumn);
        }

+        if(showAccount) {
+            TreeTableColumn<Entry, String> accountColumn = new TreeTableColumn<>("Account");
+            accountColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
+                return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getDisplayName());
+            });
+            results.getColumns().add(accountColumn);
+        }
+
        TreeTableColumn<Entry, String> typeColumn = new TreeTableColumn<>("Type");
        typeColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
            return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getEntryType());
@@ -135,25 +147,22 @@ public class SearchWalletDialog extends Dialog<Entry> {
        });

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

        setResizable(true);

+        AppServices.moveToActiveWindowScreen(this);
+
        Platform.runLater(search::requestFocus);
    }

-    private void searchWallet(String searchText) {
+    private void searchWallets(String searchText) {
        List<Entry> matchingEntries = new ArrayList<>();

        if(!searchText.isEmpty()) {
-            Long searchValue = null;
-
-            try {
-                searchValue = Math.abs(Long.parseLong(searchText));
-            } catch(NumberFormatException e) {
-                //ignore
-            }
+            Long searchValue = getSearchValue(searchText);
+            Address searchAddress = getSearchAddress(searchText);

            for(WalletForm walletForm : walletForms) {
                WalletTransactionsEntry walletTransactionsEntry = walletForm.getWalletTransactionsEntry();
@@ -161,7 +170,8 @@ public class SearchWalletDialog extends Dialog<Entry> {
                    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)) {
+                                (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);
                        }
                    }
@@ -213,6 +223,22 @@ public class SearchWalletDialog extends Dialog<Entry> {
        results.setRoot(rootItem);
    }

+    private Long getSearchValue(String searchText) {
+        try {
+            return Math.abs(Long.parseLong(searchText));
+        } catch(NumberFormatException e) {
+            return null;
+        }
+    }
+
+    private Address getSearchAddress(String searchText) {
+        try {
+            return Address.fromString(searchText);
+        } catch(InvalidAddressException e) {
+            return null;
+        }
+    }
+
    private static class SearchWalletEntry extends Entry {
        public SearchWalletEntry(Wallet wallet, List<Entry> entries) {
            super(wallet, wallet.getName(), entries);
@@ -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();
+        }
+    }
 }
@@ -12,7 +12,7 @@ import java.util.List;
 public class SeedEntryDialog extends Dialog<List<String>> {
    private final MnemonicKeystoreEntryPane keystorePane;

-    public SeedEntryDialog(int numWords) {
+    public SeedEntryDialog(String name, int numWords) {
        final DialogPane dialogPane = new MnemonicGridDialogPane();
        setDialogPane(dialogPane);
        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
@@ -38,7 +38,7 @@ public class SeedEntryDialog extends Dialog<List<String>> {
        Accordion keystoreAccordion = new Accordion();
        scrollPane.setContent(keystoreAccordion);

-        keystorePane = new MnemonicKeystoreEntryPane(numWords);
+        keystorePane = new MnemonicKeystoreEntryPane(name, numWords);
        keystorePane.setAnimated(false);
        keystoreAccordion.getPanes().add(keystorePane);

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

@@ -109,6 +110,7 @@ public class TextAreaDialog extends Dialog<String> {
                ButtonBar.setButtonData(scanButton, buttonData);
                scanButton.setOnAction(event -> {
                    QRScanDialog qrScanDialog = new QRScanDialog();
+                    qrScanDialog.initOwner(getDialogPane().getScene().getWindow());
                    Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
                    if(optionalResult.isPresent()) {
                        QRScanDialog.Result result = optionalResult.get();
@@ -14,6 +14,7 @@ import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
 import com.sparrowwallet.sparrow.event.ReplaceChangeAddressEvent;
 import com.sparrowwallet.sparrow.event.SorobanInitiatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.GlyphUtils;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.wallet.OptimizationStrategy;
@@ -44,7 +45,6 @@ import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import javafx.util.Duration;
-import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.tools.Platform;

@@ -56,6 +56,8 @@ import java.util.*;
 import java.util.List;
 import java.util.stream.Collectors;

+import static com.sparrowwallet.sparrow.glyphfont.GlyphUtils.*;
+
 public class TransactionDiagram extends GridPane {
    private static final int MAX_UTXOS = 8;
    private static final int REDUCED_MAX_UTXOS = MAX_UTXOS - 2;
@@ -72,6 +74,7 @@ public class TransactionDiagram extends GridPane {

    private WalletTransaction walletTx;
    private final BooleanProperty finalProperty = new SimpleBooleanProperty(false);
+    private final ObjectProperty<TransactionDiagramLabel> labelProperty = new SimpleObjectProperty<>(null);
    private final ObjectProperty<OptimizationStrategy> optimizationStrategyProperty = new SimpleObjectProperty<>(OptimizationStrategy.EFFICIENCY);
    private boolean expanded;
    private TransactionDiagram expandedDiagram;
@@ -88,7 +91,7 @@ public class TransactionDiagram extends GridPane {
                stage.setResizable(false);

                StackPane scenePane = new StackPane();
-                if(Platform.getCurrent() == Platform.WINDOWS) {
+                if(Platform.getCurrent() == Platform.WINDOWS || Platform.getCurrent() == Platform.UNIX) {
                    scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
                }

@@ -154,6 +157,10 @@ public class TransactionDiagram extends GridPane {
                updateDerivedDiagram(expandedDiagram);
            }
        }
+
+        if(getLabel() != null) {
+            getLabel().update(this);
+        }
    }

    public void update(String message) {
@@ -469,7 +476,7 @@ public class TransactionDiagram extends GridPane {
                        tooltip.setText("");
                    } else if(input instanceof AddUserBlockTransactionHashIndex) {
                        tooltip.setText("");
-                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
+                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getFeeWarningGlyph());
                        label.setOnMouseClicked(event -> {
                            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
                            closeExpanded();
@@ -534,8 +541,9 @@ public class TransactionDiagram extends GridPane {
        return input.getLabel() != null && !input.getLabel().isEmpty() ? input.getLabel() : input.getHashAsString().substring(0, 8) + "..:" + input.getIndex();
    }

-    private String getSatsValue(long amount) {
-        return String.format(Locale.ENGLISH, "%,d", amount);
+    String getSatsValue(long amount) {
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        return format.formatSatsValue(amount);
    }

    private Pane getInputsLines(List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets) {
@@ -636,7 +644,7 @@ public class TransactionDiagram extends GridPane {

        double width = 140.0;
        long sum = walletTx.getTotal();
-        List<Long> values = walletTx.getTransaction().getOutputs().stream().map(TransactionOutput::getValue).collect(Collectors.toList());
+        List<Long> values = walletTx.getTransaction().getOutputs().stream().filter(txo -> txo.getScript().getToAddress() != null).map(TransactionOutput::getValue).collect(Collectors.toList());
        values.add(walletTx.getFee());
        int numOutputs = displayedPayments.size() + walletTx.getChangeMap().size() + 1;
        for(int i = 1; i <= numOutputs; i++) {
@@ -680,18 +688,18 @@ public class TransactionDiagram extends GridPane {

        List<OutputNode> outputNodes = new ArrayList<>();
        for(Payment payment : displayedPayments) {
-            Glyph outputGlyph = getOutputGlyph(payment);
+            Glyph outputGlyph = GlyphUtils.getOutputGlyph(walletTx, payment);
            boolean labelledPayment = outputGlyph.getStyleClass().stream().anyMatch(style -> List.of("premix-icon", "badbank-icon", "whirlpoolfee-icon").contains(style)) || payment instanceof AdditionalPayment;
-            payment.setLabel(getOutputLabel(payment));
            Label recipientLabel = new Label(payment.getLabel() == null || payment.getType() == Payment.Type.FAKE_MIX || payment.getType() == Payment.Type.MIX ? payment.getAddress().toString().substring(0, 8) + "..." : payment.getLabel(), outputGlyph);
            recipientLabel.getStyleClass().add("output-label");
            recipientLabel.getStyleClass().add(labelledPayment ? "payment-label" : "recipient-label");
-            Wallet toWallet = getToWallet(payment);
+            Wallet toWallet = walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment);
            WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getAddressNodeMap().get(payment.getAddress()) : null;
            Wallet toBip47Wallet = getBip47SendWallet(payment);
            Tooltip recipientTooltip = new Tooltip((toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ")
                    + getSatsValue(payment.getAmount()) + " sats to "
-                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : (toBip47Wallet == null ? "external address" : toBip47Wallet.getDisplayName())) : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
+                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : (toBip47Wallet == null ? "external address" : toBip47Wallet.getDisplayName())) : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString())
+                    + (walletTx.isDuplicateAddress(payment) ? " (Duplicate)" : ""));
            recipientTooltip.getStyleClass().add("recipient-label");
            recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
            recipientTooltip.setShowDuration(Duration.INDEFINITE);
@@ -713,6 +721,7 @@ public class TransactionDiagram extends GridPane {
            outputNodes.add(new OutputNode(paymentBox, payment.getAddress(), payment.getAmount()));
        }

+        Set<Integer> seenIndexes = new HashSet<>();
        for(Map.Entry<WalletNode, Long> changeEntry : walletTx.getChangeMap().entrySet()) {
            WalletNode changeNode = changeEntry.getKey();
            WalletNode defaultChangeNode = walletTx.getWallet().getFreshNode(KeyPurpose.CHANGE);
@@ -758,11 +767,15 @@ public class TransactionDiagram extends GridPane {
                actionBox.getChildren().addAll(region, amountLabel);
            }

-            outputNodes.add(new OutputNode(actionBox, changeAddress, changeEntry.getValue()));
-        }
-
-        if(isFinal()) {
-            Collections.sort(outputNodes);
+            int changeIndex = outputNodes.size();
+            if(isFinal()) {
+                changeIndex = getOutputIndex(changeAddress, changeEntry.getValue(), seenIndexes);
+                seenIndexes.add(changeIndex);
+                if(changeIndex > outputNodes.size()) {
+                    changeIndex = outputNodes.size();
+                }
+            }
+            outputNodes.add(changeIndex, new OutputNode(actionBox, changeAddress, changeEntry.getValue()));
        }

        for(OutputNode outputNode : outputNodes) {
@@ -776,7 +789,7 @@ public class TransactionDiagram extends GridPane {
        }

        boolean highFee = (walletTx.getFeePercentage() > 0.1);
-        Label feeLabel = highFee ? new Label("High Fee", getWarningGlyph()) : new Label("Fee", getFeeGlyph());
+        Label feeLabel = highFee ? new Label("High Fee", getFeeWarningGlyph()) : new Label("Fee", getFeeGlyph());
        feeLabel.getStyleClass().addAll("output-label", "fee-label");
        String percentage = String.format("%.2f", walletTx.getFeePercentage() * 100.0);
        Tooltip feeTooltip = new Tooltip(walletTx.getFee() < 0 ? "Unknown fee" : "Fee of " + getSatsValue(walletTx.getFee()) + " sats (" + percentage + "%)");
@@ -916,38 +929,10 @@ public class TransactionDiagram extends GridPane {
        return spacer;
    }

-    private String getOutputLabel(Payment payment) {
-        if(payment.getLabel() != null) {
-            return payment.getLabel();
-        }
-
-        if(payment.getType() == Payment.Type.WHIRLPOOL_FEE) {
-            return "Whirlpool Fee";
-        } else if(walletTx.isPremixSend(payment)) {
-            int premixIndex = getOutputIndex(payment.getAddress(), payment.getAmount()) - 2;
-            return "Premix #" + premixIndex;
-        } else if(walletTx.isBadbankSend(payment)) {
-            return "Badbank Change";
-        }
-
-        return null;
-    }
-
-    private int getOutputIndex(Address address, long amount) {
-        return walletTx.getTransaction().getOutputs().stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress()) && txOutput.getValue() == amount).mapToInt(TransactionOutput::getIndex).findFirst().orElseThrow();
-    }
-
-    private Wallet getToWallet(Payment payment) {
-        for(Wallet openWallet : AppServices.get().getOpenWallets().keySet()) {
-            if(openWallet != walletTx.getWallet() && openWallet.isValid()) {
-                WalletNode addressNode = openWallet.getWalletAddresses().get(payment.getAddress());
-                if(addressNode != null) {
-                    return addressNode.getWallet();
-                }
-            }
-        }
-
-        return null;
+    private int getOutputIndex(Address address, long amount, Collection<Integer> seenIndexes) {
+        List<TransactionOutput> addressOutputs = walletTx.getTransaction().getOutputs().stream().filter(txOutput -> txOutput.getScript().getToAddress() != null).collect(Collectors.toList());
+        TransactionOutput output = addressOutputs.stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress()) && txOutput.getValue() == amount && !seenIndexes.contains(txOutput.getIndex())).findFirst().orElseThrow();
+        return addressOutputs.indexOf(output);
    }

    private Wallet getBip47SendWallet(Payment payment) {
@@ -967,151 +952,6 @@ public class TransactionDiagram extends GridPane {
        return null;
    }

-    public Glyph getOutputGlyph(Payment payment) {
-        if(payment.getType().equals(Payment.Type.MIX)) {
-            return getMixGlyph();
-        } else if(payment.getType().equals(Payment.Type.FAKE_MIX)) {
-            return getFakeMixGlyph();
-        } else if(walletTx.isConsolidationSend(payment)) {
-            return getConsolidationGlyph();
-        } else if(walletTx.isPremixSend(payment)) {
-            return getPremixGlyph();
-        } else if(walletTx.isBadbankSend(payment)) {
-            return getBadbankGlyph();
-        } else if(payment.getType().equals(Payment.Type.WHIRLPOOL_FEE)) {
-            return getWhirlpoolFeeGlyph();
-        } else if(payment instanceof AdditionalPayment) {
-            return ((AdditionalPayment)payment).getOutputGlyph(this);
-        } else if(getToWallet(payment) != null) {
-            return getDepositGlyph();
-        }
-
-        return getPaymentGlyph();
-    }
-
-    public static Glyph getExcludeGlyph() {
-        Glyph excludeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.TIMES_CIRCLE);
-        excludeGlyph.getStyleClass().add("exclude-utxo");
-        excludeGlyph.setFontSize(12);
-        return excludeGlyph;
-    }
-
-    public static Glyph getPaymentGlyph() {
-        Glyph paymentGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
-        paymentGlyph.getStyleClass().add("payment-icon");
-        paymentGlyph.setFontSize(12);
-        return paymentGlyph;
-    }
-
-    public static Glyph getConsolidationGlyph() {
-        Glyph consolidationGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.REPLY_ALL);
-        consolidationGlyph.getStyleClass().add("consolidation-icon");
-        consolidationGlyph.setFontSize(12);
-        return consolidationGlyph;
-    }
-
-    public static Glyph getDepositGlyph() {
-        Glyph depositGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
-        depositGlyph.getStyleClass().add("deposit-icon");
-        depositGlyph.setFontSize(12);
-        return depositGlyph;
-    }
-
-    public static Glyph getPremixGlyph() {
-        Glyph premixGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        premixGlyph.getStyleClass().add("premix-icon");
-        premixGlyph.setFontSize(12);
-        return premixGlyph;
-    }
-
-    public static Glyph getBadbankGlyph() {
-        Glyph badbankGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.BIOHAZARD);
-        badbankGlyph.getStyleClass().add("badbank-icon");
-        badbankGlyph.setFontSize(12);
-        return badbankGlyph;
-    }
-
-    public static Glyph getWhirlpoolFeeGlyph() {
-        Glyph whirlpoolFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_WATER);
-        whirlpoolFeeGlyph.getStyleClass().add("whirlpoolfee-icon");
-        whirlpoolFeeGlyph.setFontSize(12);
-        return whirlpoolFeeGlyph;
-    }
-
-    public static Glyph getFakeMixGlyph() {
-        Glyph fakeMixGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.THEATER_MASKS);
-        fakeMixGlyph.getStyleClass().add("fakemix-icon");
-        fakeMixGlyph.setFontSize(12);
-        return fakeMixGlyph;
-    }
-
-    public static Glyph getTxoGlyph() {
-        return getChangeGlyph();
-    }
-
-    public static Glyph getMixGlyph() {
-        Glyph payjoinGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        payjoinGlyph.getStyleClass().add("mix-icon");
-        payjoinGlyph.setFontSize(12);
-        return payjoinGlyph;
-    }
-
-    public static Glyph getChangeGlyph() {
-        Glyph changeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
-        changeGlyph.getStyleClass().add("change-icon");
-        changeGlyph.setFontSize(12);
-        return changeGlyph;
-    }
-
-    public static Glyph getChangeWarningGlyph() {
-        Glyph changeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
-        changeWarningGlyph.getStyleClass().add("change-warning-icon");
-        changeWarningGlyph.setFontSize(12);
-        return changeWarningGlyph;
-    }
-
-    public static Glyph getChangeReplaceGlyph() {
-        Glyph changeReplaceGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
-        changeReplaceGlyph.getStyleClass().add("change-replace-icon");
-        changeReplaceGlyph.setFontSize(12);
-        return changeReplaceGlyph;
-    }
-
-    private Glyph getFeeGlyph() {
-        Glyph feeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING);
-        feeGlyph.getStyleClass().add("fee-icon");
-        feeGlyph.setFontSize(12);
-        return feeGlyph;
-    }
-
-    private Glyph getWarningGlyph() {
-        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        feeWarningGlyph.getStyleClass().add("fee-warning-icon");
-        feeWarningGlyph.setFontSize(12);
-        return feeWarningGlyph;
-    }
-
-    private Glyph getQuestionGlyph() {
-        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QUESTION_CIRCLE);
-        feeWarningGlyph.getStyleClass().add("question-icon");
-        feeWarningGlyph.setFontSize(12);
-        return feeWarningGlyph;
-    }
-
-    private Glyph getLockGlyph() {
-        Glyph lockGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LOCK);
-        lockGlyph.getStyleClass().add("lock-icon");
-        lockGlyph.setFontSize(12);
-        return lockGlyph;
-    }
-
-    private Glyph getUserGlyph() {
-        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER);
-        userGlyph.getStyleClass().add("user-icon");
-        userGlyph.setFontSize(12);
-        return userGlyph;
-    }
-
    private Glyph getUserAddGlyph() {
        Glyph userAddGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER_PLUS);
        userAddGlyph.getStyleClass().add("useradd-icon");
@@ -1161,6 +1001,10 @@ public class TransactionDiagram extends GridPane {
        }
    }

+    public WalletTransaction getWalletTransaction() {
+        return walletTx;
+    }
+
    public boolean isFinal() {
        return finalProperty.get();
    }
@@ -1173,6 +1017,18 @@ public class TransactionDiagram extends GridPane {
        this.finalProperty.set(isFinal);
    }

+    public TransactionDiagramLabel getLabel() {
+        return labelProperty.get();
+    }
+
+    public ObjectProperty<TransactionDiagramLabel> labelProperty() {
+        return labelProperty;
+    }
+
+    public void setLabelProperty(TransactionDiagramLabel label) {
+        this.labelProperty.set(label);
+    }
+
    public OptimizationStrategy getOptimizationStrategy() {
        return optimizationStrategyProperty.get();
    }
@@ -1252,7 +1108,7 @@ public class TransactionDiagram extends GridPane {
        }
    }

-    private static class AdditionalPayment extends Payment {
+    public static class AdditionalPayment extends Payment {
        private final List<Payment> additionalPayments;

        public AdditionalPayment(List<Payment> additionalPayments) {
@@ -1260,10 +1116,10 @@ public class TransactionDiagram extends GridPane {
            this.additionalPayments = additionalPayments;
        }

-        public Glyph getOutputGlyph(TransactionDiagram transactionDiagram) {
+        public Glyph getOutputGlyph(WalletTransaction walletTx) {
            Glyph glyph = null;
            for(Payment payment : additionalPayments) {
-                Glyph paymentGlyph = transactionDiagram.getOutputGlyph(payment);
+                Glyph paymentGlyph = GlyphUtils.getOutputGlyph(walletTx, payment);
                if(glyph != null && !paymentGlyph.getStyleClass().equals(glyph.getStyleClass())) {
                    return getPaymentGlyph();
                }
@@ -1279,7 +1135,7 @@ public class TransactionDiagram extends GridPane {
        }
    }

-    private class OutputNode implements Comparable<OutputNode> {
+    private static class OutputNode {
        public Pane outputLabel;
        public Address address;
        public long amount;
@@ -1289,18 +1145,9 @@ public class TransactionDiagram extends GridPane {
            this.address = address;
            this.amount = amount;
        }
-
-        @Override
-        public int compareTo(TransactionDiagram.OutputNode o) {
-            try {
-                return getOutputIndex(address, amount) - getOutputIndex(o.address, o.amount);
-            } catch(Exception e) {
-                return 0;
-            }
-        }
    }

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

    public void updateAll(WalletTransactionsEntry rootEntry) {
@@ -61,16 +60,13 @@ public class TransactionsTreeTable extends CoinTreeTable {
        setRoot(rootItem);
        rootItem.setExpanded(true);

-        if(getColumns().size() > 0 && getSortOrder().isEmpty()) {
-            TreeTableColumn<Entry, ?> dateCol = getColumns().get(0);
-            getSortOrder().add(dateCol);
-            dateCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        }
+        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
    }

    public void updateHistory() {
        //Transaction entries should have already been updated using WalletTransactionsEntry.updateHistory, so only a resort required
        sort();
+        setSortColumn(0, TreeTableColumn.SortType.DESCENDING);
    }

    public void updateLabel(Entry entry) {
@@ -0,0 +1,46 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.scene.control.TreeTableColumn;
+
+public class TreeTableColumnConfig {
+    private final int index;
+    private final Integer width;
+    private final TreeTableColumn.SortType sortType;
+
+    public TreeTableColumnConfig(int index, Integer width, TreeTableColumn.SortType sortType) {
+        this.index = index;
+        this.width = width;
+        this.sortType = sortType;
+    }
+
+    public TreeTableColumnConfig(int index, String width, String sortType) {
+        this.index = index;
+        this.width = width.isEmpty() ? null : Integer.valueOf(width, 10);
+        this.sortType = sortType.isEmpty() ? null : TreeTableColumn.SortType.valueOf(sortType);
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public Integer getWidth() {
+        return width;
+    }
+
+    public TreeTableColumn.SortType getSortType() {
+        return sortType;
+    }
+
+    public String toString() {
+        return index + "-" + (width == null ? "" : width) + "-" + (sortType == null ? "" : sortType);
+    }
+
+    public static TreeTableColumnConfig fromString(String columnConfig) {
+        String[] parts = columnConfig.split("-", 3);
+        if(parts.length == 3) {
+            return new TreeTableColumnConfig(Integer.parseInt(parts[0]), parts[1], parts[2]);
+        }
+
+        return new TreeTableColumnConfig(Integer.parseInt(parts[0]), (Integer)null, null);
+    }
+}
@@ -0,0 +1,42 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.scene.control.TreeTableColumn;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringJoiner;
+
+public class TreeTableConfig {
+    private final List<TreeTableColumnConfig> columnConfigs;
+
+    public TreeTableConfig(CoinTreeTable treeTable) {
+        columnConfigs = new ArrayList<>();
+        TreeTableColumn<Entry, ?> sortColumn = treeTable.getSortOrder().isEmpty() ? null : treeTable.getSortOrder().get(0);
+        for(int i = 0; i < treeTable.getColumns().size(); i++) {
+            TreeTableColumn<Entry, ?> column = treeTable.getColumns().get(i);
+            //TODO: Support column widths
+            columnConfigs.add(new TreeTableColumnConfig(i, null, sortColumn == column ? column.getSortType() : null));
+        }
+    }
+
+    public TreeTableConfig(List<TreeTableColumnConfig> columnConfigs) {
+        this.columnConfigs = columnConfigs;
+    }
+
+    public String toString() {
+        StringJoiner joiner = new StringJoiner("|");
+        columnConfigs.stream().forEach(col -> joiner.add(col.toString()));
+        return joiner.toString();
+    }
+
+    public static TreeTableConfig fromString(String tableConfig) {
+        List<TreeTableColumnConfig> columnConfigs = new ArrayList<>();
+        String[] parts = tableConfig.split("\\|");
+        for(String part : parts) {
+            columnConfigs.add(TreeTableColumnConfig.fromString(part));
+        }
+
+        return new TreeTableConfig(columnConfigs);
+    }
+}
@@ -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 -> {
@@ -83,8 +83,7 @@ public class UtxosTreeTable extends CoinTreeTable {
        setPlaceholder(getDefaultPlaceholder(rootEntry.getWallet()));
        setEditable(true);
        setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
-        amountCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        getSortOrder().add(amountCol);
+        setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);

        getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
    }
@@ -96,17 +95,14 @@ public class UtxosTreeTable extends CoinTreeTable {
        setRoot(rootItem);
        rootItem.setExpanded(true);

-        if(getColumns().size() > 0 && getSortOrder().isEmpty()) {
-            TreeTableColumn<Entry, ?> amountCol = getColumns().get(getColumns().size() - 1);
-            getSortOrder().add(amountCol);
-            amountCol.setSortType(TreeTableColumn.SortType.DESCENDING);
-        }
+        setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
    }

    public void updateHistory() {
        //Utxo entries should have already been updated, so only a resort required
        if(!getRoot().getChildren().isEmpty()) {
            sort();
+            setSortColumn(getColumns().size() - 1, TreeTableColumn.SortType.DESCENDING);
        }
    }

@@ -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);
@@ -51,7 +51,7 @@ 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());
        for(KeystoreFileImport importer : keystoreImporters) {
            if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
                FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
@@ -59,7 +59,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
            }
        }

-        List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow()));
+        List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow(), new JadeMultisig()));
        if(!selectedWalletForms.isEmpty()) {
            walletImporters.add(new WalletLabels(selectedWalletForms));
        }
@@ -90,6 +90,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);
@@ -42,9 +42,13 @@ public class WalletNameDialog extends Dialog<WalletNameDialog.NameAndBirthDate>
    }

    public WalletNameDialog(String initialName, boolean hasExistingTransactions, Date startDate) {
+        this(initialName, hasExistingTransactions, startDate, false);
+    }
+
+    public WalletNameDialog(String initialName, boolean hasExistingTransactions, Date startDate, boolean rename) {
        final DialogPane dialogPane = getDialogPane();
        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        boolean requestBirthDate = (Config.get().getServerType() == null || Config.get().getServerType() == ServerType.BITCOIN_CORE);
+        boolean requestBirthDate = !rename && (Config.get().getServerType() == null || Config.get().getServerType() == ServerType.BITCOIN_CORE);

        setTitle("Wallet Name");
        dialogPane.setHeaderText("Enter a name for this wallet:");
@@ -121,16 +125,16 @@ public class WalletNameDialog extends Dialog<WalletNameDialog.NameAndBirthDate>
            ));
        });

-        final ButtonType okButtonType = new javafx.scene.control.ButtonType("Create Wallet", ButtonBar.ButtonData.OK_DONE);
+        final ButtonType okButtonType = new javafx.scene.control.ButtonType((rename ? "Rename" : "Create") + " Wallet", ButtonBar.ButtonData.OK_DONE);
        dialogPane.getButtonTypes().addAll(okButtonType);
        Button okButton = (Button) dialogPane.lookupButton(okButtonType);
        BooleanBinding isInvalid = Bindings.createBooleanBinding(() ->
-                name.getText().length() == 0 || Storage.walletExists(name.getText()) || (existingCheck.isSelected() && existingPicker.getValue() == null), name.textProperty(), existingCheck.selectedProperty(), existingPicker.valueProperty());
+                name.getText().trim().length() == 0 || Storage.walletExists(name.getText()) || (existingCheck.isSelected() && existingPicker.getValue() == null), name.textProperty(), existingCheck.selectedProperty(), existingPicker.valueProperty());
        okButton.disableProperty().bind(isInvalid);

        name.setPromptText("Wallet Name");
        Platform.runLater(name::requestFocus);
-        setResultConverter(dialogButton -> dialogButton == okButtonType ? new NameAndBirthDate(name.getText(), existingPicker.getValue()) : null);
+        setResultConverter(dialogButton -> dialogButton == okButtonType ? new NameAndBirthDate(name.getText().trim(), existingPicker.getValue()) : null);
    }

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

 import java.awt.*;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

 public class WebcamService extends ScheduledService<Image> {
+    private static final Logger log = LoggerFactory.getLogger(WebcamService.class);
+
    private WebcamResolution resolution;
    private WebcamDevice device;
    private final WebcamListener listener;
@@ -37,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());
@@ -49,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
@@ -137,6 +146,9 @@ public class WebcamService extends ScheduledService<Image> {
        if(result == null) {
            result = readQR(croppedImage);
        }
+        if(result == null) {
+            result = readQR(invert(croppedImage));
+        }

        if(result != null) {
            resultProperty.set(result);
@@ -147,6 +159,22 @@ 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) {
+                return new Result(scan.stringData(), scan.rawData(), new ResultPoint[0], BarcodeFormat.QR_CODE);
+            }
+        }
+
        try {
            return qrReader.decode(bitmap, Map.of(DecodeHintType.TRY_HARDER, Boolean.TRUE));
        } catch(ReaderException e) {
@@ -175,6 +203,29 @@ public class WebcamService extends ScheduledService<Image> {
        return new CroppedDimension(x, y, squareSize);
    }

+    public BufferedImage invert(BufferedImage inImg) {
+        try {
+            int width = inImg.getWidth();
+            int height = inImg.getHeight();
+            BufferedImage outImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            WritableRaster outRaster = outImg.getRaster();
+            WritableRaster inRaster = inImg.getRaster();
+
+            for(int y = 0; y < height; y++) {
+                for(int x = 0; x < width; x++) {
+                    for(int i = 0; i < outRaster.getNumBands(); i++) {
+                        outRaster.setSample(x, y, i, 255 - inRaster.getSample(x, y, i));
+                    }
+                }
+            }
+
+            return outImg;
+        } catch(Exception e) {
+            log.warn("Error inverting image", e);
+            return inImg;
+        }
+    }
+
    public Result getResult() {
        return resultProperty.get();
    }
@@ -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) -> {
@@ -5,20 +5,15 @@ import com.sparrowwallet.sparrow.net.MempoolRateSize;
 import java.util.Map;
 import java.util.Set;

-public class FeeRatesUpdatedEvent {
+public class FeeRatesUpdatedEvent extends MempoolRateSizesUpdatedEvent {
    private final Map<Integer, Double> targetBlockFeeRates;
-    private final Set<MempoolRateSize> mempoolRateSizes;

    public FeeRatesUpdatedEvent(Map<Integer, Double> targetBlockFeeRates, Set<MempoolRateSize> mempoolRateSizes) {
+        super(mempoolRateSizes);
        this.targetBlockFeeRates = targetBlockFeeRates;
-        this.mempoolRateSizes = mempoolRateSizes;
    }

    public Map<Integer, Double> getTargetBlockFeeRates() {
        return targetBlockFeeRates;
    }
-
-    public Set<MempoolRateSize> getMempoolRateSizes() {
-        return mempoolRateSizes;
-    }
 }
@@ -0,0 +1,8 @@
+package com.sparrowwallet.sparrow.event;
+
+/**
+ * The event is posted when the first set of mempool entries (txid and vsizes) have been retrieved from the node.
+ * Cormorant only.
+ */
+public class MempoolEntriesInitializedEvent {
+}
@@ -0,0 +1,17 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
+
+import java.util.Set;
+
+public class MempoolRateSizesUpdatedEvent {
+    private final Set<MempoolRateSize> mempoolRateSizes;
+
+    public MempoolRateSizesUpdatedEvent(Set<MempoolRateSize> mempoolRateSizes) {
+        this.mempoolRateSizes = mempoolRateSizes;
+    }
+
+    public Set<MempoolRateSize> getMempoolRateSizes() {
+        return mempoolRateSizes;
+    }
+}
@@ -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;
+    }
+}
@@ -2,6 +2,7 @@ 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;
 import com.sparrowwallet.drongo.wallet.Payment;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -14,21 +15,23 @@ public class SpendUtxoEvent {
    private final List<Payment> payments;
    private final List<byte[]> opReturns;
    private final Long fee;
-    private final boolean includeSpentMempoolOutputs;
+    private final boolean requireAllUtxos;
+    private final BlockTransaction replacedTransaction;
    private final Pool pool;
    private final PaymentCode paymentCode;

    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
-        this(wallet, utxos, null, null, null, false);
+        this(wallet, utxos, null, null, null, false, null);
    }

-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, boolean includeSpentMempoolOutputs) {
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, boolean requireAllUtxos, BlockTransaction replacedTransaction) {
        this.wallet = wallet;
        this.utxos = utxos;
        this.payments = payments;
        this.opReturns = opReturns;
        this.fee = fee;
-        this.includeSpentMempoolOutputs = includeSpentMempoolOutputs;
+        this.requireAllUtxos = requireAllUtxos;
+        this.replacedTransaction = replacedTransaction;
        this.pool = null;
        this.paymentCode = null;
    }
@@ -39,7 +42,8 @@ public class SpendUtxoEvent {
        this.payments = payments;
        this.opReturns = opReturns;
        this.fee = fee;
-        this.includeSpentMempoolOutputs = false;
+        this.requireAllUtxos = false;
+        this.replacedTransaction = null;
        this.pool = pool;
        this.paymentCode = null;
    }
@@ -50,7 +54,8 @@ public class SpendUtxoEvent {
        this.payments = payments;
        this.opReturns = opReturns;
        this.fee = null;
-        this.includeSpentMempoolOutputs = false;
+        this.requireAllUtxos = false;
+        this.replacedTransaction = null;
        this.pool = null;
        this.paymentCode = paymentCode;
    }
@@ -75,8 +80,12 @@ public class SpendUtxoEvent {
        return fee;
    }

-    public boolean isIncludeSpentMempoolOutputs() {
-        return includeSpentMempoolOutputs;
+    public boolean isRequireAllUtxos() {
+        return requireAllUtxos;
+    }
+
+    public BlockTransaction getReplacedTransaction() {
+        return replacedTransaction;
    }

    public Pool getPool() {
@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WhirlpoolIndexHighFrequencyEvent {
+    private final Wallet wallet;
+
+    public WhirlpoolIndexHighFrequencyEvent(Wallet wallet) {
+        this.wallet = wallet;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+}
@@ -25,6 +25,8 @@ public class FontAwesome5 extends GlyphFont {
        BTC('\uf15a'),
        BULLSEYE('\uf140'),
        CAMERA('\uf030'),
+        CARET_LEFT('\uf0d9'),
+        CARET_RIGHT('\uf0da'),
        CHECK_CIRCLE('\uf058'),
        CIRCLE('\uf111'),
        COINS('\uf51e'),
@@ -42,6 +44,7 @@ public class FontAwesome5 extends GlyphFont {
        HAND_HOLDING('\uf4bd'),
        HAND_HOLDING_MEDICAL('\ue05c'),
        HAND_HOLDING_WATER('\uf4c1'),
+        HOURGLASS_HALF('\uf252'),
        HISTORY('\uf1da'),
        INFO_CIRCLE('\uf05a'),
        KEY('\uf084'),
@@ -49,8 +52,10 @@ public class FontAwesome5 extends GlyphFont {
        LINK('\uf0c1'),
        LOCK('\uf023'),
        LOCK_OPEN('\uf3c1'),
+        LONG_ARROW_ALT_RIGHT('\uf30b'),
        MAGNIFYING_GLASS_PLUS('\uf00e'),
        MAGNIFYING_GLASS_MINUS('\uf010'),
+        MICROCHIP('\uf2db'),
        MINUS_CIRCLE('\uf056'),
        PEN_FANCY('\uf5ac'),
        PLUS('\uf067'),
@@ -0,0 +1,206 @@
+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;
+    }
+}
@@ -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) +
@@ -28,7 +28,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {

    @Override
    public String getName() {
-        return "Caravan Multisig";
+        return "Unchained or Caravan Multisig";
    }

    @Override
@@ -94,7 +94,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
    }

    @Override
-    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+    public void exportWallet(Wallet wallet, OutputStream outputStream, String password) throws ExportException {
        if(!wallet.isValid()) {
            throw new ExportException("Cannot export an incomplete wallet");
        }
@@ -10,6 +10,7 @@ import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
 import com.sparrowwallet.sparrow.io.ckcard.CkCardApi;
+import com.sparrowwallet.sparrow.io.satochip.SatoCardApi;
 import javafx.beans.property.StringProperty;
 import javafx.concurrent.Service;
 import org.controlsfx.tools.Platform;
@@ -17,11 +18,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
 import javax.smartcardio.CardTerminals;
 import javax.smartcardio.TerminalFactory;
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

@@ -32,26 +35,41 @@ public abstract class CardApi {
            new File("/usr/lib/libpcsclite.so.1"),
            new File("/usr/local/lib/libpcsclite.so.1"),
            new File("/lib/x86_64-linux-gnu/libpcsclite.so.1"),
-            new File("/lib/aarch64-linux-gnu/libpcsclite.so.1")};
+            new File("/lib/aarch64-linux-gnu/libpcsclite.so.1"),
+            new File("/usr/lib64/libpcsclite.so.1"),
+            new File("/usr/lib/x86_64-linux-gnu/libpcsclite.so.1")};

    private static boolean initialized;

    public static List<WalletModel> getConnectedCards() throws CardException {
+        List<WalletModel> cards = new ArrayList<>();
+
        try {
            CkCardApi ckCardApi = new CkCardApi(null, null);
-            return List.of(ckCardApi.getCardType());
+            cards.add(ckCardApi.getCardType());
        } catch(Exception e) {
            //ignore
        }

-        return Collections.emptyList();
+        try {
+            SatoCardApi satoCardApi = new SatoCardApi(null, null);
+            cards.add(satoCardApi.getCardType());
+        } catch(Exception e) {
+            //ignore
+        }
+
+        return cards;
    }

    public static CardApi getCardApi(WalletModel walletModel, String pin) throws CardException {
-        if(walletModel == WalletModel.TAPSIGNER || walletModel == WalletModel.SATSCARD) {
+        if(walletModel == WalletModel.TAPSIGNER || walletModel == WalletModel.SATSCHIP || walletModel == WalletModel.SATSCARD) {
            return new CkCardApi(walletModel, pin);
        }

+        if(walletModel == WalletModel.SATOCHIP) {
+            return new SatoCardApi(walletModel, pin);
+        }
+
        throw new IllegalArgumentException("Cannot create card API for " + walletModel.toDisplayString());
    }

@@ -90,11 +108,15 @@ public abstract class CardApi {
    public abstract void disconnect();

    public static boolean isReaderAvailable() {
+        return !getAvailableTerminals().isEmpty();
+    }
+
+    public static List<CardTerminal> getAvailableTerminals() {
        setLibrary();

        try {
            TerminalFactory tf = TerminalFactory.getDefault();
-            return !tf.terminals().list().isEmpty();
+            return tf.terminals().list();
        } catch(Exception e) {
            Throwable cause = Throwables.getRootCause(e);
            if(cause.getMessage().equals("SCARD_E_NO_SERVICE")) {
@@ -106,7 +128,7 @@ public abstract class CardApi {
            }
        }

-        return false;
+        return Collections.emptyList();
    }

    private static void recoverNoService() {
@@ -6,5 +6,5 @@ import javax.smartcardio.CardException;

 public interface CardImport extends ImportExport {
    boolean isInitialized() throws CardException;
-    void initialize(String pin, byte[] chainCode, StringProperty messageProperty) throws CardException;
+    void initialize(String pin, byte[] entropy, StringProperty messageProperty) throws CardException;
 }
@@ -165,7 +165,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 +224,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());
@@ -58,6 +58,7 @@ public class Config {
    private int enumerateHwPeriod = ENUMERATE_HW_PERIOD_SECS;
    private QRDensity qrDensity;
    private Boolean hdCapture;
+    private boolean useZbar = true;
    private String webcamDevice;
    private ServerType serverType;
    private Server publicElectrumServer;
@@ -77,6 +78,7 @@ public class Config {
    private int maxPageSize = DEFAULT_PAGE_SIZE;
    private boolean usePayNym;
    private boolean sameAppMixing;
+    private boolean mempoolFullRbf;
    private Double appWidth;
    private Double appHeight;

@@ -404,6 +406,10 @@ public class Config {
        flush();
    }

+    public boolean isUseZbar() {
+        return useZbar;
+    }
+
    public String getWebcamDevice() {
        return webcamDevice;
    }
@@ -665,6 +671,15 @@ public class Config {
        flush();
    }

+    public boolean isMempoolFullRbf() {
+        return mempoolFullRbf;
+    }
+
+    public void setMempoolFullRbf(boolean mempoolFullRbf) {
+        this.mempoolFullRbf = mempoolFullRbf;
+        flush();
+    }
+
    public Double getAppWidth() {
        return appWidth;
    }
@@ -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.2.1";
+    private static final String HWI_VERSION = "3.0.0";
    private static final String HWI_VERSION_DIR = HWI_VERSION_PREFIX + HWI_VERSION;

    private static boolean isPromptActive = false;
@@ -377,9 +379,9 @@ public class Hwi {
                if(platform == Platform.OSX) {
                    InputStream inputStream;
                    if(osArch.equals("aarch64")) {
-                        inputStream = Hwi.class.getResourceAsStream("/native/osx/aarch64/" + HWI_VERSION_DIR + "-mac-aarch64-signed.zip");
+                        inputStream = Hwi.class.getResourceAsStream("/native/osx/aarch64/" + HWI_VERSION_DIR + "-mac-aarch64-signed.tar.bz2");
                    } else {
-                        inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + HWI_VERSION_DIR + "-mac-amd64-signed.zip");
+                        inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + HWI_VERSION_DIR + "-mac-amd64-signed.tar.bz2");
                    }

                    if(inputStream == null) {
@@ -396,26 +398,27 @@ public class Hwi {
                    log.debug("Using HWI path: " + hwiVersionDir.getAbsolutePath());

                    File hwiExec = null;
-                    try(ZipInputStream zis = new ZipInputStream(inputStream)) {
-                        ZipEntry zipEntry = zis.getNextEntry();
-                        while(zipEntry != null) {
-                            if(zipEntry.isDirectory()) {
-                                newDirectory(hwiVersionDir, zipEntry, ownerExecutableWritable);
+                    try(TarArchiveInputStream tarInput = new TarArchiveInputStream(new BZip2CompressorInputStream(inputStream))) {
+                        TarArchiveEntry tarEntry = tarInput.getNextEntry();
+                        while(tarEntry != null) {
+                            if(tarEntry.isDirectory()) {
+                                newDirectory(hwiVersionDir, tarEntry, ownerExecutableWritable);
+                            } else if(tarEntry.isSymbolicLink()) {
+                                newSymlink(hwiVersionDir, tarEntry, ownerExecutableWritable);
                            } else {
-                                File newFile = newFile(hwiVersionDir, zipEntry, ownerExecutableWritable);
+                                File newFile = newFile(hwiVersionDir, tarEntry, ownerExecutableWritable);
                                try(FileOutputStream fos = new FileOutputStream(newFile)) {
-                                    ByteStreams.copy(zis, new FileOutputStream(newFile));
+                                    ByteStreams.copy(tarInput, new FileOutputStream(newFile));
                                    fos.flush();
-                                };
+                                }

-                                if(zipEntry.getName().equals("hwi")) {
+                                if(tarEntry.getName().equals("hwi")) {
                                    hwiExec = newFile;
                                }
                            }

-                            zipEntry = zis.getNextEntry();
+                            tarEntry = tarInput.getNextEntry();
                        }
-                        zis.closeEntry();
                    }

                    hwiExecutable = hwiExec;
@@ -478,29 +481,43 @@ public class Hwi {
        }
    }

-    public static File newDirectory(File destinationDir, ZipEntry zipEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+    public static File newDirectory(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
        String destDirPath = destinationDir.getCanonicalPath();

-        Path path = Path.of(destDirPath, zipEntry.getName());
+        Path path = Path.of(destDirPath, tarEntry.getName());
        File destDir = Files.createDirectory(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();

        String destSubDirPath = destDir.getCanonicalPath();
        if(!destSubDirPath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
+            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
        }

        return destDir;
    }

-    public static File newFile(File destinationDir, ZipEntry zipEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+    public static File newFile(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
        String destDirPath = destinationDir.getCanonicalPath();

-        Path path = Path.of(destDirPath, zipEntry.getName());
+        Path path = Path.of(destDirPath, tarEntry.getName());
        File destFile = Files.createFile(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();

        String destFilePath = destFile.getCanonicalPath();
        if(!destFilePath.startsWith(destDirPath + File.separator)) {
-            throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
+            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
+        }
+
+        return destFile;
+    }
+
+    public static File newSymlink(File destinationDir, TarArchiveEntry tarEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+        String destDirPath = destinationDir.getCanonicalPath();
+
+        Path path = Path.of(destDirPath, tarEntry.getName());
+        File destFile = Files.createSymbolicLink(path, Paths.get(tarEntry.getLinkName())).toFile();
+
+        String destFilePath = destFile.getCanonicalPath();
+        if(!destFilePath.startsWith(destDirPath + File.separator)) {
+            throw new IOException("Entry is outside of the target dir: " + tarEntry.getName());
        }

        return destFile;
@@ -836,7 +853,7 @@ public class Hwi {
        public WalletModel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
            String modelStr = json.getAsJsonPrimitive().getAsString();
            try {
-                return WalletModel.valueOf(modelStr.toUpperCase(Locale.ROOT));
+                return WalletModel.valueOf(modelStr.toUpperCase(Locale.ROOT).replace(' ', '_'));
            } catch(Exception e) {
                for(WalletModel model : WalletModel.values()) {
                    if(modelStr.startsWith(model.getType())) {
@@ -1,8 +1,11 @@
 package com.sparrowwallet.sparrow.io;

+import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;

+import java.io.InputStream;
+
 public class JadeMultisig extends ColdcardMultisig {
    @Override
    public String getName() {
@@ -38,4 +41,30 @@ public class JadeMultisig extends ColdcardMultisig {
    public boolean walletExportRequiresDecryption() {
        return false;
    }
+
+    @Override
+    public String getWalletImportDescription() {
+        return "Import the QR created using Options > Wallet > Registered Wallets on your Jade.";
+    }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isWalletImportFileFormatAvailable() {
+        return false;
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        Wallet wallet = super.importWallet(inputStream, password);
+        for(Keystore keystore : wallet.getKeystores()) {
+            keystore.setLabel(keystore.getLabel().replace("Coldcard", "Jade"));
+            keystore.setWalletModel(WalletModel.JADE);
+        }
+
+        return wallet;
+    }
 }
@@ -0,0 +1,20 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+public class Krux extends SpecterDIY {
+    @Override
+    public String getName() {
+        return "Krux";
+    }
+
+    @Override
+    public String getKeystoreImportDescription(int account) {
+        return "Import file or QR created on your Krux by selecting Extended Public Key from the main menu once you have loaded your mnemonic.";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.KRUX;
+    }
+}
@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.io;

 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.WriterException;
 import com.google.zxing.client.j2se.MatrixToImageConfig;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
@@ -104,7 +105,7 @@ public class PdfUtils {

    private static javafx.scene.image.Image getQrCode(String fragment) throws IOException, WriterException {
        QRCodeWriter qrCodeWriter = new QRCodeWriter();
-        BitMatrix qrMatrix = qrCodeWriter.encode(fragment.toUpperCase(Locale.ROOT), BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT);
+        BitMatrix qrMatrix = qrCodeWriter.encode(fragment.toUpperCase(Locale.ROOT), BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT, Map.of(EncodeHintType.MARGIN, "2"));

        ByteArrayOutputStream baos = new ByteArrayOutputStream();
        MatrixToImageWriter.writeToStream(qrMatrix, "PNG", baos, new MatrixToImageConfig());
@@ -157,7 +158,7 @@ public class PdfUtils {
                Font headerFont = new Font(Font.HELVETICA, 8, Font.BOLD, Color.DARK_GRAY);
                Font font = new Font(Font.HELVETICA, 8, Font.NORMAL, Color.DARK_GRAY);

-                HeaderFooter footer = new HeaderFooter(false, new Phrase("Recovery Phrase: " + String.join(" ", mnemonicWords), font));
+                HeaderFooter footer = new HeaderFooter(false, new Phrase("Recovery Phrase (to regenerate grid): " + String.join(" ", mnemonicWords), font));
                footer.setAlignment(Element.ALIGN_CENTER);
                footer.setBorder(Rectangle.NO_BORDER);
                footer.setBorderWidth(0);
@@ -210,6 +211,8 @@ public class PdfUtils {
                log.error("Error creating word grid PDF", e);
                AppServices.showErrorDialog("Error creating word grid PDF", e.getMessage());
            }
+        } else {
+            AppServices.showWarningDialog("Entropy Grid PDF not saved", "You have chosen to not save the entropy grid PDF.\n\nDo not store funds on a seed selected from this grid - you will not be able to regenerate it!");
        }
    }
 }
@@ -10,7 +10,7 @@ public class SeedSigner extends SpecterDIY {

    @Override
    public String getKeystoreImportDescription(int account) {
-        return "Import QR created on your SeedSigner by selecting xPub from Seed in the Seed Tools menu once you have entered your seed.";
+        return "Import QR created on your SeedSigner by selecting Export Xpub in the Seeds menu once you have entered your seed.";
    }

    @Override
@@ -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;
@@ -39,8 +39,10 @@ public class Sparrow implements WalletImport, WalletExport {
            Storage tempStorage = new Storage(persistence, tempFile);
            tempStorage.setKeyDeriver(storage.getKeyDeriver());
            tempStorage.setEncryptionPubKey(storage.getEncryptionPubKey());
-            tempStorage.saveWallet(exportedWallet);
-            for(Wallet childWallet : exportedWallet.getChildWallets()) {
+
+            Wallet copy = exportedWallet.copy();
+            tempStorage.saveWallet(copy);
+            for(Wallet childWallet : copy.getChildWallets()) {
                tempStorage.saveWallet(childWallet);
            }
            persistence.close();
--- a/Show More
+++ b/Show More