use hwi 3.0.0 built on ubuntu 20.04 amd64

upgrade to whirlpool 1.0.6 to support simpler onion switching

.github/workflows/package.yaml

@@ -2,41 +2,55 @@ name: Package
 
 on: workflow_dispatch
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-2022, ubuntu-20.04, macos-12]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
-      - name: Set up JDK 16.0.1
-        uses: actions/setup-java@v2
+      - name: Set up JDK 18.0.1
+        uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '16.0.1'
+          distribution: 'temurin'
+          java-version: '18.0.1'
       - name: Show Build Versions
         run: ./gradlew -v
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
       - name: Build with Gradle
         run: ./gradlew jpackage
       - name: Package zip distribution
-        if: ${{ runner.os == 'Windows' }}
+        if: ${{ runner.os == 'Windows' || runner.os == 'macOS' }}
         run: ./gradlew packageZipDistribution
       - name: Package tar distribution
         if: ${{ runner.os == 'Linux' }}
         run: ./gradlew packageTarDistribution
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Sparrow Build - ${{ runner.os }}
+          path: |
+            build/jpackage/*
+            !build/jpackage/Sparrow/
+      - name: Headless build with Gradle
+        if: ${{ runner.os == 'Linux' }}
+        run: ./gradlew -Djava.awt.headless=true clean jpackage
+      - name: Package headless tar distribution
+        if: ${{ runner.os == 'Linux' }}
+        run: ./gradlew -Djava.awt.headless=true packageTarDistribution
+      - name: Rename Headless Artifacts
+        if: ${{ runner.os == 'Linux' }}
+        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@v4
+        with:
+          name: Sparrow Build - ${{ runner.os }} Headless
           path: |
             build/jpackage/*
             !build/jpackage/Sparrow/

README.md

@@ -16,8 +16,8 @@ or for those without SSH credentials:
 
 `git clone --recursive https://github.com/sparrowwallet/sparrow.git`
 
-In order to build, Sparrow requires Java 16 to be installed. 
-The release binaries are built with [AdoptOpenJdk 16.0.1+9 Hotspot](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot).
+In order to build, Sparrow requires Java 18 or higher to be installed. 
+The release binaries are built with [Eclipse Temurin 18.0.1+10](https://github.com/adoptium/temurin18-binaries/releases/tag/jdk-18.0.1%2B10).
 
 Other packages may also be necessary to build depending on the platform. On Debian/Ubuntu systems:
 
@@ -36,7 +36,7 @@ When updating to the latest HEAD
 
 The release binaries are reproducible from v1.5.0 onwards (pre codesigning and installer packaging). More detailed [instructions on reproducing the binaries](docs/reproducible.md) are provided.
 
-> A video documention of your built process uploaded to [bitcoinbinary.org](https://bitcoinbinary.org/) is appreciated. Alternatively check the site if you wish to see if someone else already verified the provided binaries. 
+> Video documentation of your build process uploaded to [bitcoinbinary.org](https://bitcoinbinary.org/) is appreciated. Alternatively check the site if you wish to see if someone else already verified the provided binaries. 
 
 ## Running
 
@@ -44,7 +44,7 @@ If you prefer to run Sparrow directly from source, it can be launched from withi
 
 `./sparrow`
 
-Java 16 or higher must be installed. 
+Java 18 or higher must be installed. 
 
 ## Configuration
 
@@ -77,11 +77,11 @@ Note that if you are connecting to an Electrum server when using testnet, that s
 
 When not explicitly configured using the command line argument above, Sparrow stores its mainnet config file, log file and wallets in a home folder location appropriate to the operating system:
 
-Platform | Location
--------- | --------
-OSX      | ~/.sparrow
-Linux    | ~/.sparrow
-Windows  | %APPDATA%/Sparrow
+| Platform | Location |
+|----------| -------- |
+| OSX      | ~/.sparrow |
+| Linux    | ~/.sparrow |
+| Windows  | %APPDATA%/Sparrow |
 
 Testnet, regtest and signet configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
 

build.gradle

@@ -1,11 +1,13 @@
+import java.awt.GraphicsEnvironment
+
 plugins {
     id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.13'
     id 'extra-java-module-info'
-    id 'org.beryx.jlink' version '2.24.0'
+    id 'org-openjfx-javafxplugin'
+    id 'org.beryx.jlink' version '3.0.1'
 }
 
-def sparrowVersion = '1.6.3'
+def sparrowVersion = '1.8.5'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -13,10 +15,26 @@ if(os.macOsX) {
 }
 def targetName = ""
 def osArch = "x64"
+def releaseArch = "x86_64"
 if(System.getProperty("os.arch") == "aarch64") {
     osArch = "aarch64"
+    releaseArch = "aarch64"
     targetName = "-" + osArch
 }
+def headless = "true".equals(System.getProperty("java.awt.headless"))
+
+def vTor = '4.7.13-4'
+def vKmpTor = '1.4.3'
+def kmpOs = osName
+if(os.macOsX) {
+    kmpOs = "macos"
+} else if(os.windows) {
+    kmpOs = "mingw"
+}
+def kmpArch = "x64"
+if(System.getProperty("os.arch") == "aarch64") {
+    kmpArch = "arm64"
+}
 
 group "com.sparrowwallet"
 version "${sparrowVersion}"
@@ -45,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(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') {
+        exclude group: 'org.slf4j'
     }
-    implementation('com.google.guava:guava:28.2-jre')
-    implementation('com.google.code.gson:gson:2.8.6')
-    implementation('com.h2database:h2:2.0.206')
-    implementation('com.zaxxer:HikariCP:4.0.3')
     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')
@@ -64,14 +83,14 @@ dependencies {
         exclude group: 'com.beust', module: 'jcommander'
     }
     implementation('com.beust:jcommander:1.81')
-    implementation('com.github.arteam:simple-json-rpc-core:1.0')
-    implementation('com.github.arteam:simple-json-rpc-client:1.0') {
+    implementation('com.github.arteam:simple-json-rpc-core:1.3')
+    implementation('com.github.arteam:simple-json-rpc-client:1.3') {
         exclude group: 'com.github.arteam', module: 'simple-json-rpc-core'
     }
-    implementation('com.github.arteam:simple-json-rpc-server:1.0') {
+    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'
@@ -79,10 +98,15 @@ dependencies {
     implementation("com.github.sarxos:webcam-capture${targetName}:0.3.13-SNAPSHOT") {
         exclude group: 'com.nativelibs4java', module: 'bridj'
     }
-    implementation("com.sparrowwallet:netlayer-jpms-${osName}${targetName}:0.6.8") {
-        exclude group: 'org.jetbrains.kotlin'
+    implementation "io.matthewnelson.kotlin-components:kmp-tor:${vTor}-${vKmpTor}"
+    if(kmpOs == "linux" && kmpArch == "arm64") {
+        implementation("com.sparrowwallet.kmp-tor-binary:kmp-tor-binary-${kmpOs}${kmpArch}-jvm:${vTor}")
+    } else {
+        implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-${kmpOs}${kmpArch}:${vTor}")
     }
-    implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20')
+    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.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'
@@ -95,21 +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.32')
+    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.27')
-    testImplementation('junit:junit:4.12')
-}
-
-application {
-    mainModule = 'com.sparrowwallet.sparrow'
-    mainClass = 'com.sparrowwallet.sparrow.MainApp'
+    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')
+    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 {
@@ -130,10 +160,14 @@ processResources {
 }
 
 test {
-    jvmArgs '--add-opens=java.base/java.io=ALL-UNNAMED'
+    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",
@@ -151,13 +185,19 @@ run {
                                  "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
                                  "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
+                                 "--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow",
                                  "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
-                                 "--add-opens=java.base/java.io=com.google.gson"]
+                                 "--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"]
 
     if(os.macOsX) {
         applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
                                       "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx"]
     }
+    if(headless) {
+        applicationDefaultJvmArgs += ["-Dglass.platform=Monocle", "-Dmonocle.platform=Headless", "-Dprism.order=sw"]
+    }
 }
 
 jlink {
@@ -173,11 +213,9 @@ 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-debug', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png', '--exclude-resources', 'glob:/com.sparrowwallet.merged.module/META-INF/*']
+    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/*']
     launcher {
         name = 'sparrow'
         jvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
@@ -195,21 +233,33 @@ jlink {
                    "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
+                   "--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow",
                    "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
                    "--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=com.sparrowwallet.merged.module=java.desktop",
                    "--add-reads=com.sparrowwallet.merged.module=java.sql",
                    "--add-reads=com.sparrowwallet.merged.module=com.sparrowwallet.sparrow",
-                   "--add-reads=com.sparrowwallet.merged.module=logback.classic",
+                   "--add-reads=com.sparrowwallet.merged.module=ch.qos.logback.classic",
+                   "--add-reads=com.sparrowwallet.merged.module=org.slf4j",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
-                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor"]
+                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
+                   "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.pg",
+                   "--add-reads=com.sparrowwallet.merged.module=org.bouncycastle.provider",
+                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
 
+        if(os.windows) {
+            jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
+        }
         if(os.macOsX) {
             jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"]
         }
+        if(headless) {
+            jvmArgs += ["-Dglass.platform=Monocle", "-Dmonocle.platform=Headless", "-Dprism.order=sw"]
+        }
     }
     addExtraDependencies("javafx")
     jpackage {
@@ -218,14 +268,19 @@ 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', '--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']
             installerType = "exe"
         }
         if(os.linux) {
-            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-menu-group', 'Sparrow', '--linux-rpm-license-type', 'ASL 2.0']
+            if(headless) {
+                installerOptions = ['--license-file', 'LICENSE']
+            } else {
+                installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-menu-group', 'Sparrow']
+            }
+            installerOptions += ['--linux-app-category', 'utils', '--linux-app-release', '1', '--linux-rpm-license-type', 'ASL 2.0', '--linux-deb-maintainer', 'mail@sparrowwallet.com']
             imageOptions += ['--icon', 'src/main/deploy/package/linux/Sparrow.png', '--resource-dir', 'src/main/deploy/package/linux/']
         }
         if(os.macOsX) {
@@ -245,12 +300,13 @@ task packageZipDistribution(type: Zip) {
     destinationDirectory = file("$buildDir/jpackage")
     from("$buildDir/jpackage/") {
         include "Sparrow/**"
+        include "Sparrow.app/**"
     }
 }
 
 task packageTarDistribution(type: Tar) {
     dependsOn removeGroupWritePermission
-    archiveFileName = "sparrow-${sparrowVersion}.tar.gz"
+    archiveFileName = "sparrow-${sparrowVersion}-${releaseArch}.tar.gz"
     destinationDirectory = file("$buildDir/jpackage")
     compression = Compression.GZIP
     from("$buildDir/jpackage/") {
@@ -259,7 +315,7 @@ task packageTarDistribution(type: Tar) {
 }
 
 extraJavaModuleInfo {
-    module('jackson-core-2.10.1.jar', 'com.fasterxml.jackson.core', '2.10.1') {
+    module('jackson-core-2.13.2.jar', 'com.fasterxml.jackson.core', '2.13.2') {
         exports('com.fasterxml.jackson.core')
         exports('com.fasterxml.jackson.core.async')
         exports('com.fasterxml.jackson.core.base')
@@ -274,11 +330,11 @@ extraJavaModuleInfo {
         exports('com.fasterxml.jackson.core.util')
         uses('com.fasterxml.jackson.core.ObjectCodec')
     }
-    module('jackson-annotations-2.10.1.jar', 'com.fasterxml.jackson.annotation', '2.10.1') {
+    module('jackson-annotations-2.13.2.jar', 'com.fasterxml.jackson.annotation', '2.13.2') {
         requires('com.fasterxml.jackson.core')
         exports('com.fasterxml.jackson.annotation')
     }
-    module('jackson-databind-2.10.1.jar', 'com.fasterxml.jackson.databind', '2.10.1') {
+    module('jackson-databind-2.13.2.jar', 'com.fasterxml.jackson.databind', '2.13.2') {
         requires('java.desktop')
         requires('java.logging')
         requires('com.fasterxml.jackson.annotation')
@@ -312,7 +368,7 @@ extraJavaModuleInfo {
         exports('tornadofx.control')
         requires('javafx.controls')
     }
-    module('simple-json-rpc-core-1.0.jar', 'simple.json.rpc.core', '1.0') {
+    module('simple-json-rpc-core-1.3.jar', 'simple.json.rpc.core', '1.3') {
         exports('com.github.arteam.simplejsonrpc.core.annotation')
         exports('com.github.arteam.simplejsonrpc.core.domain')
         requires('com.fasterxml.jackson.core')
@@ -320,7 +376,7 @@ extraJavaModuleInfo {
         requires('com.fasterxml.jackson.databind')
         requires('org.jetbrains.annotations')
     }
-    module('simple-json-rpc-client-1.0.jar', 'simple.json.rpc.client', '1.0') {
+    module('simple-json-rpc-client-1.3.jar', 'simple.json.rpc.client', '1.3') {
         exports('com.github.arteam.simplejsonrpc.client')
         exports('com.github.arteam.simplejsonrpc.client.builder')
         exports('com.github.arteam.simplejsonrpc.client.exception')
@@ -328,7 +384,7 @@ extraJavaModuleInfo {
         requires('com.fasterxml.jackson.databind')
         requires('simple.json.rpc.core')
     }
-    module('simple-json-rpc-server-1.0.jar', 'simple.json.rpc.server', '1.0') {
+    module('simple-json-rpc-server-1.3.jar', 'simple.json.rpc.server', '1.3') {
         exports('com.github.arteam.simplejsonrpc.server')
         requires('simple.json.rpc.core')
         requires('com.google.common')
@@ -357,46 +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('kotlin-logging-1.5.4.jar', 'io.github.microutils.kotlin.logging', '1.5.4') {
-        exports('mu')
-        requires('kotlin.stdlib')
-        requires('org.slf4j')
-    }
-    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-28.2-jre.jar', 'com.google.common', '28.2-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')
@@ -407,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')
@@ -455,11 +482,6 @@ extraJavaModuleInfo {
         requires('javafx.graphics')
     }
     module('jai-imageio-core-1.4.0.jar', 'com.github.jai.imageio.jai.imageio.core', '1.4.0')
-    module('kotlin-stdlib-jdk8-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.jdk8', '1.5.20')
-    module('kotlin-stdlib-jdk7-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.jdk7', '1.5.20')
-    module('kotlin-stdlib-1.5.20.jar', 'kotlin.stdlib', '1.5.20') {
-        exports('kotlin')
-    }
     module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') {
         exports('com.sparrowwallet.hummingbird')
         exports('com.sparrowwallet.hummingbird.registry')
@@ -467,66 +489,24 @@ extraJavaModuleInfo {
     }
     module('cbor-0.9.jar', 'co.nstant.in.cbor', '0.9') {
         exports('co.nstant.in.cbor')
+        exports('co.nstant.in.cbor.model')
+        exports('co.nstant.in.cbor.builder')
     }
-    module('nightjar-0.2.32.jar', 'com.sparrowwallet.nightjar', '0.2.32') {
-        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')
@@ -534,65 +514,145 @@ 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')
     }
     module('jcip-annotations-1.0.jar', 'net.jcip.annotations', '1.0') {
         exports('net.jcip.annotations')
     }
-    module("netlayer-jpms-${osName}${targetName}-0.6.8.jar", 'netlayer.jpms', '0.6.8') {
-        exports('org.berndpruenster.netlayer.tor')
-        requires('com.github.ravn.jsocks')
-        requires('com.github.JesusMcCloud.jtorctl')
-        requires('kotlin.stdlib')
-        requires('commons.compress')
-        requires('org.tukaani.xz')
-        requires('java.management')
-        requires('io.github.microutils.kotlin.logging')
+    module('thumbnailator-0.4.18.jar', 'net.coobird.thumbnailator', '0.4.18') {
+        exports('net.coobird.thumbnailator')
+        requires('java.desktop')
     }
-    module('jtorctl-1.5.jar', 'com.github.JesusMcCloud.jtorctl', '1.5') {
-        exports('net.freehaven.tor.control')
-    }
-    module('commons-compress-1.18.jar', 'commons.compress', '1.18') {
-        exports('org.apache.commons.compress')
-        requires('org.tukaani.xz')
-    }
-    module('xz-1.6.jar', 'org.tukaani.xz', '1.6') {
-        exports('org.tukaani.xz')
-    }
-    module('jsocks-1.0.jar', 'com.github.ravn.jsocks', '1.0') {
-        exports('com.runjva.sourceforge.jsocks.protocol')
-        requires('org.slf4j')
-    }
-    module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
-    module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
+    module('fxsvgimage-1.0b2.jar', 'com.github.hervegirod', '1.0b2') {
+        exports('org.girod.javafx.svgimage')
+        requires('javafx.graphics')
         requires('java.xml')
     }
-    module('kotlin-stdlib-common-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.common', '1.5.20') {
-        exports('kotlin.jvm')
-        exports('kotlin.collections')
+    module("kmp-tor-jvm-${vKmpTor}.jar", 'kmp.tor.jvm', "${vTor}-${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor')
+        requires('kmp.tor.binary.extract.jvm')
+        requires('kmp.tor.manager.jvm')
+        requires('kmp.tor.manager.common.jvm')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.coroutines.core')
+        requires('java.management')
     }
+    if(kmpOs == "linux" && kmpArch == "arm64") {
+        module("kmp-tor-binary-${kmpOs}${kmpArch}-jvm-${vTor}.jar", "kmp.tor.binary.${kmpOs}${kmpArch}", "${vTor}") {
+            exports("io.matthewnelson.kmp.tor.resource.${kmpOs}.${kmpArch}")
+            exports("kmptor.${kmpOs}.${kmpArch}")
+        }
+    } else {
+        module("kmp-tor-binary-${kmpOs}${kmpArch}-jvm-${vTor}.jar", "kmp.tor.binary.${kmpOs}${kmpArch}", "${vTor}") {
+            exports("io.matthewnelson.kmp.tor.binary.${kmpOs}.${kmpArch}")
+            exports("kmptor.${kmpOs}.${kmpArch}")
+        }
+    }
+    module("kmp-tor-binary-extract-jvm-${vTor}.jar", 'kmp.tor.binary.extract.jvm', "${vTor}") {
+        exports('io.matthewnelson.kmp.tor.binary.extract')
+        exports('io.matthewnelson.kmp.tor.binary.extract.internal')
+        requires('kotlin.stdlib')
+        requires("kmp.tor.binary.${kmpOs}${kmpArch}")
+        requires('kmp.tor.binary.geoip.jvm')
+    }
+    module("kmp-tor-manager-jvm-${vKmpTor}.jar", 'kmp.tor.manager.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.manager')
+        exports('io.matthewnelson.kmp.tor.manager.util')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kmp.tor.manager.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.coroutines.core')
+        requires('kotlinx.atomicfu')
+        requires('kmp.tor.controller.jvm')
+        requires('kmp.tor.common.jvm')
+    }
+    module("kmp-tor-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.manager.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.manager.common')
+        exports('io.matthewnelson.kmp.tor.manager.common.event')
+        exports('io.matthewnelson.kmp.tor.manager.common.state')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kmp.tor.common.jvm')
+        requires('kotlin.stdlib')
+    }
+    module("kmp-tor-controller-common-jvm-${vKmpTor}.jar", 'kmp.tor.controller.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.controller.common.config')
+        exports('io.matthewnelson.kmp.tor.controller.common.file')
+        exports('io.matthewnelson.kmp.tor.controller.common.control')
+        exports('io.matthewnelson.kmp.tor.controller.common.control.usecase')
+        exports('io.matthewnelson.kmp.tor.controller.common.events')
+        exports('io.matthewnelson.kmp.tor.controller.common.exceptions')
+        requires('kmp.tor.common.jvm')
+        requires('kotlin.stdlib')
+        requires('kotlinx.atomicfu')
+    }
+    module("kmp-tor-common-jvm-${vKmpTor}.jar", 'kmp.tor.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.common.address')
+        requires('parcelize.jvm')
+        requires('kotlin.stdlib')
+    }
+    module("kmp-tor-controller-jvm-${vKmpTor}.jar", 'kmp.tor.controller.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.controller.internal.controller')
+        requires('kmp.tor.common.jvm')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kotlinx.coroutines.core')
+        requires('kotlin.stdlib')
+        requires('kotlinx.atomicfu')
+        requires('encoding.core.jvm')
+        requires('encoding.base16.jvm')
+    }
+    module("kmp-tor-ext-callback-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.common')
+    }
+    module("kmp-tor-ext-callback-manager-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.manager')
+        requires('kmp.tor.manager.jvm')
+        requires('kmp.tor.ext.callback.common.jvm')
+        requires('kmp.tor.ext.callback.manager.common.jvm')
+        requires('kmp.tor.ext.callback.controller.common.jvm')
+        requires('kmp.tor.manager.common.jvm')
+        requires('kmp.tor.controller.common.jvm')
+        requires('kotlin.stdlib')
+        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')
+        requires('kmp.tor.ext.callback.controller.common.jvm')
+    }
+    module("kmp-tor-ext-callback-controller-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.controller.common.jvm', "${vKmpTor}") {
+        exports('io.matthewnelson.kmp.tor.ext.callback.controller.common.control')
+        exports('io.matthewnelson.kmp.tor.ext.callback.controller.common.control.usecase')
+    }
+    module("kmp-tor-binary-geoip-jvm-${vTor}.jar", 'kmp.tor.binary.geoip.jvm', "${vTor}") {
+        exports('io.matthewnelson.kmp.tor.binary.geoip')
+        exports('kmptor')
+    }
+    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("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')
+    }
+    module("parcelize-jvm-0.1.2.jar", 'parcelize.jvm', "0.1.2") {
+        exports('io.matthewnelson.component.parcelize')
+    }
+    module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
     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')
+    module('jzlib-1.1.3.jar', 'com.jcraft.jzlib', '1.1.3') {
+        exports('com.jcraft.jzlib')
     }
-    module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3')
 }

buildSrc/build.gradle

@@ -3,11 +3,16 @@ plugins {
 }
 
 dependencies {
-    implementation 'org.ow2.asm:asm:8.0.1'
+    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 {
     mavenCentral()
+    maven {
+        url "https://plugins.gradle.org/m2/"
+    }
 }
 
 gradlePlugin {
@@ -17,5 +22,9 @@ gradlePlugin {
             id = "extra-java-module-info"
             implementationClass = "org.gradle.sample.transform.javamodules.ExtraModuleInfoPlugin"
         }
+        register("org-openjfx-javafxplugin") {
+            id = "org-openjfx-javafxplugin"
+            implementationClass = "org.openjfx.gradle.JavaFXPlugin"
+        }
     }
 }

buildSrc/src/main/java/org/gradle/sample/transform/javamodules/ExtraModuleInfoTransform.java

@@ -67,6 +67,8 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
             outputs.file(originalJar);
         } else if (automaticModules.containsKey(originalJarName)) {
             addAutomaticModuleName(originalJar,  getModuleJar(outputs, originalJar), automaticModules.get(originalJarName));
+        } else if(originalJarName.startsWith("kotlin-stdlib-common")) {
+            //ignore
         } else {
             throw new RuntimeException("Not a module and no mapping defined: " + originalJarName);
         }

buildSrc/src/main/java/org/openjfx/gradle/JavaFXModule.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2018, 2020, Gluon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openjfx.gradle;
+
+import org.gradle.api.GradleException;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+public enum JavaFXModule {
+
+    BASE,
+    GRAPHICS(BASE),
+    CONTROLS(BASE, GRAPHICS),
+    FXML(BASE, GRAPHICS),
+    MEDIA(BASE, GRAPHICS),
+    SWING(BASE, GRAPHICS),
+    WEB(BASE, CONTROLS, GRAPHICS, MEDIA);
+
+    static final String PREFIX_MODULE = "javafx.";
+    private static final String PREFIX_ARTIFACT = "javafx-";
+
+    private List<JavaFXModule> dependentModules;
+
+    JavaFXModule(JavaFXModule...dependentModules) {
+        this.dependentModules = List.of(dependentModules);
+    }
+
+    public static Optional<JavaFXModule> fromModuleName(String moduleName) {
+        return Stream.of(JavaFXModule.values())
+                .filter(javaFXModule -> moduleName.equals(javaFXModule.getModuleName()))
+                .findFirst();
+    }
+
+    public String getModuleName() {
+        return PREFIX_MODULE + name().toLowerCase(Locale.ROOT);
+    }
+
+    public String getModuleJarFileName() {
+        return getModuleName() + ".jar";
+    }
+
+    public String getArtifactName() {
+        return PREFIX_ARTIFACT + name().toLowerCase(Locale.ROOT);
+    }
+
+    public boolean compareJarFileName(JavaFXPlatform platform, String jarFileName) {
+        Pattern p = Pattern.compile(getArtifactName() + "-.+-" + platform.getClassifier() + "\\.jar");
+        return p.matcher(jarFileName).matches();
+    }
+
+    public static Set<JavaFXModule> getJavaFXModules(List<String> moduleNames) {
+        validateModules(moduleNames);
+
+        return moduleNames.stream()
+                .map(JavaFXModule::fromModuleName)
+                .flatMap(Optional::stream)
+                .flatMap(javaFXModule -> javaFXModule.getMavenDependencies().stream())
+                .collect(Collectors.toSet());
+    }
+
+    public static void validateModules(List<String> moduleNames) {
+        var invalidModules = moduleNames.stream()
+                .filter(module -> JavaFXModule.fromModuleName(module).isEmpty())
+                .collect(Collectors.toList());
+
+        if (! invalidModules.isEmpty()) {
+            throw new GradleException("Found one or more invalid JavaFX module names: " + invalidModules);
+        }
+    }
+
+    public List<JavaFXModule> getDependentModules() {
+        return dependentModules;
+    }
+
+    public List<JavaFXModule> getMavenDependencies() {
+        List<JavaFXModule> dependencies = new ArrayList<>(dependentModules);
+        dependencies.add(0, this);
+        return dependencies;
+    }
+}

buildSrc/src/main/java/org/openjfx/gradle/JavaFXOptions.java

@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2018, Gluon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openjfx.gradle;
+
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.repositories.FlatDirectoryArtifactRepository;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.openjfx.gradle.JavaFXModule.PREFIX_MODULE;
+
+public class JavaFXOptions {
+
+    private static final String MAVEN_JAVAFX_ARTIFACT_GROUP_ID = "org.openjfx";
+    private static final String JAVAFX_SDK_LIB_FOLDER = "lib";
+
+    private final Project project;
+    private final JavaFXPlatform platform;
+
+    private String version = "16";
+    private String sdk;
+    private String configuration = "implementation";
+    private String lastUpdatedConfiguration;
+    private List<String> modules = new ArrayList<>();
+    private FlatDirectoryArtifactRepository customSDKArtifactRepository;
+
+    public JavaFXOptions(Project project) {
+        this.project = project;
+        this.platform = JavaFXPlatform.detect(project);
+    }
+
+    public JavaFXPlatform getPlatform() {
+        return platform;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+        updateJavaFXDependencies();
+    }
+
+    /**
+     * If set, the JavaFX modules will be taken from this local
+     * repository, and not from Maven Central
+     * @param sdk, the path to the local JavaFX SDK folder
+     */
+    public void setSdk(String sdk) {
+        this.sdk = sdk;
+        updateJavaFXDependencies();
+    }
+
+    public String getSdk() {
+        return sdk;
+    }
+
+    /** Set the configuration name for dependencies, e.g.
+     * 'implementation', 'compileOnly' etc.
+     * @param configuration The configuration name for dependencies
+     */
+    public void setConfiguration(String configuration) {
+        this.configuration = configuration;
+        updateJavaFXDependencies();
+    }
+
+    public String getConfiguration() {
+        return configuration;
+    }
+
+    public List<String> getModules() {
+        return modules;
+    }
+
+    public void setModules(List<String> modules) {
+        this.modules = modules;
+        updateJavaFXDependencies();
+    }
+
+    public void modules(String...moduleNames) {
+        setModules(List.of(moduleNames));
+    }
+
+    private void updateJavaFXDependencies() {
+        clearJavaFXDependencies();
+
+        String configuration = getConfiguration();
+        JavaFXModule.getJavaFXModules(this.modules).stream()
+                .sorted()
+                .forEach(javaFXModule -> {
+                    if (customSDKArtifactRepository != null) {
+                        project.getDependencies().add(configuration, Map.of("name", javaFXModule.getModuleName()));
+                    } else {
+                        project.getDependencies().add(configuration,
+                                String.format("%s:%s:%s:%s", MAVEN_JAVAFX_ARTIFACT_GROUP_ID, javaFXModule.getArtifactName(),
+                                        getVersion(), getPlatform().getClassifier()));
+                    }
+                });
+        lastUpdatedConfiguration = configuration;
+    }
+
+    private void clearJavaFXDependencies() {
+        if (customSDKArtifactRepository != null) {
+            project.getRepositories().remove(customSDKArtifactRepository);
+            customSDKArtifactRepository = null;
+        }
+
+        if (sdk != null && ! sdk.isEmpty()) {
+            Map<String, String> dirs = new HashMap<>();
+            dirs.put("name", "customSDKArtifactRepository");
+            if (sdk.endsWith(File.separator)) {
+                dirs.put("dirs", sdk + JAVAFX_SDK_LIB_FOLDER);
+            } else {
+                dirs.put("dirs", sdk + File.separator + JAVAFX_SDK_LIB_FOLDER);
+            }
+            customSDKArtifactRepository = project.getRepositories().flatDir(dirs);
+        }
+
+        if (lastUpdatedConfiguration == null) {
+            return;
+        }
+        var configuration = project.getConfigurations().findByName(lastUpdatedConfiguration);
+        if (configuration != null) {
+            if (customSDKArtifactRepository != null) {
+                configuration.getDependencies()
+                        .removeIf(dependency -> dependency.getName().startsWith(PREFIX_MODULE));
+            }
+            configuration.getDependencies()
+                    .removeIf(dependency -> MAVEN_JAVAFX_ARTIFACT_GROUP_ID.equals(dependency.getGroup()));
+        }
+    }
+}

buildSrc/src/main/java/org/openjfx/gradle/JavaFXPlatform.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2018, Gluon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openjfx.gradle;
+
+import com.google.gradle.osdetector.OsDetector;
+import org.gradle.api.GradleException;
+import org.gradle.api.Project;
+
+import java.awt.*;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+public enum JavaFXPlatform {
+
+    LINUX("linux", "linux-x86_64"),
+    LINUX_MONOCLE("linux-monocle", "linux-x86_64-monocle"),
+    LINUX_AARCH64("linux-aarch64", "linux-aarch_64"),
+    LINUX_AARCH64_MONOCLE("linux-aarch64-monocle", "linux-aarch_64-monocle"),
+    WINDOWS("win", "windows-x86_64"),
+    WINDOWS_MONOCLE("win-monocle", "windows-x86_64-monocle"),
+    OSX("mac", "osx-x86_64"),
+    OSX_MONOCLE("mac-monocle", "osx-x86_64-monocle"),
+    OSX_AARCH64("mac-aarch64", "osx-aarch_64"),
+    OSX_AARCH64_MONOCLE("mac-aarch64-monocle", "osx-aarch_64-monocle");
+
+    private final String classifier;
+    private final String osDetectorClassifier;
+
+    JavaFXPlatform( String classifier, String osDetectorClassifier ) {
+        this.classifier = classifier;
+        this.osDetectorClassifier = osDetectorClassifier;
+    }
+
+    public String getClassifier() {
+        return classifier;
+    }
+
+    public static JavaFXPlatform detect(Project project) {
+
+        String osClassifier = project.getExtensions().getByType(OsDetector.class).getClassifier();
+
+        if("true".equals(System.getProperty("java.awt.headless"))) {
+            osClassifier += "-monocle";
+        }
+
+        for ( JavaFXPlatform platform: values()) {
+            if ( platform.osDetectorClassifier.equals(osClassifier)) {
+                return platform;
+            }
+        }
+
+        String supportedPlatforms = Arrays.stream(values())
+                .map(p->p.osDetectorClassifier)
+                .collect(Collectors.joining("', '", "'", "'"));
+
+        throw new GradleException(
+            String.format(
+                    "Unsupported JavaFX platform found: '%s'! " +
+                    "This plugin is designed to work on supported platforms only." +
+                    "Current supported platforms are %s.", osClassifier, supportedPlatforms )
+        );
+
+    }
+}

buildSrc/src/main/java/org/openjfx/gradle/JavaFXPlugin.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018, Gluon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openjfx.gradle;
+
+import com.google.gradle.osdetector.OsDetectorPlugin;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.javamodularity.moduleplugin.ModuleSystemPlugin;
+import org.openjfx.gradle.tasks.ExecTask;
+
+public class JavaFXPlugin implements Plugin<Project> {
+
+    @Override
+    public void apply(Project project) {
+        project.getPlugins().apply(OsDetectorPlugin.class);
+        project.getPlugins().apply(ModuleSystemPlugin.class);
+
+        project.getExtensions().create("javafx", JavaFXOptions.class, project);
+
+        project.getTasks().create("configJavafxRun", ExecTask.class, project);
+    }
+}

buildSrc/src/main/java/org/openjfx/gradle/tasks/ExecTask.java

@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2019, 2021, Gluon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.openjfx.gradle.tasks;
+
+import org.gradle.api.DefaultTask;
+import org.gradle.api.GradleException;
+import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.plugins.ApplicationPlugin;
+import org.gradle.api.tasks.JavaExec;
+import org.gradle.api.tasks.TaskAction;
+import org.javamodularity.moduleplugin.extensions.RunModuleOptions;
+import org.openjfx.gradle.JavaFXModule;
+import org.openjfx.gradle.JavaFXOptions;
+import org.openjfx.gradle.JavaFXPlatform;
+
+import javax.inject.Inject;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.TreeSet;
+
+public class ExecTask extends DefaultTask {
+
+    private static final Logger LOGGER = Logging.getLogger(ExecTask.class);
+
+    private final Project project;
+    private JavaExec execTask;
+
+    @Inject
+    public ExecTask(Project project) {
+        this.project = project;
+        project.getPluginManager().withPlugin(ApplicationPlugin.APPLICATION_PLUGIN_NAME, e -> {
+            execTask = (JavaExec) project.getTasks().findByName(ApplicationPlugin.TASK_RUN_NAME);
+            if (execTask != null) {
+                execTask.dependsOn(this);
+            } else {
+                throw new GradleException("Run task not found.");
+            }
+        });
+    }
+
+    @TaskAction
+    public void action() {
+        if (execTask != null) {
+            JavaFXOptions javaFXOptions = project.getExtensions().getByType(JavaFXOptions.class);
+            JavaFXModule.validateModules(javaFXOptions.getModules());
+
+            var definedJavaFXModuleNames = new TreeSet<>(javaFXOptions.getModules());
+            if (!definedJavaFXModuleNames.isEmpty()) {
+                RunModuleOptions moduleOptions = execTask.getExtensions().findByType(RunModuleOptions.class);
+
+                final FileCollection classpathWithoutJavaFXJars = execTask.getClasspath().filter(
+                        jar -> Arrays.stream(JavaFXModule.values()).noneMatch(javaFXModule -> jar.getName().contains(javaFXModule.getArtifactName()))
+                );
+                final FileCollection javaFXPlatformJars = execTask.getClasspath().filter(jar -> isJavaFXJar(jar, javaFXOptions.getPlatform()));
+
+                if (moduleOptions != null) {
+                    LOGGER.info("Modular JavaFX application found");
+                    // Remove empty JavaFX jars from classpath
+                    execTask.setClasspath(classpathWithoutJavaFXJars.plus(javaFXPlatformJars));
+                    definedJavaFXModuleNames.forEach(javaFXModule -> moduleOptions.getAddModules().add(javaFXModule));
+                } else {
+                    LOGGER.info("Non-modular JavaFX application found");
+                    // Remove all JavaFX jars from classpath
+                    execTask.setClasspath(classpathWithoutJavaFXJars);
+
+                    var javaFXModuleJvmArgs = List.of("--module-path", javaFXPlatformJars.getAsPath());
+
+                    var jvmArgs = new ArrayList<String>();
+                    jvmArgs.add("--add-modules");
+                    jvmArgs.add(String.join(",", definedJavaFXModuleNames));
+
+                    List<String> execJvmArgs = execTask.getJvmArgs();
+                    if (execJvmArgs != null) {
+                        jvmArgs.addAll(execJvmArgs);
+                    }
+                    jvmArgs.addAll(javaFXModuleJvmArgs);
+
+                    execTask.setJvmArgs(jvmArgs);
+                }
+            }
+        } else {
+            throw new GradleException("Run task not found. Please, make sure the Application plugin is applied");
+        }
+    }
+
+    private static boolean isJavaFXJar(File jar, JavaFXPlatform platform) {
+        return jar.isFile() &&
+                Arrays.stream(JavaFXModule.values()).anyMatch(javaFXModule ->
+                    javaFXModule.compareJarFileName(platform, jar.getName()) ||
+                    javaFXModule.getModuleJarFileName().equals(jar.getName()));
+    }
+}

docs/reproducible.md

@@ -1,70 +1,125 @@
-## Reproducible builds
+# Reproducible builds
 
-Reproducibility is a goal of the Sparrow Wallet project. 
+Reproducibility is a goal of the Sparrow Wallet project.
 As of v1.5.0 and later, it is possible to recreate the exact binaries in the Github releases (specifically, the contents of the `.tar.gz` and `.zip` files).
 
 Due to minor variances, it is not yet possible to reproduce the installer packages (`.deb`, `.rpm` and `.exe`).
-In addition, the OSX binary is code signed and thus can't be directly reproduced yet. 
+In addition, the OSX binary is code signed and thus can't be directly reproduced yet.
 Work on resolving both of these issues is ongoing.
 
-### Reproducing a release
+## Reproducing a release
 
-#### Install Java
+### Install Java
 
 Because Sparrow bundles a Java runtime in the release binaries, it is essential to have the same version of Java installed when creating the release.
-For v1.5.0 and later, this is AdoptOpenJdk jdk-16.0.1+9 Hotspot. 
-It is available for all supported platforms from the [AdoptOpenJdk site](https://adoptopenjdk.net/archive.html?variant=openjdk16&jvmVariant=hotspot).
+For v1.6.6 and later, this is Eclipse Temurin 18.0.1+10.
+
+#### Java from Adoptium github repo
+
+It is available for all supported platforms from [Eclipse Temurin 18.0.1+10](https://github.com/adoptium/temurin18-binaries/releases/tag/jdk-18.0.1%2B10).
 
 For reference, the downloads are as follows:
-- [Linux x64](https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_linux_hotspot_16.0.1_9.tar.gz)
-- [MacOS x64](https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_mac_hotspot_16.0.1_9.tar.gz)
-- [Windows x64](https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jdk_x64_windows_hotspot_16.0.1_9.zip)
+- [Linux x64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_linux_hotspot_18.0.1_10.tar.gz)
+- [MacOS x64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_mac_hotspot_18.0.1_10.tar.gz)
+- [MacOS aarch64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_aarch64_mac_hotspot_18.0.1_10.tar.gz)
+- [Windows x64](https://github.com/adoptium/temurin18-binaries/releases/download/jdk-18.0.1%2B10/OpenJDK18U-jdk_x64_windows_hotspot_18.0.1_10.zip)
+
+#### Java from Adoptium deb repo
 
 It is also possible to install via a package manager on *nix systems. For example, on Debian/Ubuntu systems:
-```shell
-sudo apt-get install -y wget apt-transport-https gnupg
-wget https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public
-gpg --no-default-keyring --keyring ./adoptopenjdk-keyring.gpg --import public
-gpg --no-default-keyring --keyring ./adoptopenjdk-keyring.gpg --export --output adoptopenjdk-archive-keyring.gpg
-rm adoptopenjdk-keyring.gpg
-sudo mv adoptopenjdk-archive-keyring.gpg /usr/share/keyrings
-echo "deb [signed-by=/usr/share/keyrings/adoptopenjdk-archive-keyring.gpg] https://adoptopenjdk.jfrog.io/adoptopenjdk/deb $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/adoptopenjdk.list
-sudo apt update -y
-sudo apt-get install -y adoptopenjdk-16-hotspot=16.0.1+9-3
+
+- Install dependencies:
+```sh
+sudo apt-get install -y wget curl apt-transport-https gnupg
 ```
 
+Download Adoptium public PGP key:
+```sh
+curl --tlsv1.2 --proto =https --location -o adoptium.asc https://packages.adoptium.net/artifactory/api/gpg/key/public
+```
+
+Check if key fingerprint matches: `3B04D753C9050D9A5D343F39843C48A565F8F04B`:
+```
+gpg --import --import-options show-only adoptium.asc
+```
+If key doesn't match, do not proceed.
+
+Add Adoptium PGP key to a the keyring shared folder:
+```sh
+sudo cp adoptium.asc /usr/share/keyrings/
+```
+
+Add Adoptium debian repository:
+```sh
+echo "deb [signed-by=/usr/share/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | sudo tee /etc/apt/sources.list.d/adoptium.list
+```
+
+Update cache, install the desired temurin version and configure java to be linked to this same version:
+```
+sudo apt update -y
+sudo apt-get install -y temurin-18-jdk=18.0.1+10
+sudo update-alternatives --config java
+```
+
+#### Java from SDK
+
 A alternative option for all platforms is to use the [sdkman.io](https://sdkman.io/) package manager ([Git Bash for Windows](https://git-scm.com/download/win) is a good choice on that platform).
 See the installation [instructions here](https://sdkman.io/install).
 Once installed, run
 ```shell
-sdk install java 16.0.1.hs-adpt
+sdk install java 18.0.1-tem
 ```
 
-#### Other requirements
+### Other requirements
 
 Other packages may also be necessary to build depending on the platform. On Debian/Ubuntu systems:
 ```shell
 sudo apt install -y rpm fakeroot binutils
 ```
 
-#### Building the binaries
+### Building the binaries
+
+First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
 
-The project can cloned for a specific release tag as follows:
 ```shell
-GIT_TAG="1.5.2"
-git clone --recursive --branch "${GIT_TAG}" git@github.com:sparrowwallet/sparrow.git
+GIT_TAG="1.8.4"
 ```
 
-Thereafter, building should be straightforward:
+The project can then be initially cloned as follows:
 
 ```shell
-cd sparrow
+git clone --recursive --branch "${GIT_TAG}" https://github.com/sparrowwallet/sparrow.git
+```
+
+If you already have the sparrow repo cloned, fetch all new updates and checkout the release. For this, change into your local sparrow folder and execute:
+
+```shell
+cd {yourPathToSparrow}/sparrow
+git pull --recurse-submodules
+git checkout "${GIT_TAG}"
+```
+
+Note - there is an additional step if you updated rather than initially cloned your repo at `GIT_TAG`. 
+This is due to the [drongo submodule](https://github.com/sparrowwallet/drongo/tree/master) which needs to be checked out to the commit state it had at the time of the release. 
+Only then your build will be comparable to the provided one in the release section of Github. 
+To checkout the submodule to the correct commit for `GIT_TAG`, additionally run:
+
+```shell
+git submodule update --checkout
+```
+
+Thereafter, building should be straightforward. If not already done, change into the sparrow folder and run:
+
+```shell
+cd {yourPathToSparrow}/sparrow  # if you aren't already in the sparrow folder
 ./gradlew jpackage
 ```
 
 The binaries (and installers) will be placed in the `build/jpackage` folder.
 
-#### Verifying the binaries are identical
+### Verifying the binaries are identical
+
+Verify the built binaries against the released binaries on https://github.com/sparrowwallet/sparrow/releases.
 
 Note that you will be verifying the files in the `build/jpackage/Sparrow` folder against either the `.tar.gz` or `.zip` releases.
 Download either of these depending on your platform and extract the contents to a folder (in the following example, `/tmp`).
@@ -76,3 +131,4 @@ diff -r build/jpackage/Sparrow /tmp/Sparrow
 
 This command should have no output indicating that the two folders (and all their contents) are identical.
 
+If there is output, please open an issue with detailed instructions to reproduce, including build system platform.

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# 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"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
 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.
+    JAVACMD=java
+    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.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+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=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# 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" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/deploy/asc.properties

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

src/main/deploy/auth47.properties

@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/auth47
+description=Auth47 Authentication URI

src/main/deploy/lightning.properties

@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/lightning
+description=LNURL URI

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

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

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

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.6.3</string>
+  <string>1.8.5</string>
   <key>CFBundleSignature</key>
   <string>????</string>
   <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -45,6 +45,22 @@
             <string>bitcoin</string>
           </array>
       </dict>
+      <dict>
+          <key>CFBundleURLName</key>
+          <string>com.sparrowwallet.sparrow.auth47</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <string>auth47</string>
+          </array>
+      </dict>
+      <dict>
+          <key>CFBundleURLName</key>
+          <string>com.sparrowwallet.sparrow.lightning</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <string>lightning</string>
+          </array>
+      </dict>
   </array>
   <key>UTImportedTypeDeclarations</key>
   <array>
@@ -78,6 +94,21 @@
           <key>UTTypeIconFile</key>
           <string>sparrow.icns</string>
       </dict>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>com.sparrowwallet.asc</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>asc</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>ASCII Armored File</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
   </array>
  <key>CFBundleDocumentTypes</key>
  <array>

src/main/deploy/package/windows/main.wxs

@@ -77,6 +77,16 @@
 
     <DirectoryRef Id="TARGETDIR">
         <Component Id="RegistryEntries" Guid="{206C911C-56EF-44B8-9257-5FD214427965}">
+            <RegistryKey Root="HKCR" Key="auth47" Action="createAndRemoveOnUninstall">
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Value="URL:Auth47 Authentication URI"/>
+                <RegistryKey Key="DefaultIcon">
+                    <RegistryValue Type="string" Value="$(var.JpAppName).exe" />
+                </RegistryKey>
+                <RegistryKey Key="shell\open\command">
+                    <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
+                </RegistryKey>
+            </RegistryKey>
             <RegistryKey Root="HKCR" Key="bitcoin" Action="createAndRemoveOnUninstall">
                 <RegistryValue Type="string" Name="URL Protocol" Value=""/>
                 <RegistryValue Type="string" Value="URL:Bitcoin Payment URL"/>
@@ -87,6 +97,16 @@
                     <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
                 </RegistryKey>
             </RegistryKey>
+            <RegistryKey Root="HKCR" Key="lightning" Action="createAndRemoveOnUninstall">
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Value="URL:LNURL URI"/>
+                <RegistryKey Key="DefaultIcon">
+                    <RegistryValue Type="string" Value="$(var.JpAppName).exe" />
+                </RegistryKey>
+                <RegistryKey Key="shell\open\command">
+                    <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
+                </RegistryKey>
+            </RegistryKey>
         </Component>
     </DirectoryRef>
 

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

@@ -12,7 +12,7 @@ public class AboutController {
     private Label title;
 
     public void initializeView() {
-        title.setText(MainApp.APP_NAME + " " + MainApp.APP_VERSION + MainApp.APP_VERSION_SUFFIX);
+        title.setText(SparrowWallet.APP_NAME + " " + SparrowWallet.APP_VERSION + SparrowWallet.APP_VERSION_SUFFIX);
     }
 
     public void setStage(Stage stage) {

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

@@ -3,30 +3,37 @@ package com.sparrowwallet.sparrow;
 import com.google.common.eventbus.Subscribe;
 import com.google.common.net.HostAndPort;
 import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.crypto.EncryptionType;
+import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
+import com.sparrowwallet.drongo.crypto.Key;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.control.WalletPasswordDialog;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.net.Auth47;
 import com.sparrowwallet.drongo.protocol.BlockHeader;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
-import com.sparrowwallet.drongo.wallet.KeystoreSource;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.drongo.wallet.WalletTransaction;
-import com.sparrowwallet.sparrow.control.TextUtils;
 import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
-import com.sparrowwallet.sparrow.paynym.PayNymService;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
+import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 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;
@@ -35,7 +42,6 @@ import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.Dialog;
-import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
@@ -44,8 +50,7 @@ import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.util.Duration;
-import org.berndpruenster.netlayer.tor.Tor;
-import org.controlsfx.control.HyperlinkLabel;
+import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,28 +63,35 @@ 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.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.control.DownloadVerifierDialog.*;
+
 public class AppServices {
     private static final Logger log = LoggerFactory.getLogger(AppServices.class);
 
     private static final int SERVER_PING_PERIOD_SECS = 60;
     private static final int PUBLIC_SERVER_RETRY_PERIOD_SECS = 3;
-    private static final int ENUMERATE_HW_PERIOD_SECS = 30;
+    private static final int PRIVATE_SERVER_RETRY_PERIOD_SECS = 15;
+    public static final int ENUMERATE_HW_PERIOD_SECS = 30;
     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;
 
@@ -87,9 +99,11 @@ public class AppServices {
 
     private final SorobanServices sorobanServices = new SorobanServices();
 
-    private static PayNymService payNymService;
+    private InteractionServices interactionServices;
 
-    private final MainApp application;
+    private static HttpClientService httpClientService;
+
+    private final Application application;
 
     private final Map<Window, List<WalletTabData>> walletWindows = new LinkedHashMap<>();
 
@@ -103,6 +117,8 @@ public class AppServices {
 
     private ElectrumServer.ConnectionService connectionService;
 
+    private ElectrumServer.FeeRatesService feeRatesService;
+
     private Hwi.ScheduledEnumerateService deviceEnumerateService;
 
     private VersionCheckService versionCheckService;
@@ -141,7 +157,9 @@ public class AppServices {
                         torService.reset();
                     }
 
-                    torService.start();
+                    if(torService.getState() != Worker.State.RUNNING) {
+                        torService.start();
+                    }
                 } else {
                     restartServices();
                 }
@@ -149,6 +167,11 @@ public class AppServices {
                 connectionService.cancel();
                 ratesService.cancel();
                 versionCheckService.cancel();
+
+                if(httpClientService != null) {
+                    HttpClientService.ShutdownService shutdownService = new HttpClientService.ShutdownService(httpClientService);
+                    shutdownService.start();
+                }
             }
         }
     };
@@ -161,8 +184,9 @@ public class AppServices {
         openFiles(event.getFiles(), null);
     };
 
-    public AppServices(MainApp application) {
+    private AppServices(Application application, InteractionServices interactionServices) {
         this.application = application;
+        this.interactionServices = interactionServices;
         EventManager.get().register(this);
         EventManager.get().register(whirlpoolServices);
         EventManager.get().register(sorobanServices);
@@ -171,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();
@@ -184,6 +209,8 @@ public class AppServices {
             } else {
                 restartServices();
             }
+        } else {
+            EventManager.get().post(new DisconnectionEvent());
         }
 
         addURIHandlers();
@@ -191,7 +218,7 @@ public class AppServices {
 
     private void restartServices() {
         Config config = Config.get();
-        if(config.hasServerAddress()) {
+        if(config.hasServer()) {
             restartService(connectionService);
         }
 
@@ -199,7 +226,7 @@ public class AppServices {
             restartService(ratesService);
         }
 
-        if(config.isCheckNewVersions() && Network.get() == Network.MAINNET) {
+        if(config.isCheckNewVersions() && Network.get() == Network.MAINNET && Interface.get() == Interface.DESKTOP) {
             restartService(versionCheckService);
         }
 
@@ -235,25 +262,28 @@ 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();
         }
 
         if(Tor.getDefault() != null) {
-            Tor.getDefault().shutdown();
+            Tor.getDefault().getTorManager().destroy(true, success -> {});
         }
     }
 
     private ElectrumServer.ConnectionService createConnectionService() {
         ElectrumServer.ConnectionService connectionService = new ElectrumServer.ConnectionService();
+        //Delay startup on first connection to Bitcoin Core to allow any unencrypted wallets to open first
+        connectionService.setDelay(Config.get().getServerType() == ServerType.BITCOIN_CORE ? Duration.seconds(CONNECTION_DELAY_SECS) : Duration.ZERO);
         connectionService.setPeriod(Duration.seconds(SERVER_PING_PERIOD_SECS));
         connectionService.setRestartOnFailure(true);
         EventManager.get().register(connectionService);
 
         connectionService.setOnRunning(workerStateEvent -> {
+            connectionService.setDelay(Duration.ZERO);
             if(!ElectrumServer.isConnected()) {
-                EventManager.get().post(new ConnectionStartEvent(Config.get().getServerAddress()));
+                EventManager.get().post(new ConnectionStartEvent(Config.get().getServerDisplayName()));
             }
         });
         connectionService.setOnSucceeded(successEvent -> {
@@ -264,32 +294,38 @@ 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 -> {
             //Close connection here to create a new transport next time we try
-            connectionService.resetConnection();
+            connectionService.closeConnection();
 
             if(failEvent.getSource().getException() instanceof ServerConfigException) {
                 connectionService.setRestartOnFailure(false);
             }
 
-            if(failEvent.getSource().getException() instanceof TlsServerException && failEvent.getSource().getException().getCause() != null) {
-                TlsServerException tlsServerException = (TlsServerException)failEvent.getSource().getException();
+            if(failEvent.getSource().getException() instanceof TlsServerException tlsServerException && failEvent.getSource().getException().getCause() != null) {
                 connectionService.setRestartOnFailure(false);
                 if(tlsServerException.getCause().getMessage().contains("PKIX path building failed")) {
                     File crtFile = Config.get().getElectrumServerCert();
                     if(crtFile != null && Config.get().getServerType() == ServerType.ELECTRUM_SERVER) {
                         AppServices.showErrorDialog("SSL Handshake Failed", "The configured server certificate at " + crtFile.getAbsolutePath() + " did not match the certificate provided by the server at " + tlsServerException.getServer().getHost() + "." +
-                                "\n\nThis may indicate a man-in-the-middle attack!" +
+                                "\n\nThis may be simply due to a certificate renewal, or it may indicate a man-in-the-middle attack." +
                                 "\n\nChange the configured server certificate if you would like to proceed.");
                     } else {
                         crtFile = Storage.getCertificateFile(tlsServerException.getServer().getHost());
                         if(crtFile != null) {
                             Optional<ButtonType> optButton = AppServices.showErrorDialog("SSL Handshake Failed", "The certificate provided by the server at " + tlsServerException.getServer().getHost() + " appears to have changed." +
-                                    "\n\nThis may indicate a man-in-the-middle attack!" +
+                                    "\n\nThis may be simply due to a certificate renewal, or it may indicate a man-in-the-middle attack." +
                                     "\n\nDo you still want to proceed?", ButtonType.NO, ButtonType.YES);
                             if(optButton.isPresent() && optButton.get() == ButtonType.YES) {
                                 if(crtFile.delete()) {
@@ -301,10 +337,19 @@ public class AppServices {
                             }
                         }
                     }
+                } else if(tlsServerException.getCause().getCause() instanceof UnknownCertificateExpiredException expiredException) {
+                    Optional<ButtonType> optButton = AppServices.showErrorDialog("SSL Handshake Failed", "The certificate provided by the server at " + tlsServerException.getServer().getHost() + " has expired. "
+                            + tlsServerException.getMessage() + "." +
+                            "\n\nDo you still want to proceed?", ButtonType.NO, ButtonType.YES);
+                    if(optButton.isPresent() && optButton.get() == ButtonType.YES) {
+                        Storage.saveCertificate(tlsServerException.getServer().getHost(), expiredException.getCertificate());
+                        Platform.runLater(() -> restartService(connectionService));
+                        return;
+                    }
                 }
             }
 
-            if(failEvent.getSource().getException() instanceof ProxyServerException && Config.get().isUseProxy() && Config.get().requiresTor()) {
+            if(failEvent.getSource().getException() instanceof ProxyServerException && Config.get().isUseProxy() && Config.get().isAutoSwitchProxy() && Config.get().requiresTor()) {
                 Config.get().setUseProxy(false);
                 Platform.runLater(() -> restartService(torService));
                 return;
@@ -317,6 +362,8 @@ public class AppServices {
             if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER) {
                 Config.get().changePublicServer();
                 connectionService.setPeriod(Duration.seconds(PUBLIC_SERVER_RETRY_PERIOD_SECS));
+            } else {
+                connectionService.setPeriod(Duration.seconds(PRIVATE_SERVER_RETRY_PERIOD_SECS));
             }
 
             log.debug("Connection failed", failEvent.getSource().getException());
@@ -326,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);
 
@@ -358,7 +416,7 @@ public class AppServices {
 
     private Hwi.ScheduledEnumerateService createDeviceEnumerateService() {
         Hwi.ScheduledEnumerateService enumerateService = new Hwi.ScheduledEnumerateService(null);
-        enumerateService.setPeriod(Duration.seconds(ENUMERATE_HW_PERIOD_SECS));
+        enumerateService.setPeriod(Duration.seconds(Config.get().getEnumerateHwPeriod()));
         enumerateService.setOnSucceeded(workerStateEvent -> {
             List<Device> devices = enumerateService.getValue();
 
@@ -390,23 +448,6 @@ public class AppServices {
             EventManager.get().post(new TorReadyStatusEvent());
         });
         torService.setOnFailed(workerStateEvent -> {
-            Throwable exception = workerStateEvent.getSource().getException();
-            if(exception instanceof TorServerAlreadyBoundException) {
-                String proxyServer = Config.get().getProxyServer();
-                if(proxyServer == null || proxyServer.equals("")) {
-                    proxyServer = "localhost:9050";
-                    Config.get().setProxyServer(proxyServer);
-                }
-
-                if(proxyServer.equals("localhost:9050") || proxyServer.equals("127.0.0.1:9050")) {
-                    Config.get().setUseProxy(true);
-                    torService.cancel();
-                    restartServices();
-                    EventManager.get().post(new TorExternalStatusEvent());
-                    return;
-                }
-            }
-
             EventManager.get().post(new TorFailedStatusEvent(workerStateEvent.getSource().getException()));
         });
 
@@ -466,8 +507,7 @@ public class AppServices {
             InetSocketAddress proxyAddress = new InetSocketAddress(proxyHostAndPort.getHost(), proxyHostAndPort.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
             proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
         } else if(AppServices.isTorRunning()) {
-            InetSocketAddress proxyAddress = new InetSocketAddress("localhost", TorService.PROXY_PORT);
-            proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
+            proxy = Tor.getDefault().getProxy();
         }
 
         //Setting new proxy authentication credentials will force a new Tor circuit to be created
@@ -482,8 +522,12 @@ public class AppServices {
         return proxy;
     }
 
-    static void initialize(MainApp application) {
-        INSTANCE = new AppServices(application);
+    public static void initialize(Application application) {
+        INSTANCE = new AppServices(application, new DefaultInteractionServices());
+    }
+
+    public static void initialize(Application application, InteractionServices interactionServices) {
+        INSTANCE = new AppServices(application, interactionServices);
     }
 
     public static AppServices get() {
@@ -498,23 +542,26 @@ public class AppServices {
         return get().sorobanServices;
     }
 
-    public static PayNymService getPayNymService() {
-        if(payNymService == null) {
-            HostAndPort torProxy = getTorProxy();
-            payNymService = new PayNymService(torProxy);
+    public static InteractionServices getInteractionServices() {
+        return get().interactionServices;
+    }
+
+    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() {
         return AppServices.isTorRunning() ?
-                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
+                Tor.getDefault().getProxyHostAndPort() :
                 (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
     }
 
@@ -544,17 +591,26 @@ public class AppServices {
 
     private static Image getWindowIcon() {
         if(windowIcon == null) {
-            windowIcon = new Image(MainApp.class.getResourceAsStream("/image/sparrow-icon.png"));
+            windowIcon = new Image(SparrowWallet.class.getResourceAsStream("/image/sparrow-icon.png"));
         }
 
         return windowIcon;
     }
 
-    public static boolean isReducedWindowHeight(Node node) {
-        return (node.getScene() != null && node.getScene().getWindow().getHeight() < 768);
+    public static boolean isReducedWindowHeight() {
+        Window activeWindow = getActiveWindow();
+        return (activeWindow != null && activeWindow.getHeight() < getReducedWindowHeight());
     }
 
-    public MainApp getApplication() {
+    public static boolean isReducedWindowHeight(Node node) {
+        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() {
         return application;
     }
 
@@ -638,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;
     }
@@ -656,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);
@@ -665,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() {
@@ -690,6 +760,10 @@ public class AppServices {
         payjoinURIs.put(bitcoinURI.getAddress(), bitcoinURI);
     }
 
+    public static void clearPayjoinURI(Address address) {
+        payjoinURIs.remove(address);
+    }
+
     public static void clearTransactionHistoryCache(Wallet wallet) {
         ElectrumServer.clearRetrievedScriptHashes(wallet);
 
@@ -712,45 +786,20 @@ public class AppServices {
         return showAlertDialog(title, content == null ? "See log file (Help menu)" : content, Alert.AlertType.ERROR, buttons);
     }
 
+    public static Optional<ButtonType> showSuccessDialog(String title, String content, ButtonType... buttons) {
+        Glyph successGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
+        successGlyph.getStyleClass().add("success");
+        successGlyph.setFontSize(50);
+
+        return showAlertDialog(title, content, Alert.AlertType.INFORMATION, successGlyph, buttons);
+    }
+
     public static Optional<ButtonType> showAlertDialog(String title, String content, Alert.AlertType alertType, ButtonType... buttons) {
         return showAlertDialog(title, content, alertType, null, buttons);
     }
 
     public static Optional<ButtonType> showAlertDialog(String title, String content, Alert.AlertType alertType, Node graphic, ButtonType... buttons) {
-        Alert alert = new Alert(alertType, content, buttons);
-        setStageIcon(alert.getDialogPane().getScene().getWindow());
-        alert.getDialogPane().getScene().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
-        alert.setTitle(title);
-        alert.setHeaderText(title);
-        if(graphic != null) {
-            alert.setGraphic(graphic);
-        }
-
-        Pattern linkPattern = Pattern.compile("\\[(http.+)]");
-        Matcher matcher = linkPattern.matcher(content);
-        if(matcher.find()) {
-            String link = matcher.group(1);
-            HyperlinkLabel hyperlinkLabel = new HyperlinkLabel(content);
-            hyperlinkLabel.setMaxWidth(Double.MAX_VALUE);
-            hyperlinkLabel.setMaxHeight(Double.MAX_VALUE);
-            hyperlinkLabel.getStyleClass().add("content");
-            Label label = new Label();
-            hyperlinkLabel.setPrefWidth(Math.max(360, TextUtils.computeTextWidth(label.getFont(), link, 0.0D) + 50));
-            hyperlinkLabel.setOnAction(event -> {
-                alert.close();
-                get().getApplication().getHostServices().showDocument(link);
-            });
-            alert.getDialogPane().setContent(hyperlinkLabel);
-        }
-
-        String[] lines = content.split("\r\n|\r|\n");
-        if(lines.length > 3 || org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
-            double numLines = Arrays.stream(lines).mapToDouble(line -> Math.ceil(TextUtils.computeTextWidth(Font.getDefault(), line, 0) / 300)).sum();
-            alert.getDialogPane().setPrefHeight(200 + numLines * 20);
-        }
-
-        moveToActiveWindowScreen(alert);
-        return alert.showAndWait();
+        return getInteractionServices().showAlert(title, content, alertType, graphic, buttons);
     }
 
     public static void setStageIcon(Window window) {
@@ -763,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) {
@@ -800,6 +849,24 @@ public class AppServices {
         }
     }
 
+    public static void openBlockExplorer(String txid) {
+        if(Config.get().isBlockExplorerDisabled()) {
+            return;
+        }
+
+        Server blockExplorer = Config.get().getBlockExplorer() == null ? BlockExplorer.MEMPOOL_SPACE.getServer() : Config.get().getBlockExplorer();
+        String url = blockExplorer.getUrl();
+        if(url.contains("{0}")) {
+            url = url.replace("{0}", txid);
+        } else {
+            if(Network.get() != Network.MAINNET) {
+                url += "/" + Network.get().getName();
+            }
+            url += "/tx/" + txid;
+        }
+        AppServices.get().getApplication().getHostServices().showDocument(url);
+    }
+
     static void parseFileUriArguments(List<String> fileUriArguments) {
         for(String fileUri : fileUriArguments) {
             try {
@@ -818,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();
@@ -844,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));
                 }
@@ -855,6 +943,10 @@ public class AppServices {
         Platform.runLater(() -> {
             if("bitcoin".equals(uri.getScheme())) {
                 openBitcoinUri(uri);
+            } else if(("auth47").equals(uri.getScheme())) {
+                openAuth47Uri(uri);
+            } else if(("lightning").equals(uri.getScheme())) {
+                openLnurlAuthUri(uri);
             }
         });
     }
@@ -877,11 +969,13 @@ public class AppServices {
     private static void openBitcoinUri(URI uri) {
         try {
             BitcoinURI bitcoinURI = new BitcoinURI(uri.toString());
-            Wallet wallet = selectWallet(null, "pay from");
+            List<PolicyType> policyTypes = Arrays.asList(PolicyType.values());
+            List<ScriptType> scriptTypes = Arrays.asList(ScriptType.ADDRESSABLE_TYPES);
+            Wallet wallet = selectWallet(policyTypes, scriptTypes, true, false, "pay from", false);
 
             if(wallet != null) {
                 final Wallet sendingWallet = wallet;
-                EventManager.get().post(new SendActionEvent(sendingWallet, new ArrayList<>(sendingWallet.getWalletUtxos().keySet())));
+                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) {
@@ -889,15 +983,102 @@ public class AppServices {
         }
     }
 
-    private static Wallet selectWallet(ScriptType scriptType, String actionDescription) {
+    private static void openAuth47Uri(URI uri) {
+        try {
+            Auth47 auth47 = new Auth47(uri);
+            List<ScriptType> scriptTypes = PaymentCode.SEGWIT_SCRIPT_TYPES;
+            Wallet wallet = selectWallet(List.of(PolicyType.SINGLE), scriptTypes, false, true, "login to " + auth47.getCallback().getHost(), true);
+
+            if(wallet != null) {
+                try {
+                    auth47.sendResponse(wallet);
+                    EventManager.get().post(new StatusEvent("Successfully authenticated to " + auth47.getCallback().getHost()));
+                } catch(Exception e) {
+                    log.error("Error authenticating auth47 URI", e);
+                    showErrorDialog("Error authenticating", "Failed to authenticate.\n\n" + e.getMessage());
+                }
+            }
+        } catch(Exception e) {
+            log.error("Not a valid auth47 URI", e);
+            showErrorDialog("Not a valid auth47 URI", e.getMessage());
+        }
+    }
+
+    private static void openLnurlAuthUri(URI uri) {
+        try {
+            LnurlAuth lnurlAuth = new LnurlAuth(uri);
+            List<ScriptType> scriptTypes = ScriptType.getAddressableScriptTypes(PolicyType.SINGLE);
+            Wallet wallet = selectWallet(List.of(PolicyType.SINGLE), scriptTypes, true, true, lnurlAuth.getLoginMessage(), true);
+
+            if(wallet != null) {
+                if(wallet.isEncrypted()) {
+                    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);
+                        keyDerivationService.setOnSucceeded(workerStateEvent -> {
+                            EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Done"));
+                            ECKey encryptionFullKey = keyDerivationService.getValue();
+                            Key key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
+                            copy.decrypt(key);
+                            try {
+                                lnurlAuth.sendResponse(copy);
+                                EventManager.get().post(new StatusEvent("Successfully authenticated to " + lnurlAuth.getDomain()));
+                            } catch(Exception e) {
+                                showErrorDialog("Error authenticating", "Failed to authenticate.\n\n" + e.getMessage());
+                            } finally {
+                                key.clear();
+                                encryptionFullKey.clear();
+                                password.get().clear();
+                            }
+                        });
+                        keyDerivationService.setOnFailed(workerStateEvent -> {
+                            EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Failed"));
+                            if(keyDerivationService.getException() instanceof InvalidPasswordException) {
+                                Optional<ButtonType> optResponse = showErrorDialog("Invalid Password", "The wallet password was invalid. Try again?", ButtonType.CANCEL, ButtonType.OK);
+                                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
+                                    Platform.runLater(() -> openLnurlAuthUri(uri));
+                                }
+                            } else {
+                                log.error("Error deriving wallet key", keyDerivationService.getException());
+                            }
+                        });
+                        EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.START, "Decrypting wallet..."));
+                        keyDerivationService.start();
+                    }
+                } else {
+                    try {
+                        lnurlAuth.sendResponse(wallet);
+                        EventManager.get().post(new StatusEvent("Successfully authenticated to " + lnurlAuth.getDomain()));
+                    } catch(LnurlAuth.LnurlAuthException e) {
+                        showErrorDialog("Error authenticating", "Failed to authenticate.\n\n" + e.getMessage());
+                    } catch(Exception e) {
+                        log.error("Failed to authenticate using LNURL-auth", e);
+                        showErrorDialog("Error authenticating", "Failed to authenticate.\n\n" + e.getMessage());
+                    }
+                }
+            }
+        } catch(Exception e) {
+            log.error("Not a valid LNURL-auth URI", e);
+            showErrorDialog("Not a valid LNURL-auth URI", e.getMessage());
+        }
+    }
+
+    private static Wallet selectWallet(List<PolicyType> policyTypes, List<ScriptType> scriptTypes, boolean taprootAllowed, boolean privateKeysRequired, String actionDescription, boolean alwaysAsk) {
         Wallet wallet = null;
-        List<Wallet> wallets = get().getOpenWallets().keySet().stream().filter(w -> scriptType == null || w.getScriptType() == scriptType).collect(Collectors.toList());
+        List<Wallet> wallets = get().getOpenWallets().keySet().stream().filter(w -> w.isValid() && policyTypes.contains(w.getPolicyType()) && scriptTypes.contains(w.getScriptType())
+                && (!privateKeysRequired || w.getKeystores().stream().allMatch(Keystore::hasPrivateKey))).collect(Collectors.toList());
         if(wallets.isEmpty()) {
-            showErrorDialog("No wallet available", "Open a" + (scriptType == null ? "" : " " + scriptType.getDescription()) + " wallet to " + actionDescription + ".");
-        } else if(wallets.size() == 1) {
+            boolean taprootOpen = get().getOpenWallets().keySet().stream().anyMatch(w -> w.getScriptType() == ScriptType.P2TR);
+            showErrorDialog("No wallet available", "Open a" + (taprootOpen && !taprootAllowed ? " non-Taproot" : "") + (privateKeysRequired ? " software" : "") + " wallet to " + actionDescription + ".");
+        } else if(wallets.size() == 1 && !alwaysAsk) {
             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");
@@ -921,9 +1102,7 @@ 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 = event.getMinimumRelayFeeRate();
+        minimumRelayFeeRate = Math.max(event.getMinimumRelayFeeRate(), Transaction.DEFAULT_MIN_RELAY_FEE);
         latestBlockHeader = event.getBlockHeader();
         Config.get().addRecentServer();
     }
@@ -945,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
@@ -1010,7 +1194,7 @@ public class AppServices {
             Wallet wallet = walletTabData.getWallet();
             Storage storage = walletTabData.getStorage();
 
-            if(!storage.getWalletFile().exists() || wallet.containsSource(KeystoreSource.HW_USB)) {
+            if(Interface.get() == Interface.DESKTOP && (!storage.getWalletFile().exists() || wallet.containsSource(KeystoreSource.HW_USB) || CardApi.isReaderAvailable())) {
                 usbWallet = true;
 
                 if(deviceEnumerateService == null) {
@@ -1037,12 +1221,20 @@ public class AppServices {
 
     @Subscribe
     public void requestConnect(RequestConnectEvent event) {
-        onlineProperty.set(true);
+        if(Config.get().hasServer()) {
+            onlineProperty.set(true);
+        }
     }
 
     @Subscribe
     public void requestDisconnect(RequestDisconnectEvent event) {
         onlineProperty.set(false);
+        //Ensure services don't try to reconnect later
+        Platform.runLater(() -> {
+            connectionService.cancel();
+            ratesService.cancel();
+            versionCheckService.cancel();
+        });
     }
 
     @Subscribe
@@ -1052,11 +1244,27 @@ public class AppServices {
 
     @Subscribe
     public void walletOpening(WalletOpeningEvent event) {
-        restartBwt(event.getWallet());
+        if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
+            Platform.runLater(() -> restartBwt(event.getWallet()));
+        }
+    }
+
+    @Subscribe
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
+        if(event.getChildWallets().stream().anyMatch(Wallet::isNested)) {
+            restartBwt(event.getWallet());
+        }
+    }
+
+    @Subscribe
+    public void walletHistoryChanged(WalletHistoryChangedEvent event) {
+        if(Config.get().getServerType() == ServerType.BITCOIN_CORE && event.getNestedHistoryChangedNodes().stream().anyMatch(node -> node.getTransactionOutputs().isEmpty())) {
+            Platform.runLater(() -> restartBwt(event.getWallet()));
+        }
     }
 
     private void restartBwt(Wallet wallet) {
-        if(Config.get().getServerType() == ServerType.BITCOIN_CORE && isConnected() && wallet.isValid()) {
+        if(Config.get().getServerType() == ServerType.BITCOIN_CORE && connectionService != null && connectionService.isConnectionRunning() && wallet.isValid()) {
             connectionService.cancel();
         }
     }
@@ -1073,7 +1281,7 @@ public class AppServices {
     public void walletHistoryFailed(WalletHistoryFailedEvent event) {
         if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER && isConnected()) {
             onlineProperty.set(false);
-            log.warn("Failed to fetch wallet history from " + Config.get().getServerAddress() + ", reconnecting to another server...");
+            log.warn("Failed to fetch wallet history from " + Config.get().getServerDisplayName() + ", reconnecting to another server...");
             Config.get().changePublicServer();
             onlineProperty.set(true);
         }

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

@@ -17,6 +17,12 @@ public class Args {
     @Parameter(names = { "--level", "-l" }, description = "Set log level")
     public Level level;
 
+    @Parameter(names = { "--terminal", "-t" }, description = "Terminal mode", arity = 0)
+    public boolean terminal;
+
+    @Parameter(names = { "--version", "-v" }, description = "Show version", arity = 0)
+    public boolean version;
+
     @Parameter(names = { "--help", "-h" }, description = "Show usage", help = true)
     public boolean help;
 

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

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

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

@@ -0,0 +1,68 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.sparrow.control.KeystorePassphraseDialog;
+import com.sparrowwallet.sparrow.control.TextUtils;
+import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.text.Font;
+import org.controlsfx.control.HyperlinkLabel;
+
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+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);
+        alert.setHeaderText(title);
+        if(graphic != null) {
+            alert.setGraphic(graphic);
+        }
+
+        Pattern linkPattern = Pattern.compile("\\[(http.+)]");
+        Matcher matcher = linkPattern.matcher(content);
+        if(matcher.find()) {
+            String link = matcher.group(1);
+            HyperlinkLabel hyperlinkLabel = new HyperlinkLabel(content);
+            hyperlinkLabel.setMaxWidth(Double.MAX_VALUE);
+            hyperlinkLabel.setMaxHeight(Double.MAX_VALUE);
+            hyperlinkLabel.getStyleClass().add("content");
+            Label label = new Label();
+            hyperlinkLabel.setPrefWidth(Math.max(360, TextUtils.computeTextWidth(label.getFont(), link, 0.0D) + 50));
+            hyperlinkLabel.setOnAction(event -> {
+                alert.close();
+                AppServices.get().getApplication().getHostServices().showDocument(link);
+            });
+            alert.getDialogPane().setContent(hyperlinkLabel);
+        }
+
+        String[] lines = content.split("\r\n|\r|\n");
+        if(lines.length > 3 || org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+            double numLines = Arrays.stream(lines).mapToDouble(line -> Math.ceil(TextUtils.computeTextWidth(Font.getDefault(), line, 0) / 300)).sum();
+            alert.getDialogPane().setPrefHeight(200 + numLines * 20);
+        }
+
+        alert.setResizable(true);
+
+        moveToActiveWindowScreen(alert);
+        return alert.showAndWait();
+    }
+
+    @Override
+    public Optional<String> requestPassphrase(String walletName, Keystore keystore) {
+        KeystorePassphraseDialog passphraseDialog = new KeystorePassphraseDialog(walletName, keystore);
+        passphraseDialog.initOwner(getActiveWindow());
+        return passphraseDialog.showAndWait();
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import javafx.scene.Node;
+import javafx.scene.control.Alert;
+import javafx.scene.control.ButtonType;
+
+import java.util.Optional;
+
+public interface InteractionServices {
+    Optional<ButtonType> showAlert(String title, String content, Alert.AlertType alertType, Node graphic, ButtonType... buttons);
+    Optional<String> requestPassphrase(String walletName, Keystore keystore);
+}

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

@@ -0,0 +1,34 @@
+package com.sparrowwallet.sparrow;
+
+public enum Interface {
+    DESKTOP, TERMINAL, SERVER;
+
+    private static Interface currentInterface;
+
+    public static Interface get() {
+        if(currentInterface == null) {
+            boolean headless = java.awt.GraphicsEnvironment.isHeadless();
+            boolean monocle = "Monocle".equalsIgnoreCase(System.getProperty("glass.platform"));
+
+            if(headless || monocle) {
+                currentInterface = TERMINAL;
+
+                if(headless && !monocle) {
+                    throw new UnsupportedOperationException("Headless environment detected but Monocle platform not found");
+                }
+            } else {
+                currentInterface = DESKTOP;
+            }
+        }
+
+        return currentInterface;
+    }
+
+    public static void set(Interface interf) {
+        if(currentInterface != null && interf != currentInterface) {
+            throw new IllegalStateException("Interface already set to " + currentInterface);
+        }
+
+        currentInterface = interf;
+    }
+}

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

@@ -1,9 +1,8 @@
 package com.sparrowwallet.sparrow;
 
-import com.beust.jcommander.JCommander;
-import com.sparrowwallet.drongo.Drongo;
 import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.control.WalletIcon;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
@@ -12,40 +11,28 @@ import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
-import com.sparrowwallet.sparrow.instance.InstanceException;
-import com.sparrowwallet.sparrow.instance.InstanceList;
 import javafx.application.Application;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import org.controlsfx.glyphfont.GlyphFontRegistry;
 import org.controlsfx.tools.Platform;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import java.io.File;
+import java.net.URL;
 import java.util.*;
 import java.util.stream.Collectors;
 
-public class MainApp extends Application {
-    public static final String APP_ID = "com.sparrowwallet.sparrow";
-    public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.6.3";
-    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";
-
+public class SparrowDesktop extends Application {
     private Stage mainStage;
 
-    private static SparrowInstance sparrowInstance;
-
     @Override
     public void init() throws Exception {
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
             if(e instanceof IndexOutOfBoundsException && Arrays.stream(e.getStackTrace()).anyMatch(element -> element.getClassName().equals("javafx.scene.chart.BarChart"))) {
-                LoggerFactory.getLogger(MainApp.class).debug("Exception in thread \"" + t.getName() + "\"", e);;
+                LoggerFactory.getLogger(SparrowWallet.class).debug("Exception in thread \"" + t.getName() + "\"", e);;
             } else {
-                LoggerFactory.getLogger(MainApp.class).error("Exception in thread \"" + t.getName() + "\"", e);
+                LoggerFactory.getLogger(SparrowWallet.class).error("Exception in thread \"" + t.getName() + "\"", e);
             }
         });
         super.init();
@@ -58,6 +45,8 @@ public class MainApp 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);
 
@@ -77,7 +66,7 @@ public class MainApp extends Application {
                 } else if(Network.get() == Network.MAINNET) {
                     Config.get().setServerType(ServerType.PUBLIC_ELECTRUM_SERVER);
                     List<PublicElectrumServer> servers = PublicElectrumServer.getServers();
-                    Config.get().setPublicElectrumServer(servers.get(new Random().nextInt(servers.size())).getUrl());
+                    Config.get().setPublicElectrumServer(servers.get(new Random().nextInt(servers.size())).getServer());
                 }
             }
         }
@@ -91,6 +80,7 @@ public class MainApp 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());
@@ -118,7 +108,7 @@ public class MainApp extends Application {
             }
         }
 
-        AppServices.openFileUriArguments(stage);
+        AppServices.openFileUriArgumentsAfterWalletLoading(stage);
 
         AppServices.get().start();
     }
@@ -129,102 +119,9 @@ public class MainApp extends Application {
         Config.get().setAppWidth(mainStage.getWidth());
         Config.get().setAppHeight(mainStage.getHeight());
         mainStage.close();
-        if(sparrowInstance != null) {
-            sparrowInstance.freeLock();
-        }
-    }
-
-    public static void main(String[] argv) {
-        Args args = new Args();
-        JCommander jCommander = JCommander.newBuilder().addObject(args).programName(APP_NAME.toLowerCase()).acceptUnknownOptions(true).build();
-        jCommander.parse(argv);
-        if(args.help) {
-            jCommander.usage();
-            System.exit(0);
-        }
-
-        if(args.level != null) {
-            Drongo.setRootLogLevel(args.level);
-        }
-
-        if(args.dir != null) {
-            System.setProperty(APP_HOME_PROPERTY, args.dir);
-            getLogger().info("Using configured Sparrow home folder of " + args.dir);
-        }
-
-        if(args.network != null) {
-            Network.set(args.network);
-        } else {
-            String envNetwork = System.getenv(NETWORK_ENV_PROPERTY);
-            if(envNetwork != null) {
-                try {
-                    Network.set(Network.valueOf(envNetwork.toUpperCase()));
-                } catch(Exception e) {
-                    getLogger().warn("Invalid " + NETWORK_ENV_PROPERTY + " property: " + envNetwork);
-                }
-            }
-        }
-
-        File testnetFlag = new File(Storage.getSparrowHome(), "network-" + Network.TESTNET.getName());
-        if(testnetFlag.exists()) {
-            Network.set(Network.TESTNET);
-        }
-
-        File signetFlag = new File(Storage.getSparrowHome(), "network-" + Network.SIGNET.getName());
-        if(signetFlag.exists()) {
-            Network.set(Network.SIGNET);
-        }
-
-        if(Network.get() != Network.MAINNET) {
-            getLogger().info("Using " + Network.get() + " configuration");
-        }
-
-        List<String> fileUriArguments = jCommander.getUnknownOptions();
-
-        try {
-            sparrowInstance = new SparrowInstance(fileUriArguments);
-            sparrowInstance.acquireLock(); //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);
-        }
-
-        if(!fileUriArguments.isEmpty()) {
-            AppServices.parseFileUriArguments(fileUriArguments);
-        }
-
-        SLF4JBridgeHandler.removeHandlersForRootLogger();
-        SLF4JBridgeHandler.install();
-        com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, argv);
-    }
-
-    private static Logger getLogger() {
-        return LoggerFactory.getLogger(MainApp.class);
-    }
-
-    private static class SparrowInstance extends InstanceList {
-        private final List<String> fileUriArguments;
-
-        public SparrowInstance(List<String> fileUriArguments) {
-            super(MainApp.APP_ID + "." + Network.get(), !fileUriArguments.isEmpty());
-            this.fileUriArguments = fileUriArguments;
-        }
-
-        @Override
-        protected void receiveMessageList(List<String> messageList) {
-            if(messageList != null && !messageList.isEmpty()) {
-                AppServices.parseFileUriArguments(messageList);
-                AppServices.openFileUriArguments(null);
-            }
-        }
-
-        @Override
-        protected List<String> sendMessageList() {
-            return fileUriArguments;
-        }
-
-        @Override
-        protected void beforeExit() {
-            getLogger().info("Opening files/URIs in already running instance, exiting...");
+        SparrowWallet.Instance instance = SparrowWallet.getSparrowInstance();
+        if(instance != null) {
+            instance.freeLock();
         }
     }
 }

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

@@ -0,0 +1,155 @@
+package com.sparrowwallet.sparrow;
+
+import com.beust.jcommander.JCommander;
+import com.sparrowwallet.drongo.Drongo;
+import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.instance.InstanceException;
+import com.sparrowwallet.sparrow.instance.InstanceList;
+import com.sparrowwallet.sparrow.terminal.SparrowTerminal;
+import com.sun.javafx.application.PlatformImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
+
+import java.io.File;
+import java.util.*;
+
+public class SparrowWallet {
+    public static final String APP_ID = "sparrow";
+    public static final String APP_NAME = "Sparrow";
+    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";
+
+    private static Instance instance;
+
+    public static void main(String[] argv) {
+        Args args = new Args();
+        JCommander jCommander = JCommander.newBuilder().addObject(args).programName(APP_NAME.toLowerCase(Locale.ROOT)).acceptUnknownOptions(true).build();
+        jCommander.parse(argv);
+        if(args.help) {
+            jCommander.usage();
+            System.exit(0);
+        }
+
+        if(args.version) {
+            System.out.println("Sparrow Wallet " + APP_VERSION);
+            System.exit(0);
+        }
+
+        if(args.level != null) {
+            Drongo.setRootLogLevel(args.level);
+        }
+
+        if(args.dir != null) {
+            System.setProperty(APP_HOME_PROPERTY, args.dir);
+            getLogger().info("Using configured Sparrow home folder of " + args.dir);
+        }
+
+        if(args.network != null) {
+            Network.set(args.network);
+        } else {
+            String envNetwork = System.getenv(NETWORK_ENV_PROPERTY);
+            if(envNetwork != null) {
+                try {
+                    Network.set(Network.valueOf(envNetwork.toUpperCase(Locale.ROOT)));
+                } catch(Exception e) {
+                    getLogger().warn("Invalid " + NETWORK_ENV_PROPERTY + " property: " + envNetwork);
+                }
+            }
+        }
+
+        File testnetFlag = new File(Storage.getSparrowHome(), "network-" + Network.TESTNET.getName());
+        if(testnetFlag.exists()) {
+            Network.set(Network.TESTNET);
+        }
+
+        File signetFlag = new File(Storage.getSparrowHome(), "network-" + Network.SIGNET.getName());
+        if(signetFlag.exists()) {
+            Network.set(Network.SIGNET);
+        }
+
+        if(Network.get() != Network.MAINNET) {
+            getLogger().info("Using " + Network.get() + " configuration");
+        }
+
+        List<String> fileUriArguments = jCommander.getUnknownOptions();
+
+        try {
+            instance = new Instance(fileUriArguments);
+            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);
+        }
+
+        if(!fileUriArguments.isEmpty()) {
+            AppServices.parseFileUriArguments(fileUriArguments);
+        }
+
+        SLF4JBridgeHandler.removeHandlersForRootLogger();
+        SLF4JBridgeHandler.install();
+
+        if(args.terminal) {
+            Interface.set(Interface.TERMINAL);
+        }
+
+        try {
+            if(Interface.get() == Interface.TERMINAL) {
+                PlatformImpl.setTaskbarApplication(false);
+                Drongo.removeRootLogAppender("STDOUT");
+                com.sun.javafx.application.LauncherImpl.launchApplication(SparrowTerminal.class, SparrowWalletPreloader.class, argv);
+            } else {
+                com.sun.javafx.application.LauncherImpl.launchApplication(SparrowDesktop.class, SparrowWalletPreloader.class, argv);
+            }
+        } catch(UnsupportedOperationException e) {
+            Drongo.removeRootLogAppender("STDOUT");
+            getLogger().error("Unable to launch application", e);
+            System.out.println("No display detected. Use Sparrow Server on a headless (no display) system.");
+
+            try {
+                if(instance != null) {
+                    instance.freeLock();
+                }
+            } catch(InstanceException instanceException) {
+                getLogger().error("Unable to free instance lock", e);
+            }
+        }
+    }
+
+    public static Instance getSparrowInstance() {
+        return instance;
+    }
+
+    private static Logger getLogger() {
+        return LoggerFactory.getLogger(SparrowWallet.class);
+    }
+
+    public static class Instance extends InstanceList {
+        private final List<String> fileUriArguments;
+
+        public Instance(List<String> fileUriArguments) {
+            super(SparrowWallet.APP_ID, true);
+            this.fileUriArguments = fileUriArguments;
+        }
+
+        @Override
+        protected void receiveMessageList(List<String> messageList) {
+            if(messageList != null) {
+                AppServices.parseFileUriArguments(messageList);
+                AppServices.openFileUriArguments(null);
+            }
+        }
+
+        @Override
+        protected List<String> sendMessageList() {
+            return fileUriArguments;
+        }
+
+        @Override
+        protected void beforeExit() {
+            getLogger().info("Opening files/URIs in already running instance, exiting...");
+        }
+    }
+}

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

@@ -3,7 +3,7 @@ package com.sparrowwallet.sparrow;
 import javafx.application.Preloader;
 import javafx.stage.Stage;
 
-public class MainAppPreloader extends Preloader {
+public class SparrowWalletPreloader extends Preloader {
     @Override
     public void start(Stage stage) {
         com.sun.glass.ui.Application.GetApplication().setName("Sparrow");

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

@@ -1,17 +0,0 @@
-package com.sparrowwallet.sparrow;
-
-import com.sparrowwallet.drongo.LogHandler;
-import com.sparrowwallet.sparrow.event.TorStatusEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.slf4j.event.Level;
-
-public class TorLogHandler implements LogHandler {
-    private static final Logger log = LoggerFactory.getLogger(TorLogHandler.class);
-
-    @Override
-    public void handleLog(String threadName, Level level, String message, String loggerName, long timestamp, StackTraceElement[] callerData) {
-        log.debug(message);
-        EventManager.get().post(new TorStatusEvent(message));
-    }
-}

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

@@ -0,0 +1,120 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+public enum UnitFormat {
+    DOT {
+        private final DecimalFormat btcFormat = new DecimalFormat("0", getDecimalFormatSymbols());
+        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);
+            return btcFormat;
+        }
+
+        public DecimalFormat getSatsFormat() {
+            return satsFormat;
+        }
+
+        public DecimalFormat getTableBtcFormat() {
+            return tableBtcFormat;
+        }
+
+        public DecimalFormat getCurrencyFormat() {
+            return currencyFormat;
+        }
+
+        public DecimalFormat getTableCurrencyFormat() {
+            return tableCurrencyFormat;
+        }
+
+        public DecimalFormatSymbols getDecimalFormatSymbols() {
+            DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+            symbols.setDecimalSeparator('.');
+            symbols.setGroupingSeparator(',');
+            return symbols;
+        }
+    },
+    COMMA {
+        private final DecimalFormat btcFormat = new DecimalFormat("0", getDecimalFormatSymbols());
+        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);
+            return btcFormat;
+        }
+
+        public DecimalFormat getSatsFormat() {
+            return satsFormat;
+        }
+
+        public DecimalFormat getTableBtcFormat() {
+            return tableBtcFormat;
+        }
+
+        public DecimalFormat getCurrencyFormat() {
+            return currencyFormat;
+        }
+
+        public DecimalFormat getTableCurrencyFormat() {
+            return tableCurrencyFormat;
+        }
+
+        public DecimalFormatSymbols getDecimalFormatSymbols() {
+            DecimalFormatSymbols symbols = new DecimalFormatSymbols();
+            symbols.setDecimalSeparator(',');
+            symbols.setGroupingSeparator('.');
+            return symbols;
+        }
+    };
+
+    public abstract DecimalFormatSymbols getDecimalFormatSymbols();
+
+    public abstract DecimalFormat getBtcFormat();
+
+    public abstract DecimalFormat getSatsFormat();
+
+    public abstract DecimalFormat getTableBtcFormat();
+
+    public abstract DecimalFormat getCurrencyFormat();
+
+    public abstract DecimalFormat getTableCurrencyFormat();
+
+    public String formatBtcValue(Long amount) {
+        return getBtcFormat().format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);
+    }
+
+    public String tableFormatBtcValue(Long amount) {
+        return getTableBtcFormat().format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);
+    }
+
+    public String formatSatsValue(Long amount) {
+        return getSatsFormat().format(amount);
+    }
+
+    public String formatCurrencyValue(double amount) {
+        return getCurrencyFormat().format(amount);
+    }
+
+    public String tableFormatCurrencyValue(double amount) {
+        return getTableCurrencyFormat().format(amount);
+    }
+
+    public String getGroupingSeparator() {
+        return Character.toString(getDecimalFormatSymbols().getGroupingSeparator());
+    }
+
+    public String getDecimalSeparator() {
+        return Character.toString(getDecimalFormatSymbols().getDecimalSeparator());
+    }
+}

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

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

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

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

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

@@ -1,17 +1,23 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.wallet.Status;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletUtxoStatusChangedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import javafx.geometry.Pos;
 import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
 import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 
+import java.util.Collections;
+
 public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
     public AddressCell() {
         super();
@@ -34,13 +40,15 @@ 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())));
+                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()));
+                tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate(), addressStatus.isDustAttack()));
                 setTooltip(tooltip);
 
-                if(addressStatus.isDuplicate()) {
+                if(addressStatus.isDustAttack()) {
+                    setGraphic(getDustAttackHyperlink(utxoEntry));
+                } else if(addressStatus.isDuplicate()) {
                     setGraphic(getDuplicateGlyph());
                 } else {
                     setGraphic(null);
@@ -49,9 +57,9 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
         }
     }
 
-    private String getTooltipText(UtxoEntry utxoEntry, boolean duplicate) {
+    private String getTooltipText(UtxoEntry utxoEntry, boolean duplicate, boolean dustAttack) {
         return (utxoEntry.getNode().getWallet().isNested() ? utxoEntry.getNode().getWallet().getDisplayName() + " " : "" ) +
-                utxoEntry.getNode().toString() + (duplicate ? " (Duplicate address)" : "");
+                utxoEntry.getNode().toString() + (duplicate ? " (Duplicate address)" : (dustAttack ? " (Possible dust attack)" : ""));
     }
 
     public static Glyph getDuplicateGlyph() {
@@ -60,4 +68,22 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
         duplicateGlyph.setFontSize(12);
         return duplicateGlyph;
     }
+
+    public static Hyperlink getDustAttackHyperlink(UtxoEntry utxoEntry) {
+        Glyph dustAttackGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        dustAttackGlyph.getStyleClass().add("dust-attack-warning");
+        dustAttackGlyph.setFontSize(12);
+
+        Hyperlink hyperlink = new Hyperlink(utxoEntry.getHashIndex().getStatus() == Status.FROZEN ? "" : "Freeze?", dustAttackGlyph);
+        hyperlink.getStyleClass().add("freeze-dust-utxo");
+        hyperlink.setOnAction(event -> {
+            if(utxoEntry.getHashIndex().getStatus() != Status.FROZEN) {
+                hyperlink.setText("");
+                utxoEntry.getHashIndex().setStatus(Status.FROZEN);
+                EventManager.get().post(new WalletUtxoStatusChangedEvent(utxoEntry.getWallet(), Collections.singletonList(utxoEntry.getHashIndex())));
+            }
+        });
+
+        return hyperlink;
+    }
 }

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

@@ -5,6 +5,8 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.ReceiveActionEvent;
 import com.sparrowwallet.sparrow.event.ReceiveToEvent;
+import com.sparrowwallet.sparrow.event.ShowTransactionsCountEvent;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;
 import javafx.application.Platform;
@@ -13,14 +15,12 @@ import javafx.collections.ListChangeListener;
 import javafx.scene.control.*;
 import javafx.scene.input.MouseButton;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.OptionalInt;
+import java.util.*;
 
 public class AddressTreeTable extends CoinTreeTable {
     public void initialize(NodeEntry rootEntry) {
         getStyleClass().add("address-treetable");
-        setBitcoinUnit(rootEntry.getWallet());
+        setUnitFormat(rootEntry.getWallet());
 
         String address = rootEntry.getAddress().toString();
         updateAll(rootEntry);
@@ -46,6 +46,15 @@ public class AddressTreeTable extends CoinTreeTable {
         labelCol.setSortable(false);
         getColumns().add(labelCol);
 
+        TreeTableColumn<Entry, Number> countCol = new TreeTableColumn<>("Transactions");
+        countCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
+            return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getChildren().size());
+        });
+        countCol.setCellFactory(p -> new NumberCell());
+        countCol.setSortable(false);
+        countCol.setVisible(Config.get().isShowAddressTransactionCount());
+        getColumns().add(countCol);
+
         TreeTableColumn<Entry, Number> amountCol = new TreeTableColumn<>("Value");
         amountCol.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, Number> param) -> {
             return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getValue());
@@ -54,6 +63,19 @@ public class AddressTreeTable extends CoinTreeTable {
         amountCol.setSortable(false);
         getColumns().add(amountCol);
 
+        ContextMenu contextMenu = new ContextMenu();
+        CheckMenuItem showCountItem = new CheckMenuItem("Show Transaction Count");
+        contextMenu.setOnShowing(event -> {
+            showCountItem.setSelected(Config.get().isShowAddressTransactionCount());
+        });
+        showCountItem.setOnAction(event -> {
+            boolean show = !Config.get().isShowAddressTransactionCount();
+            Config.get().setShowAddressTransactionCount(show);
+            EventManager.get().post(new ShowTransactionsCountEvent(show));
+        });
+        contextMenu.getItems().add(showCountItem);
+        getColumns().forEach(col -> col.setContextMenu(contextMenu));
+
         setEditable(true);
         setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
 
@@ -92,7 +114,7 @@ public class AddressTreeTable extends CoinTreeTable {
     }
 
     public void updateAll(NodeEntry rootEntry) {
-        setBitcoinUnit(rootEntry.getWallet());
+        setUnitFormat(rootEntry.getWallet());
 
         RecursiveTreeItem<Entry> rootItem = new RecursiveTreeItem<>(rootEntry, Entry::getChildren);
         setRoot(rootItem);
@@ -106,17 +128,38 @@ public class AddressTreeTable extends CoinTreeTable {
     }
 
     public void updateHistory(List<WalletNode> updatedNodes) {
-        //We only ever add child nodes - never remove in order to keep a full sequence
+        //We only ever add child nodes - never remove in order to keep a full sequence (unless hide empty used addresses is set)
         NodeEntry rootEntry = (NodeEntry)getRoot().getValue();
 
+        Map<WalletNode, NodeEntry> childNodes = new HashMap<>();
+        for(Entry childEntry : rootEntry.getChildren()) {
+            NodeEntry nodeEntry = (NodeEntry)childEntry;
+            childNodes.put(nodeEntry.getNode(), nodeEntry);
+        }
+
         for(WalletNode updatedNode : updatedNodes) {
-            Optional<Entry> optEntry = rootEntry.getChildren().stream().filter(childEntry -> ((NodeEntry)childEntry).getNode().equals(updatedNode)).findFirst();
-            if(optEntry.isPresent()) {
-                NodeEntry existingEntry = (NodeEntry)optEntry.get();
+            NodeEntry existingEntry = childNodes.get(updatedNode);
+            if(existingEntry != null) {
                 existingEntry.refreshChildren();
+
+                if(Config.get().isHideEmptyUsedAddresses() && existingEntry.getValue() == 0L) {
+                    rootEntry.getChildren().remove(existingEntry);
+                }
             } else {
                 NodeEntry nodeEntry = new NodeEntry(rootEntry.getWallet(), updatedNode);
-                rootEntry.getChildren().add(nodeEntry);
+
+                if(Config.get().isHideEmptyUsedAddresses()) {
+                    int index = 0;
+                    for( ; index < rootEntry.getChildren().size(); index++) {
+                        existingEntry = (NodeEntry)rootEntry.getChildren().get(index);
+                        if(nodeEntry.compareTo(existingEntry) < 0) {
+                             break;
+                        }
+                    }
+                    rootEntry.getChildren().add(index, nodeEntry);
+                } else {
+                    rootEntry.getChildren().add(nodeEntry);
+                }
             }
         }
 
@@ -127,4 +170,8 @@ public class AddressTreeTable extends CoinTreeTable {
         Entry rootEntry = getRoot().getValue();
         rootEntry.updateLabel(entry);
     }
+
+    public void showTransactionsCount(boolean show) {
+        getColumns().stream().filter(col -> col.getText().equals("Transactions")).forEach(col -> col.setVisible(show));
+    }
 }

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

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.control;
 import com.google.common.collect.Lists;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
@@ -35,8 +36,7 @@ public class BalanceChart extends LineChart<Number, Number> {
         getData().add(balanceSeries);
         update(walletTransactionsEntry);
 
-        BitcoinUnit unit = Config.get().getBitcoinUnit();
-        setBitcoinUnit(walletTransactionsEntry.getWallet(), unit);
+        setUnitFormat(walletTransactionsEntry.getWallet(), Config.get().getUnitFormat(), Config.get().getBitcoinUnit());
     }
 
     public void update(WalletTransactionsEntry walletTransactionsEntry) {
@@ -116,12 +116,16 @@ public class BalanceChart extends LineChart<Number, Number> {
         }
     }
 
-    public void setBitcoinUnit(Wallet wallet, BitcoinUnit unit) {
+    public void setUnitFormat(Wallet wallet, UnitFormat format, BitcoinUnit unit) {
+        if(format == null) {
+            format = UnitFormat.DOT;
+        }
+
         if(unit == null || unit.equals(BitcoinUnit.AUTO)) {
             unit = wallet.getAutoUnit();
         }
 
         NumberAxis yaxis = (NumberAxis)getYAxis();
-        yaxis.setTickLabelFormatter(new CoinAxisFormatter(yaxis, unit));
+        yaxis.setTickLabelFormatter(new CoinAxisFormatter(yaxis, format, unit));
     }
 }

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

@@ -0,0 +1,367 @@
+package com.sparrowwallet.sparrow.control;
+
+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.*;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.KeystoreCardImport;
+import com.sparrowwallet.sparrow.io.CardAuthorizationException;
+import javafx.application.Platform;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.HBox;
+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;
+
+public class CardImportPane extends TitledDescriptionPane {
+    private static final Logger log = LoggerFactory.getLogger(CardImportPane.class);
+
+    private final KeystoreCardImport importer;
+    private List<ChildNumber> derivation;
+    protected Button importButton;
+    private final SimpleStringProperty pin = new SimpleStringProperty("");
+
+    public CardImportPane(Wallet wallet, KeystoreCardImport importer, KeyDerivation requiredDerivation) {
+        super(importer.getName(), "Place card on reader", importer.getKeystoreImportDescription(getAccount(wallet, requiredDerivation)), "image/" + importer.getWalletModel().getType() + ".png");
+        this.importer = importer;
+        this.derivation = requiredDerivation == null ? wallet.getScriptType().getDefaultDerivation() : requiredDerivation.getDerivation();
+    }
+
+    @Override
+    protected Control createButton() {
+        importButton = new Button("Import");
+        Glyph tapGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WIFI);
+        tapGlyph.setFontSize(12);
+        importButton.setGraphic(tapGlyph);
+        importButton.setAlignment(Pos.CENTER_RIGHT);
+        importButton.setOnAction(event -> {
+            importButton.setDisable(true);
+            importCard();
+        });
+        return importButton;
+    }
+
+    private void importCard() {
+        if(!isReaderAvailable()) {
+            setError("No reader", "No card reader was detected.");
+            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));
+                showHideLink.setVisible(false);
+                setExpanded(true);
+                return;
+            }
+        } catch(CardException e) {
+            setError("Card Error", e.getMessage());
+            importButton.setDisable(false);
+            return;
+        }
+
+        CardImportService cardImportService = new CardImportService(importer, pin.get(), derivation, messageProperty);
+        cardImportService.setOnSucceeded(event -> {
+            EventManager.get().post(new KeystoreImportEvent(cardImportService.getValue()));
+        });
+        cardImportService.setOnFailed(event -> {
+            Throwable rootCause = Throwables.getRootCause(event.getSource().getException());
+            if(rootCause instanceof CardAuthorizationException) {
+                setError(rootCause.getMessage(), null);
+                setContent(getPinAndDerivationEntry());
+            } else {
+                log.error("Error importing keystore from card", event.getSource().getException());
+                setError("Import Error", rootCause.getMessage());
+            }
+            importButton.setDisable(false);
+        });
+        cardImportService.start();
+    }
+
+    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");
+        TextField entropy = new TextField();
+        entropy.setPromptText("Enter input for user entropy");
+        entropy.setDisable(true);
+
+        ToggleGroup toggleGroup = new ToggleGroup();
+        automatic.setToggleGroup(toggleGroup);
+        advanced.setToggleGroup(toggleGroup);
+        automatic.setSelected(true);
+        toggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
+            entropy.setDisable(newValue == automatic);
+        });
+
+        initTypeBox.getChildren().addAll(automatic, advanced, entropy);
+
+        Button initializeButton = new Button("Initialize");
+        initializeButton.setDefaultButton(true);
+        initializeButton.setOnAction(event -> {
+            initializeButton.setDisable(true);
+            byte[] chainCode = toggleGroup.getSelectedToggle() == automatic ? null : Sha256Hash.hashTwice(entropy.getText().getBytes(StandardCharsets.UTF_8));
+            CardInitializationService cardInitializationService = new CardInitializationService(importer, pin.get(), chainCode, 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 -> {
+                Throwable rootCause = Throwables.getRootCause(failEvent.getSource().getException());
+                if(rootCause instanceof CardAuthorizationException) {
+                    setError(rootCause.getMessage(), null);
+                    setContent(getPinEntry());
+                    importButton.setDisable(false);
+                } else {
+                    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();
+        });
+
+        HBox contentBox = new HBox(20);
+        contentBox.getChildren().addAll(initTypeBox, initializeButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        HBox.setHgrow(initTypeBox, Priority.ALWAYS);
+
+        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();
+
+        CustomPasswordField pinField = new ViewPasswordField();
+        pinField.setPromptText("PIN Code");
+        importButton.setDefaultButton(true);
+        pin.bind(pinField.textProperty());
+        HBox.setHgrow(pinField, Priority.ALWAYS);
+        Platform.runLater(pinField::requestFocus);
+
+        HBox contentBox = new HBox();
+        contentBox.setAlignment(Pos.TOP_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().add(pinField);
+        contentBox.setPadding(new Insets(10, 30, 0, 30));
+        contentBox.setPrefHeight(50);
+
+        vBox.getChildren().add(contentBox);
+
+        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;
+        private final byte[] chainCode;
+        private final StringProperty messageProperty;
+
+        public CardInitializationService(KeystoreCardImport cardImport, String pin, byte[] chainCode, StringProperty messageProperty) {
+            this.cardImport = cardImport;
+            this.pin = pin;
+            this.chainCode = chainCode;
+            this.messageProperty = messageProperty;
+        }
+
+        @Override
+        protected Task<Void> createTask() {
+            return new Task<>() {
+                @Override
+                protected Void call() throws Exception {
+                    cardImport.initialize(pin, chainCode, messageProperty);
+                    return null;
+                }
+            };
+        }
+    }
+
+    public static class CardImportService extends Service<Keystore> {
+        private final KeystoreCardImport cardImport;
+        private final String pin;
+        private final List<ChildNumber> derivation;
+        private final StringProperty messageProperty;
+
+        public CardImportService(KeystoreCardImport cardImport, String pin, List<ChildNumber> derivation, StringProperty messageProperty) {
+            this.cardImport = cardImport;
+            this.pin = pin;
+            this.derivation = derivation;
+            this.messageProperty = messageProperty;
+        }
+
+        @Override
+        protected Task<Keystore> createTask() {
+            return new Task<>() {
+                @Override
+                protected Keystore call() throws Exception {
+                    return cardImport.getKeystore(pin, derivation, messageProperty);
+                }
+            };
+        }
+    }
+}

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

@@ -0,0 +1,108 @@
+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;
+import javafx.beans.binding.BooleanBinding;
+import javafx.scene.control.*;
+import org.controlsfx.control.textfield.CustomPasswordField;
+import org.controlsfx.glyphfont.FontAwesome;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+import tornadofx.control.Field;
+import tornadofx.control.Fieldset;
+import tornadofx.control.Form;
+
+public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
+    private final CustomPasswordField existingPin;
+    private final CustomPasswordField newPin;
+    private final CustomPasswordField newPinConfirm;
+    private final CheckBox backupFirst;
+    private final ButtonType okButtonType;
+
+    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(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(backupOnly ? 135 : 260);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Glyph lock = new Glyph("FontAwesome", FontAwesome.Glyph.LOCK);
+        lock.setFontSize(50);
+        dialogPane.setGraphic(lock);
+
+        Form form = new Form();
+        Fieldset fieldset = new Fieldset();
+        fieldset.setText("");
+        fieldset.setSpacing(10);
+
+        Field currentField = new Field();
+        currentField.setText("Current PIN:");
+        currentField.getInputs().add(existingPin);
+
+        Field newField = new Field();
+        newField.setText("New PIN:");
+        newField.getInputs().add(newPin);
+
+        Field confirmField = new Field();
+        confirmField.setText("Confirm new PIN:");
+        confirmField.getInputs().add(newPinConfirm);
+
+        Field backupField = new Field();
+        backupField.setText("Backup First:");
+        backupField.getInputs().add(backupFirst);
+
+        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() < 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(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() < 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);
+
+        Platform.runLater(existingPin::requestFocus);
+        setResultConverter(dialogButton -> dialogButton == okButtonType ? new CardPinChange(existingPin.getText(), newPin.getText(), backupFirst.isSelected()) : null);
+    }
+
+    public record CardPinChange(String currentPin, String newPin, boolean backupFirst) { }
+}

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

@@ -1,28 +1,31 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.sparrow.UnitFormat;
 import javafx.scene.chart.NumberAxis;
 import javafx.util.StringConverter;
 
 import java.text.ParseException;
 
 final class CoinAxisFormatter extends StringConverter<Number> {
+    private final UnitFormat unitFormat;
     private final BitcoinUnit bitcoinUnit;
 
-    public CoinAxisFormatter(NumberAxis axis, BitcoinUnit unit) {
+    public CoinAxisFormatter(NumberAxis axis, UnitFormat format, BitcoinUnit unit) {
+        this.unitFormat = format;
         this.bitcoinUnit = unit;
     }
 
     @Override
     public String toString(Number object) {
         Double value = bitcoinUnit.getValue(object.longValue());
-        return CoinTextFormatter.COIN_FORMAT.format(value);
+        return new CoinTextFormatter(unitFormat).getCoinFormat().format(value);
     }
 
     @Override
     public Number fromString(String string) {
         try {
-            Number number = CoinTextFormatter.COIN_FORMAT.parse(string);
+            Number number = new CoinTextFormatter(unitFormat).getCoinFormat().parse(string);
             return bitcoinUnit.getSatsValue(number.doubleValue());
         } catch (ParseException e) {
             throw new RuntimeException(e);

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

@@ -2,30 +2,35 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Tooltip;
-import javafx.scene.control.TreeTableCell;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.scene.control.*;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.Region;
 import javafx.util.Duration;
 import org.controlsfx.tools.Platform;
 
 import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.Locale;
 
-class CoinCell extends TreeTableCell<Entry, Number> {
-    public static final DecimalFormat TABLE_BTC_FORMAT = new DecimalFormat("0.00000000", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
+class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsListener {
+    private final CoinTooltip tooltip;
+    private final CoinContextMenu contextMenu;
 
-    private final Tooltip tooltip;
+    private IntegerProperty confirmationsProperty;
 
     public CoinCell() {
         super();
-        tooltip = new Tooltip();
+        tooltip = new CoinTooltip();
         tooltip.setShowDelay(Duration.millis(500));
+        contextMenu = new CoinContextMenu();
         getStyleClass().add("coin-cell");
         if(Platform.getCurrent() == Platform.OSX) {
             getStyleClass().add("number-field");
@@ -40,34 +45,32 @@ class CoinCell extends TreeTableCell<Entry, Number> {
             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();
             BitcoinUnit unit = coinTreeTable.getBitcoinUnit();
 
-            String satsValue = String.format(Locale.ENGLISH, "%,d", amount.longValue());
-            DecimalFormat decimalFormat = (amount.longValue() == 0L ? CoinLabel.getBTCFormat() : TABLE_BTC_FORMAT);
+            String satsValue = format.formatSatsValue(amount.longValue());
+            DecimalFormat decimalFormat = (amount.longValue() == 0L ? format.getBtcFormat() : format.getTableBtcFormat());
             final String btcValue = decimalFormat.format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);
 
             if(unit.equals(BitcoinUnit.BTC)) {
-                tooltip.setText(satsValue + " " + BitcoinUnit.SATOSHIS.getLabel());
+                tooltip.setValue(satsValue + " " + BitcoinUnit.SATOSHIS.getLabel());
                 setText(btcValue);
             } else {
-                tooltip.setText(btcValue + " " + BitcoinUnit.BTC.getLabel());
+                tooltip.setValue(btcValue + " " + BitcoinUnit.BTC.getLabel());
                 setText(satsValue);
             }
             setTooltip(tooltip);
-            String tooltipValue = tooltip.getText();
+            contextMenu.updateAmount(amount);
+            setContextMenu(contextMenu);
 
-            if(entry instanceof TransactionEntry) {
-                TransactionEntry transactionEntry = (TransactionEntry)entry;
-                tooltip.setText(tooltipValue + " (" + transactionEntry.getConfirmationsDescription() + ")");
-
-                transactionEntry.confirmationsProperty().addListener((observable, oldValue, newValue) -> {
-                    tooltip.setText(tooltipValue + " (" + transactionEntry.getConfirmationsDescription() + ")");
-                });
+            if(entry instanceof TransactionEntry transactionEntry) {
+                tooltip.showConfirmations(transactionEntry.confirmationsProperty(), transactionEntry.isCoinbase());
 
                 if(transactionEntry.isConfirming()) {
                     ConfirmationProgressIndicator arc = new ConfirmationProgressIndicator(transactionEntry.getConfirmations());
@@ -97,4 +100,99 @@ class CoinCell extends TreeTableCell<Entry, Number> {
             }
         }
     }
+
+    @Override
+    public IntegerProperty getConfirmationsProperty() {
+        if(confirmationsProperty == null) {
+            confirmationsProperty = new SimpleIntegerProperty();
+            confirmationsProperty.addListener((observable, oldValue, newValue) -> {
+                if(newValue.intValue() >= BlockTransactionHash.BLOCKS_TO_CONFIRM) {
+                    getStyleClass().remove("confirming");
+                    confirmationsProperty.unbind();
+                }
+            });
+        }
+
+        return confirmationsProperty;
+    }
+
+    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) {
+            this.value = value;
+            setTooltipText();
+        }
+
+        public void showConfirmations(IntegerProperty txEntryConfirmationsProperty, boolean coinbase) {
+            showConfirmations = true;
+            isCoinbase = coinbase;
+
+            int confirmations = txEntryConfirmationsProperty.get();
+            if(confirmations < BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM) {
+                confirmationsProperty.bind(txEntryConfirmationsProperty);
+                confirmationsProperty.addListener((observable, oldValue, newValue) -> {
+                    setTooltipText();
+                    if(newValue.intValue() >= BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM) {
+                        confirmationsProperty.unbind();
+                    }
+                });
+            } else {
+                confirmationsProperty.unbind();
+                confirmationsProperty.set(confirmations);
+            }
+
+            setTooltipText();
+        }
+
+        private void setTooltipText() {
+            setText(value + (showConfirmations ? " (" + getConfirmationsDescription() + ")" : ""));
+        }
+
+        public String getConfirmationsDescription() {
+            int confirmations = confirmationsProperty.get();
+            if(confirmations == 0) {
+                return "Unconfirmed in mempool";
+            } else if(confirmations < BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM) {
+                return confirmations + " confirmation" + (confirmations == 1 ? "" : "s") + (isCoinbase ? ", immature coinbase" : "");
+            } else {
+                return BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM + "+ confirmations";
+            }
+        }
+    }
+
+    private static class CoinContextMenu extends ContextMenu {
+        private Number amount;
+
+        public void updateAmount(Number amount) {
+            if(amount.equals(this.amount)) {
+                return;
+            }
+
+            this.amount = amount;
+            getItems().clear();
+
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
+            copySatsValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(amount.toString());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            MenuItem copyBtcValue = new MenuItem("Copy Value in BTC");
+            copyBtcValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+                content.putString(format.formatBtcValue(amount.longValue()));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            getItems().addAll(copySatsValue, copyBtcValue);
+        }
+    }
 }

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
-import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
@@ -12,13 +12,7 @@ import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-import java.util.Locale;
-
 public class CoinLabel extends Label {
-    public static final DecimalFormat BTC_FORMAT = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
-
     private final LongProperty valueProperty = new SimpleLongProperty(-1);
     private final Tooltip tooltip;
     private final CoinContextMenu contextMenu;
@@ -58,8 +52,9 @@ public class CoinLabel extends Label {
         setTooltip(tooltip);
         setContextMenu(contextMenu);
 
-        String satsValue = String.format(Locale.ENGLISH, "%,d", value) + " sats";
-        String btcValue = BTC_FORMAT.format(value.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN) + " BTC";
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        String satsValue = format.formatSatsValue(value) + " sats";
+        String btcValue = format.formatBtcValue(value) + " BTC";
 
         BitcoinUnit unit = bitcoinUnit;
         if(unit == null || unit.equals(BitcoinUnit.AUTO)) {
@@ -89,16 +84,12 @@ public class CoinLabel extends Label {
             copyBtcValue.setOnAction(AE -> {
                 hide();
                 ClipboardContent content = new ClipboardContent();
-                content.putString(BTC_FORMAT.format((double)getValue() / Transaction.SATOSHIS_PER_BITCOIN));
+                UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+                content.putString(format.formatBtcValue(getValue()));
                 Clipboard.getSystemClipboard().setContent(content);
             });
 
             getItems().addAll(copySatsValue, copyBtcValue);
         }
     }
-
-    public static DecimalFormat getBTCFormat() {
-        BTC_FORMAT.setMaximumFractionDigits(8);
-        return BTC_FORMAT;
-    }
 }

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

@@ -1,24 +1,39 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.sparrow.UnitFormat;
 import javafx.scene.control.TextFormatter;
 import javafx.scene.control.TextInputControl;
 
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.ParseException;
-import java.util.Locale;
 import java.util.function.UnaryOperator;
 import java.util.regex.Pattern;
 
 public class CoinTextFormatter extends TextFormatter<String> {
-    private static final Pattern COIN_VALIDATION = Pattern.compile("[\\d,]*(\\.\\d{0,8})?");
-    public static final DecimalFormat COIN_FORMAT = new DecimalFormat("###,###.########", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
+    public CoinTextFormatter(UnitFormat unitFormat) {
+        super(new CoinFilter(unitFormat == null ? UnitFormat.DOT : unitFormat));
+    }
 
-    public CoinTextFormatter() {
-        super(new CoinFilter());
+    public UnitFormat getUnitFormat() {
+        return ((CoinFilter)getFilter()).unitFormat;
+    }
+
+    public DecimalFormat getCoinFormat() {
+        return ((CoinFilter)getFilter()).coinFormat;
     }
 
     private static class CoinFilter implements UnaryOperator<Change> {
+        private final UnitFormat unitFormat;
+        private final DecimalFormat coinFormat;
+        private final Pattern coinValidation;
+
+        public CoinFilter(UnitFormat 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})?");
+        }
+
         @Override
         public Change apply(Change change) {
             String oldText = change.getControlText();
@@ -30,17 +45,17 @@ public class CoinTextFormatter extends TextFormatter<String> {
 
             String noFractionCommaText = newText;
             int commasRemoved = 0;
-            int dotIndex = newText.indexOf(".");
+            int dotIndex = newText.indexOf(unitFormat.getDecimalSeparator());
             if(dotIndex > -1) {
-                noFractionCommaText = newText.substring(0, dotIndex) + newText.substring(dotIndex).replaceAll(",", "");
+                noFractionCommaText = newText.substring(0, dotIndex) + newText.substring(dotIndex).replaceAll(Pattern.quote(unitFormat.getGroupingSeparator()), "");
                 commasRemoved = newText.length() - noFractionCommaText.length();
             }
 
-            if(!COIN_VALIDATION.matcher(noFractionCommaText).matches()) {
+            if(!coinValidation.matcher(noFractionCommaText).matches()) {
                 return null;
             }
 
-            if(",".equals(change.getText())) {
+            if(unitFormat.getGroupingSeparator().equals(change.getText())) {
                 return null;
             }
 
@@ -48,20 +63,20 @@ public class CoinTextFormatter extends TextFormatter<String> {
                 return change;
             }
 
-            if(change.isDeleted() && ",".equals(deleted) && change.getRangeStart() > 0) {
+            if(change.isDeleted() && unitFormat.getGroupingSeparator().equals(deleted) && change.getRangeStart() > 0) {
                 noFractionCommaText = noFractionCommaText.substring(0, change.getRangeStart() - 1) + noFractionCommaText.substring(change.getRangeEnd() - 1);
             }
 
             try {
-                Number value = COIN_FORMAT.parse(noFractionCommaText);
-                String correct = COIN_FORMAT.format(value.doubleValue());
+                Number value = coinFormat.parse(noFractionCommaText);
+                String correct = coinFormat.format(value.doubleValue());
 
                 String compare = newText;
-                if(compare.contains(".") && compare.endsWith("0")) {
+                if(compare.contains(unitFormat.getDecimalSeparator()) && compare.endsWith("0")) {
                     compare = compare.replaceAll("0*$", "");
                 }
 
-                if(compare.endsWith(".")) {
+                if(compare.endsWith(unitFormat.getDecimalSeparator())) {
                     compare = compare.substring(0, compare.length() - 1);
                 }
 
@@ -79,11 +94,11 @@ public class CoinTextFormatter extends TextFormatter<String> {
 
                 if(correct.length() != newText.length()) {
                     String postCorrect = correct.substring(Math.min(change.getCaretPosition(), correct.length()));
-                    int commasAfter = postCorrect.length() - postCorrect.replace(",", "").length();
-                    int caretShift = change.isDeleted() && ".".equals(deleted) ? commasAfter : 0;
+                    int commasAfter = postCorrect.length() - postCorrect.replace(unitFormat.getGroupingSeparator(), "").length();
+                    int caretShift = change.isDeleted() && unitFormat.getDecimalSeparator().equals(deleted) ? commasAfter : 0;
 
                     int caret = change.getCaretPosition() + (correct.length() - newText.length() - caretShift) + commasRemoved;
-                    if(caret >= 0) {
+                    if(caret >= 0 && caret <= change.getControlNewText().length()) {
                         change.setCaretPosition(caret);
                         change.setAnchor(caret);
                     }

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

@@ -2,6 +2,8 @@ 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;
 import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
@@ -16,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;
 
@@ -26,25 +29,37 @@ import java.util.Optional;
 
 public class CoinTreeTable extends TreeTableView<Entry> {
     private BitcoinUnit bitcoinUnit;
+    private UnitFormat unitFormat;
+    private CurrencyRate currencyRate;
 
     public BitcoinUnit getBitcoinUnit() {
         return bitcoinUnit;
     }
 
-    public void setBitcoinUnit(BitcoinUnit bitcoinUnit) {
-        this.bitcoinUnit = bitcoinUnit;
+    public UnitFormat getUnitFormat() {
+        return unitFormat;
     }
 
-    public void setBitcoinUnit(Wallet wallet) {
-        setBitcoinUnit(wallet, Config.get().getBitcoinUnit());
+    public void setUnitFormat(Wallet wallet) {
+        setUnitFormat(wallet, Config.get().getUnitFormat(), Config.get().getBitcoinUnit());
     }
 
-    public void setBitcoinUnit(Wallet wallet, BitcoinUnit unit) {
+    public void setUnitFormat(Wallet wallet, UnitFormat format) {
+        setUnitFormat(wallet, format, Config.get().getBitcoinUnit());
+    }
+
+    public void setUnitFormat(Wallet wallet, UnitFormat format, BitcoinUnit unit) {
+        if(format == null) {
+            format = UnitFormat.DOT;
+        }
+
         if(unit == null || unit.equals(BitcoinUnit.AUTO)) {
             unit = wallet.getAutoUnit();
         }
 
-        boolean changed = (bitcoinUnit != unit);
+        boolean changed = (unitFormat != format);
+        changed |= (bitcoinUnit != unit);
+        this.unitFormat = format;
         this.bitcoinUnit = unit;
 
         if(changed && !getChildren().isEmpty()) {
@@ -52,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();
@@ -81,7 +108,8 @@ public class CoinTreeTable extends TreeTableView<Entry> {
             Hyperlink hyperlink = new Hyperlink();
             hyperlink.setTranslateY(30);
             hyperlink.setOnAction(event -> {
-                WalletBirthDateDialog dlg = new WalletBirthDateDialog(wallet.getBirthDate());
+                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);
@@ -107,4 +135,12 @@ public class CoinTreeTable extends TreeTableView<Entry> {
         stackPane.setAlignment(Pos.CENTER);
         return stackPane;
     }
+
+    public void setSortColumn(int columnIndex, TreeTableColumn.SortType sortType) {
+        if(columnIndex >= 0 && columnIndex < getColumns().size() && getSortOrder().isEmpty() && !getRoot().getChildren().isEmpty()) {
+            TreeTableColumn<Entry, ?> column = getColumns().get(columnIndex);
+            column.setSortType(sortType == null ? TreeTableColumn.SortType.DESCENDING : sortType);
+            getSortOrder().add(column);
+        }
+    }
 }

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

@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.beans.property.IntegerProperty;
+
+public interface ConfirmationsListener {
+    IntegerProperty getConfirmationsProperty();
+}

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
-import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.LongProperty;
 import javafx.beans.property.SimpleLongProperty;
@@ -10,21 +10,38 @@ import javafx.scene.control.MenuItem;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
-
-import java.util.Locale;
+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");
     }
 
     public CopyableCoinLabel(String text) {
         super(text);
-        valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getBitcoinUnit()));
+        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();
     }
@@ -42,25 +59,31 @@ public class CopyableCoinLabel extends CopyableLabel {
     }
 
     public void refresh() {
-        refresh(Config.get().getBitcoinUnit());
+        refresh(Config.get().getUnitFormat(), Config.get().getBitcoinUnit());
     }
 
-    public void refresh(BitcoinUnit bitcoinUnit) {
-        setValueAsText(getValue(), bitcoinUnit);
+    public void refresh(UnitFormat unitFormat, BitcoinUnit bitcoinUnit) {
+        setValueAsText(getValue(), unitFormat, bitcoinUnit);
     }
 
-    private void setValueAsText(Long value, BitcoinUnit bitcoinUnit) {
+    private void setValueAsText(Long value, UnitFormat unitFormat, BitcoinUnit bitcoinUnit) {
         setTooltip(tooltip);
         setContextMenu(contextMenu);
 
-        String satsValue = String.format(Locale.ENGLISH, "%,d", value) + " sats";
-        String btcValue = CoinLabel.getBTCFormat().format(value.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN) + " BTC";
+        if(unitFormat == null) {
+            unitFormat = UnitFormat.DOT;
+        }
+
+        String satsValue = unitFormat.formatSatsValue(value) + " sats";
+        String btcValue = unitFormat.formatBtcValue(value) + " BTC";
 
         BitcoinUnit unit = bitcoinUnit;
         if(unit == null || unit.equals(BitcoinUnit.AUTO)) {
             unit = (value >= BitcoinUnit.getAutoThreshold() ? BitcoinUnit.BTC : BitcoinUnit.SATOSHIS);
         }
 
+        this.bitcoinUnit = unit;
+
         if(unit.equals(BitcoinUnit.BTC)) {
             tooltip.setText(satsValue);
             setText(btcValue);
@@ -84,7 +107,8 @@ public class CopyableCoinLabel extends CopyableLabel {
             copyBtcValue.setOnAction(AE -> {
                 hide();
                 ClipboardContent content = new ClipboardContent();
-                content.putString(CoinLabel.getBTCFormat().format((double)getValue() / Transaction.SATOSHIS_PER_BITCOIN));
+                UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+                content.putString(format.formatBtcValue(getValue()));
                 Clipboard.getSystemClipboard().setContent(content);
             });
 

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

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

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

@@ -1,28 +1,13 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.lowagie.text.*;
-import com.lowagie.text.Font;
-import com.lowagie.text.Image;
-import com.lowagie.text.pdf.PdfWriter;
 import com.sparrowwallet.hummingbird.UR;
-import com.sparrowwallet.hummingbird.UREncoder;
-import com.sparrowwallet.sparrow.AppServices;
-import javafx.embed.swing.SwingFXUtils;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.PdfUtils;
 import javafx.event.ActionEvent;
 import javafx.scene.control.*;
 import javafx.scene.control.Button;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.awt.*;
-import java.io.File;
-import java.io.FileOutputStream;
 
 public class DescriptorQRDisplayDialog extends QRDisplayDialog {
-    private static final Logger log = LoggerFactory.getLogger(DescriptorQRDisplayDialog.class);
-
     public DescriptorQRDisplayDialog(String walletName, String outputDescriptor, UR ur) {
         super(ur);
 
@@ -31,43 +16,11 @@ public class DescriptorQRDisplayDialog extends QRDisplayDialog {
         dialogPane.getButtonTypes().add(pdfButtonType);
 
         Button pdfButton = (Button)dialogPane.lookupButton(pdfButtonType);
+        pdfButton.setGraphicTextGap(5);
+        pdfButton.setGraphic(getGlyph(FontAwesome5.Glyph.FILE_PDF));
         pdfButton.addEventFilter(ActionEvent.ACTION, event -> {
-            savePdf(walletName, outputDescriptor, ur);
+            PdfUtils.saveOutputDescriptor(walletName, outputDescriptor, ur);
             event.consume();
         });
     }
-
-    private void savePdf(String walletName, String outputDescriptor, UR ur) {
-        Stage window = new Stage();
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle("Save PDF");
-        fileChooser.setInitialFileName(walletName + ".pdf");
-        AppServices.moveToActiveWindowScreen(window, 800, 450);
-        File file = fileChooser.showSaveDialog(window);
-        if(file != null) {
-            try(Document document = new Document()) {
-                document.setMargins(36, 36, 48, 36);
-                PdfWriter.getInstance(document, new FileOutputStream(file));
-                document.open();
-
-                Font titleFont = FontFactory.getFont(FontFactory.HELVETICA_BOLD, 16, Color.BLACK);
-                Chunk title = new Chunk("Output descriptor for " + walletName, titleFont);
-                document.add(title);
-
-                UREncoder urEncoder = new UREncoder(ur, 2000, 10, 0);
-                String fragment = urEncoder.nextPart();
-                if(urEncoder.isSinglePart()) {
-                    Image image = Image.getInstance(SwingFXUtils.fromFXImage(getQrCode(fragment), null), Color.WHITE);
-                    document.add(image);
-                }
-
-                Font descriptorFont = FontFactory.getFont(FontFactory.COURIER, 14, Color.BLACK);
-                Paragraph descriptor = new Paragraph(outputDescriptor, descriptorFont);
-                document.add(descriptor);
-            } catch(Exception e) {
-                log.error("Error creating descriptor PDF", e);
-                AppServices.showErrorDialog("Error creating PDF", e.getMessage());
-            }
-        }
-    }
 }

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

@@ -68,7 +68,7 @@ public abstract class DeviceDialog<R> extends Dialog<R> {
 
         stackPane.getChildren().addAll(anchorPane, scanBox);
 
-        List<Device> devices = AppServices.getDevices();
+        List<Device> devices = getDevices();
         if(devices == null || devices.isEmpty()) {
             scanButton.setDefaultButton(true);
             scanBox.setVisible(true);
@@ -91,11 +91,16 @@ 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());
     }
 
+    protected List<Device> getDevices() {
+        return AppServices.getDevices();
+    }
+
     private void scan() {
         Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(null);
         enumerateService.setOnSucceeded(workerStateEvent -> {

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

@@ -9,11 +9,11 @@ import com.sparrowwallet.sparrow.io.Device;
 
 import java.util.stream.Collectors;
 
-public class DeviceAddressDialog extends DeviceDialog<String> {
+public class DeviceDisplayAddressDialog extends DeviceDialog<String> {
     private final Wallet wallet;
     private final OutputDescriptor outputDescriptor;
 
-    public DeviceAddressDialog(Wallet wallet, OutputDescriptor outputDescriptor) {
+    public DeviceDisplayAddressDialog(Wallet wallet, OutputDescriptor outputDescriptor) {
         super(outputDescriptor.getExtendedPublicKeys().stream().map(extKey -> outputDescriptor.getKeyDerivation(extKey).getMasterFingerprint()).collect(Collectors.toList()));
         this.wallet = wallet;
         this.outputDescriptor = outputDescriptor;

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

@@ -0,0 +1,29 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.DeviceAddressEvent;
+import com.sparrowwallet.sparrow.io.Device;
+
+import java.util.List;
+
+public class DeviceGetAddressDialog extends DeviceDialog<Address> {
+    public DeviceGetAddressDialog(List<String> operationFingerprints) {
+        super(operationFingerprints);
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+    }
+
+    @Override
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(DevicePane.DeviceOperation.GET_ADDRESS, device, defaultDevice);
+    }
+
+    @Subscribe
+    public void deviceAddress(DeviceAddressEvent event) {
+        setResult(event.getAddress());
+    }
+}

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

@@ -1,25 +1,33 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.google.common.base.Throwables;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.policy.Policy;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.psbt.PSBT;
-import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.drongo.wallet.KeystoreSource;
-import com.sparrowwallet.drongo.wallet.StandardAccount;
-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.*;
+import com.sparrowwallet.sparrow.io.CardApi;
 import com.sparrowwallet.sparrow.io.Device;
 import com.sparrowwallet.sparrow.io.Hwi;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.CardAuthorizationException;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.WorkerStateEvent;
+import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -34,8 +42,10 @@ import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class DevicePane extends TitledDescriptionPane {
     private static final Logger log = LoggerFactory.getLogger(DevicePane.class);
@@ -58,8 +68,12 @@ public class DevicePane extends TitledDescriptionPane {
     private Button displayAddressButton;
     private Button signMessageButton;
     private Button discoverKeystoresButton;
+    private ButtonBase getPrivateKeyButton;
+    private Button getAddressButton;
 
     private final SimpleStringProperty passphrase = new SimpleStringProperty("");
+    private final SimpleStringProperty pin = new SimpleStringProperty("");
+    private final StringProperty messageProperty = new SimpleStringProperty("");
 
     private boolean defaultDevice;
 
@@ -83,13 +97,17 @@ public class DevicePane extends TitledDescriptionPane {
 
         initialise(device);
 
+        messageProperty.addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> setDescription(newValue));
+        });
+
         buttonBox.getChildren().addAll(setPassphraseButton, importButton);
     }
 
-    public DevicePane(PSBT psbt, Device device, boolean defaultDevice) {
+    public DevicePane(Wallet wallet, PSBT psbt, Device device, boolean defaultDevice) {
         super(device.getModel().toDisplayString(), "", "", "image/" + device.getType() + ".png");
         this.deviceOperation = DeviceOperation.SIGN;
-        this.wallet = null;
+        this.wallet = wallet;
         this.psbt = psbt;
         this.outputDescriptor = null;
         this.keyDerivation = null;
@@ -106,6 +124,10 @@ public class DevicePane extends TitledDescriptionPane {
 
         initialise(device);
 
+        messageProperty.addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> setDescription(newValue));
+        });
+
         buttonBox.getChildren().addAll(setPassphraseButton, signButton);
     }
 
@@ -152,6 +174,10 @@ public class DevicePane extends TitledDescriptionPane {
 
         initialise(device);
 
+        messageProperty.addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> setDescription(newValue));
+        });
+
         buttonBox.getChildren().addAll(setPassphraseButton, signMessageButton);
     }
 
@@ -178,6 +204,41 @@ public class DevicePane extends TitledDescriptionPane {
         buttonBox.getChildren().addAll(setPassphraseButton, discoverKeystoresButton);
     }
 
+    public DevicePane(DeviceOperation deviceOperation, Device device, boolean defaultDevice) {
+        super(device.getModel().toDisplayString(), "", "", "image/" + device.getType() + ".png");
+        this.deviceOperation = deviceOperation;
+        this.wallet = null;
+        this.psbt = null;
+        this.outputDescriptor = null;
+        this.keyDerivation = null;
+        this.message = null;
+        this.device = device;
+        this.defaultDevice = defaultDevice;
+        this.availableAccounts = null;
+
+        setDefaultStatus();
+        showHideLink.setVisible(false);
+
+        ButtonBase button;
+        if(deviceOperation == DeviceOperation.GET_PRIVATE_KEY) {
+            createGetPrivateKeyButton();
+            button = getPrivateKeyButton;
+        } else if(deviceOperation == DeviceOperation.GET_ADDRESS) {
+            createGetAddressButton();
+            button = getAddressButton;
+        } else {
+            throw new UnsupportedOperationException("Cannot construct device pane for operation " + deviceOperation);
+        }
+
+        initialise(device);
+
+        messageProperty.addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> setDescription(newValue));
+        });
+
+        buttonBox.getChildren().add(button);
+    }
+
     private void initialise(Device device) {
         if(device.isNeedsPinSent()) {
             unlockButton.setDefaultButton(defaultDevice);
@@ -201,7 +262,7 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void setDefaultStatus() {
-        setDescription(device.isNeedsPinSent() ? "Locked" : device.isNeedsPassphraseSent() ? "Passphrase Required" : "Unlocked");
+        setDescription(device.isNeedsPinSent() ? "Locked" : device.isNeedsPassphraseSent() ? "Passphrase Required" : device.isCard() ? "Leave card on reader" : "Unlocked");
     }
 
     private void createUnlockButton() {
@@ -239,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();
@@ -321,6 +382,60 @@ public class DevicePane extends TitledDescriptionPane {
         discoverKeystoresButton.setVisible(false);
     }
 
+    private void createGetPrivateKeyButton() {
+        int currentSlot = 0;
+        boolean initialized = true;
+        try {
+            CardApi cardApi = CardApi.getCardApi(device.getModel(), null);
+            currentSlot = cardApi.getCurrentSlot();
+            initialized = cardApi.isInitialized();
+        } catch(Exception e) {
+            //ignore
+        }
+
+        getPrivateKeyButton = currentSlot > 0 ? new SplitMenuButton() : new Button();
+        getPrivateKeyButton.setAlignment(Pos.CENTER_RIGHT);
+        getPrivateKeyButton.setText("Get Private Key");
+        getPrivateKeyButton.setOnAction(event -> {
+            getPrivateKeyButton.setDisable(true);
+            getPrivateKey(null);
+        });
+
+        if(getPrivateKeyButton instanceof SplitMenuButton getPrivateKeyMenuButton) {
+            int[] previousSlots = IntStream.range(0, currentSlot).toArray();
+            for(int previousSlot : previousSlots) {
+                MenuItem previousSlotItem = new MenuItem("Slot #" + previousSlot);
+                previousSlotItem.setOnAction(event -> {
+                    getPrivateKeyButton.setDisable(true);
+                    getPrivateKey(previousSlot);
+                });
+                getPrivateKeyMenuButton.getItems().add(previousSlotItem);
+            }
+            if(initialized) {
+                int finalSlot = currentSlot;
+                MenuItem currentSlotItem = new MenuItem("Current Slot");
+                currentSlotItem.setOnAction(event -> {
+                    getPrivateKeyButton.setDisable(true);
+                    getPrivateKey(finalSlot);
+                });
+                getPrivateKeyMenuButton.getItems().add(currentSlotItem);
+            }
+        }
+        getPrivateKeyButton.managedProperty().bind(getPrivateKeyButton.visibleProperty());
+        getPrivateKeyButton.setVisible(false);
+    }
+
+    private void createGetAddressButton() {
+        getAddressButton = new Button("Get Address");
+        getAddressButton.setAlignment(Pos.CENTER_RIGHT);
+        getAddressButton.setOnAction(event -> {
+            getAddressButton.setDisable(true);
+            getAddress();
+        });
+        getAddressButton.managedProperty().bind(getAddressButton.visibleProperty());
+        getAddressButton.setVisible(false);
+    }
+
     private void unlock(Device device) {
         if(device.getModel().requiresPinPrompt()) {
             promptPin();
@@ -554,7 +669,36 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void importKeystore(List<ChildNumber> derivation) {
-        if(device.getFingerprint() == null) {
+        if(device.isCard()) {
+            try {
+                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
+                if(!cardApi.isInitialized()) {
+                    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);
+                        importButton.setDisable(false);
+                        return;
+                    }
+
+                    setDescription("Card not initialized");
+                    setContent(getCardInitializationPanel(cardApi, importButton, DeviceOperation.IMPORT));
+                    showHideLink.setVisible(false);
+                    setExpanded(true);
+                    return;
+                }
+
+                Service<Keystore> importService = cardApi.getImportService(derivation, messageProperty);
+                handleCardOperation(importService, importButton, "Import", true, event -> {
+                    importKeystore(derivation, importService.getValue());
+                });
+            } catch(Exception e) {
+                log.error("Import Error: " + e.getMessage(), e);
+                setError("Import Error", e.getMessage());
+                importButton.setDisable(false);
+            }
+        } else if(device.getFingerprint() == null) {
             Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(passphrase.get());
             enumerateService.setOnSucceeded(workerStateEvent -> {
                 List<Device> devices = enumerateService.getValue();
@@ -591,18 +735,7 @@ public class DevicePane extends TitledDescriptionPane {
                 keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath));
                 keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub));
 
-                if(wallet.getScriptType() == null) {
-                    ScriptType scriptType = Arrays.stream(ScriptType.ADDRESSABLE_TYPES).filter(type -> type.getDefaultDerivation().get(0).equals(derivation.get(0))).findFirst().orElse(ScriptType.P2PKH);
-                    wallet.setName(device.getModel().toDisplayString());
-                    wallet.setPolicyType(PolicyType.SINGLE);
-                    wallet.setScriptType(scriptType);
-                    wallet.getKeystores().add(keystore);
-                    wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, scriptType, wallet.getKeystores(), null));
-
-                    EventManager.get().post(new WalletImportEvent(wallet));
-                } else {
-                    EventManager.get().post(new KeystoreImportEvent(keystore));
-                }
+                importKeystore(derivation, keystore);
             } catch(Exception e) {
                 setError("Could not retrieve xpub", e.getMessage());
             }
@@ -616,20 +749,74 @@ public class DevicePane extends TitledDescriptionPane {
         getXpubService.start();
     }
 
+    private void importKeystore(List<ChildNumber> derivation, Keystore keystore) {
+        if(wallet.getScriptType() == null) {
+            ScriptType scriptType = Arrays.stream(ScriptType.ADDRESSABLE_TYPES).filter(type -> type.getDefaultDerivation().get(0).equals(derivation.get(0))).findFirst().orElse(ScriptType.P2PKH);
+            wallet.setName(device.getModel().toDisplayString());
+            wallet.setPolicyType(PolicyType.SINGLE);
+            wallet.setScriptType(scriptType);
+            wallet.getKeystores().add(keystore);
+            wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, scriptType, wallet.getKeystores(), null));
+
+            EventManager.get().post(new WalletImportEvent(wallet));
+        } else {
+            EventManager.get().post(new KeystoreImportEvent(keystore));
+        }
+    }
+
     private void sign() {
-        Hwi.SignPSBTService signPSBTService = new Hwi.SignPSBTService(device, passphrase.get(), psbt);
-        signPSBTService.setOnSucceeded(workerStateEvent -> {
-            PSBT signedPsbt = signPSBTService.getValue();
-            EventManager.get().post(new PSBTSignedEvent(psbt, signedPsbt));
+        if(device.isCard()) {
+            try {
+                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
+                Service<PSBT> signService = cardApi.getSignService(wallet, psbt, messageProperty);
+                handleCardOperation(signService, signButton, "Signing", true, event -> {
+                    EventManager.get().post(new PSBTSignedEvent(psbt, signService.getValue()));
+                });
+            } catch(Exception e) {
+                log.error("Signing Error: " + e.getMessage(), e);
+                setError("Signing Error", e.getMessage());
+                signButton.setDisable(false);
+            }
+        } else {
+            Hwi.SignPSBTService signPSBTService = new Hwi.SignPSBTService(device, passphrase.get(), psbt);
+            signPSBTService.setOnSucceeded(workerStateEvent -> {
+                PSBT signedPsbt = signPSBTService.getValue();
+                EventManager.get().post(new PSBTSignedEvent(psbt, signedPsbt));
+            });
+            signPSBTService.setOnFailed(workerStateEvent -> {
+                setError("Signing Error", signPSBTService.getException().getMessage());
+                log.error("Signing Error: " + signPSBTService.getException().getMessage(), signPSBTService.getException());
+                signButton.setDisable(false);
+            });
+            setDescription("Signing...");
+            showHideLink.setVisible(false);
+            signPSBTService.start();
+        }
+    }
+
+    private void handleCardOperation(Service<?> service, ButtonBase operationButton, String operationDescription, boolean pinRequired, EventHandler<WorkerStateEvent> successHandler) {
+        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);
+            setExpanded(true);
+            operationButton.setDisable(false);
+            return;
+        }
+
+        service.setOnSucceeded(successHandler);
+        service.setOnFailed(event -> {
+            Throwable rootCause = Throwables.getRootCause(event.getSource().getException());
+            if(rootCause instanceof CardAuthorizationException) {
+                setError(rootCause.getMessage(), null);
+                setContent(getCardPinEntry(operationButton));
+            } else {
+                log.error(operationDescription + " Error: " + rootCause.getMessage(), event.getSource().getException());
+                setError(operationDescription + " Error", rootCause.getMessage());
+            }
+            operationButton.setDisable(false);
         });
-        signPSBTService.setOnFailed(workerStateEvent -> {
-            setError("Signing Error", signPSBTService.getException().getMessage());
-            log.error("Signing Error: " + signPSBTService.getException().getMessage(), signPSBTService.getException());
-            signButton.setDisable(false);
-        });
-        setDescription("Signing...");
-        showHideLink.setVisible(false);
-        signPSBTService.start();
+        service.start();
     }
 
     private void displayAddress() {
@@ -647,17 +834,32 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void signMessage() {
-        Hwi.SignMessageService signMessageService = new Hwi.SignMessageService(device, passphrase.get(), message, keyDerivation.getDerivationPath());
-        signMessageService.setOnSucceeded(successEvent -> {
-            String signature = signMessageService.getValue();
-            EventManager.get().post(new MessageSignedEvent(wallet, signature));
-        });
-        signMessageService.setOnFailed(failedEvent -> {
-            setError("Could not sign message", signMessageService.getException().getMessage());
-            signMessageButton.setDisable(false);
-        });
-        setDescription("Signing message...");
-        signMessageService.start();
+        if(device.isCard()) {
+            try {
+                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
+                Service<String> signMessageService = cardApi.getSignMessageService(message, wallet.getScriptType(), keyDerivation.getDerivation(), messageProperty);
+                handleCardOperation(signMessageService, signMessageButton, "Signing", true, event -> {
+                    String signature = signMessageService.getValue();
+                    EventManager.get().post(new MessageSignedEvent(wallet, signature));
+                });
+            } catch(Exception e) {
+                log.error("Signing Error: " + e.getMessage(), e);
+                setError("Signing Error", e.getMessage());
+                signButton.setDisable(false);
+            }
+        } else {
+            Hwi.SignMessageService signMessageService = new Hwi.SignMessageService(device, passphrase.get(), message, keyDerivation.getDerivationPath());
+            signMessageService.setOnSucceeded(successEvent -> {
+                String signature = signMessageService.getValue();
+                EventManager.get().post(new MessageSignedEvent(wallet, signature));
+            });
+            signMessageService.setOnFailed(failedEvent -> {
+                setError("Could not sign message", signMessageService.getException().getMessage());
+                signMessageButton.setDisable(false);
+            });
+            setDescription("Signing message...");
+            signMessageService.start();
+        }
     }
 
     private void discoverKeystores() {
@@ -717,6 +919,55 @@ public class DevicePane extends TitledDescriptionPane {
         getXpubsService.start();
     }
 
+    private void getPrivateKey(Integer slot) {
+        if(device.isCard()) {
+            try {
+                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
+                Service<ECKey> privateKeyService = cardApi.getPrivateKeyService(slot, messageProperty);
+                handleCardOperation(privateKeyService, getPrivateKeyButton, "Private Key", true, event -> {
+                    EventManager.get().post(new DeviceGetPrivateKeyEvent(privateKeyService.getValue(), cardApi.getDefaultScriptType()));
+                });
+            } catch(Exception e) {
+                log.error("Private Key Error: " + e.getMessage(), e);
+                setError("Private Key Error", e.getMessage());
+                getPrivateKeyButton.setDisable(false);
+            }
+        }
+    }
+
+    private void getAddress() {
+        if(device.isCard()) {
+            try {
+                CardApi cardApi = CardApi.getCardApi(device.getModel(), pin.get());
+                if(!cardApi.isInitialized()) {
+                    if(pin.get().length() < device.getModel().getMinPinLength()) {
+                        setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
+                        setContent(getCardPinEntry(getAddressButton));
+                        showHideLink.setVisible(false);
+                        setExpanded(true);
+                        getAddressButton.setDisable(false);
+                        return;
+                    }
+
+                    setDescription("Card not initialized");
+                    setContent(getCardInitializationPanel(cardApi, getAddressButton, DeviceOperation.GET_ADDRESS));
+                    showHideLink.setVisible(false);
+                    setExpanded(true);
+                    return;
+                }
+
+                Service<Address> addressService = cardApi.getAddressService(messageProperty);
+                handleCardOperation(addressService, getAddressButton, "Address", false, event -> {
+                    EventManager.get().post(new DeviceAddressEvent(addressService.getValue()));
+                });
+            } catch(Exception e) {
+                log.error("Address Error: " + e.getMessage(), e);
+                setError("Address Error", e.getMessage());
+                getAddressButton.setDisable(false);
+            }
+        }
+    }
+
     private void showOperationButton() {
         if(deviceOperation.equals(DeviceOperation.IMPORT)) {
             if(defaultDevice) {
@@ -724,7 +975,7 @@ public class DevicePane extends TitledDescriptionPane {
             }
             importButton.setVisible(true);
             showHideLink.setText("Show derivation...");
-            showHideLink.setVisible(true);
+            showHideLink.setVisible(!device.isCard());
             List<ChildNumber> defaultDerivation = wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation();
             setContent(getDerivationEntry(keyDerivation == null ? defaultDerivation : keyDerivation.getDerivation()));
         } else if(deviceOperation.equals(DeviceOperation.SIGN)) {
@@ -743,6 +994,16 @@ public class DevicePane extends TitledDescriptionPane {
             discoverKeystoresButton.setDefaultButton(defaultDevice);
             discoverKeystoresButton.setVisible(true);
             showHideLink.setVisible(false);
+        } else if(deviceOperation.equals(DeviceOperation.GET_PRIVATE_KEY)) {
+            if(defaultDevice) {
+                getPrivateKeyButton.getStyleClass().add("default-button");
+            }
+            getPrivateKeyButton.setVisible(true);
+            showHideLink.setVisible(false);
+        } else if(deviceOperation.equals(DeviceOperation.GET_ADDRESS)) {
+            getAddressButton.setDefaultButton(defaultDevice);
+            getAddressButton.setVisible(true);
+            showHideLink.setVisible(false);
         }
     }
 
@@ -750,7 +1011,7 @@ public class DevicePane extends TitledDescriptionPane {
         TextField derivationField = new TextField();
         derivationField.setPromptText("Derivation path");
         derivationField.setText(KeyDerivation.writePath(derivation));
-        derivationField.setDisable(keyDerivation != null);
+        derivationField.setDisable(device.isCard() || keyDerivation != null);
         HBox.setHgrow(derivationField, Priority.ALWAYS);
 
         ValidationSupport validationSupport = new ValidationSupport();
@@ -785,11 +1046,161 @@ public class DevicePane extends TitledDescriptionPane {
         return contentBox;
     }
 
+    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");
+        TextField entropy = new TextField();
+        entropy.setPromptText("Enter input for user entropy");
+        entropy.setDisable(true);
+
+        ToggleGroup toggleGroup = new ToggleGroup();
+        automatic.setToggleGroup(toggleGroup);
+        advanced.setToggleGroup(toggleGroup);
+        automatic.setSelected(true);
+        toggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
+            entropy.setDisable(newValue == automatic);
+        });
+
+        initTypeBox.getChildren().addAll(automatic, advanced, entropy);
+
+        Button initializeButton = new Button("Initialize");
+        initializeButton.setDefaultButton(true);
+        initializeButton.setOnAction(event -> {
+            initializeButton.setDisable(true);
+            byte[] chainCode = toggleGroup.getSelectedToggle() == automatic ? null : Sha256Hash.hashTwice(entropy.getText().getBytes(StandardCharsets.UTF_8));
+            Service<Void> cardInitializationService = cardApi.getInitializationService(chainCode, messageProperty);
+            cardInitializationService.setOnSucceeded(successEvent -> {
+                if(deviceOperation == DeviceOperation.IMPORT) {
+                    AppServices.showSuccessDialog("Card Initialized", "The card was successfully initialized.\n\nYou can now import the keystore.");
+                } else if(deviceOperation == DeviceOperation.GET_ADDRESS) {
+                    AppServices.showSuccessDialog("Card Reinitialized", "The card was successfully reinitialized.\n\nYou can now retrieve the new deposit address.");
+                }
+                operationButton.setDisable(false);
+                setDefaultStatus();
+                setExpanded(false);
+            });
+            cardInitializationService.setOnFailed(failEvent -> {
+                Throwable rootCause = Throwables.getRootCause(failEvent.getSource().getException());
+                if(rootCause instanceof CardAuthorizationException) {
+                    setError(rootCause.getMessage(), null);
+                    setContent(getCardPinEntry(operationButton));
+                    operationButton.setDisable(false);
+                } else {
+                    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();
+        });
+
+        HBox contentBox = new HBox(20);
+        contentBox.getChildren().addAll(initTypeBox, initializeButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        HBox.setHgrow(initTypeBox, Priority.ALWAYS);
+
+        return contentBox;
+    }
+
+    private Node getCardPinEntry(ButtonBase operationButton) {
+        VBox vBox = new VBox();
+
+        CustomPasswordField pinField = new ViewPasswordField();
+        pinField.setPromptText("PIN Code");
+        if(operationButton instanceof Button defaultButton) {
+            defaultButton.setDefaultButton(true);
+        }
+        pin.bind(pinField.textProperty());
+        HBox.setHgrow(pinField, Priority.ALWAYS);
+        Platform.runLater(pinField::requestFocus);
+
+        HBox contentBox = new HBox();
+        contentBox.setAlignment(Pos.TOP_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().add(pinField);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefHeight(50);
+
+        vBox.getChildren().add(contentBox);
+
+        return vBox;
+    }
+
     public Device getDevice() {
         return device;
     }
 
     public enum DeviceOperation {
-        IMPORT, SIGN, DISPLAY_ADDRESS, SIGN_MESSAGE, DISCOVER_KEYSTORES;
+        IMPORT, SIGN, DISPLAY_ADDRESS, SIGN_MESSAGE, DISCOVER_KEYSTORES, GET_PRIVATE_KEY, GET_ADDRESS;
     }
 }

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

@@ -2,17 +2,24 @@ package com.sparrowwallet.sparrow.control;
 
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.PSBTSignedEvent;
 import com.sparrowwallet.sparrow.io.Device;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class DeviceSignDialog extends DeviceDialog<PSBT> {
+    private static final Logger log = LoggerFactory.getLogger(DeviceSignDialog.class);
+
+    private final Wallet wallet;
     private final PSBT psbt;
 
-    public DeviceSignDialog(List<String> operationFingerprints, PSBT psbt) {
+    public DeviceSignDialog(Wallet wallet, List<String> operationFingerprints, PSBT psbt) {
         super(operationFingerprints);
+        this.wallet = wallet;
         this.psbt = psbt;
         EventManager.get().register(this);
         setOnCloseRequest(event -> {
@@ -23,7 +30,7 @@ public class DeviceSignDialog extends DeviceDialog<PSBT> {
 
     @Override
     protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
-        return new DevicePane(psbt, device, defaultDevice);
+        return new DevicePane(wallet, psbt, device, defaultDevice);
     }
 
     @Subscribe

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

@@ -0,0 +1,32 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.DeviceGetPrivateKeyEvent;
+import com.sparrowwallet.sparrow.io.Device;
+
+import java.util.List;
+
+public class DeviceUnsealDialog extends DeviceDialog<DeviceUnsealDialog.DevicePrivateKey> {
+    public DeviceUnsealDialog(List<String> operationFingerprints) {
+        super(operationFingerprints);
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+    }
+
+    @Override
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(DevicePane.DeviceOperation.GET_PRIVATE_KEY, device, defaultDevice);
+    }
+
+    @Subscribe
+    public void deviceGetPrivateKey(DeviceGetPrivateKeyEvent event) {
+        setResult(new DevicePrivateKey(event.getPrivateKey(), event.getScriptType()));
+    }
+
+    public record DevicePrivateKey(ECKey privateKey, ScriptType scriptType) {}
+}

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

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

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

@@ -9,9 +9,11 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.net.MempoolRateSize;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.application.Platform;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
@@ -30,11 +32,15 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-public class EntryCell extends TreeTableCell<Entry, Entry> {
+public class EntryCell extends TreeTableCell<Entry, Entry> implements ConfirmationsListener {
     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;
+
+    private IntegerProperty confirmationsProperty;
 
     public EntryCell() {
         super();
@@ -47,6 +53,12 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
     protected void updateItem(Entry entry, boolean empty) {
         super.updateItem(entry, empty);
 
+        //Return immediately to avoid CPU usage when updating the same invisible cell to determine tableview size (see https://bugs.openjdk.org/browse/JDK-8280442)
+        if(this == lastCell && !getTableRow().isVisible()) {
+            return;
+        }
+        lastCell = this;
+
         applyRowStyles(this, entry);
 
         if(empty) {
@@ -88,11 +100,12 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 actionBox.getChildren().add(viewTransactionButton);
 
                 BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
-                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                if(blockTransaction.getHeight() <= 0 && canRBF(blockTransaction) &&
+                        Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                     Button increaseFeeButton = new Button("");
                     increaseFeeButton.setGraphic(getIncreaseFeeRBFGlyph());
                     increaseFeeButton.setOnAction(event -> {
-                        increaseFee(transactionEntry);
+                        increaseFee(transactionEntry, false);
                     });
                     actionBox.getChildren().add(increaseFeeButton);
                 }
@@ -111,7 +124,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 NodeEntry nodeEntry = (NodeEntry)entry;
                 Address address = nodeEntry.getAddress();
                 setText(address.toString());
-                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry));
+                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry, true, getTreeTableView()));
                 Tooltip tooltip = new Tooltip();
                 tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(nodeEntry.getNode().toString());
@@ -136,6 +149,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                     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);
@@ -180,7 +194,22 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         }
     }
 
-    private static void increaseFee(TransactionEntry transactionEntry) {
+    @Override
+    public IntegerProperty getConfirmationsProperty() {
+        if(confirmationsProperty == null) {
+            confirmationsProperty = new SimpleIntegerProperty();
+            confirmationsProperty.addListener((observable, oldValue, newValue) -> {
+                if(newValue.intValue() >= BlockTransactionHash.BLOCKS_TO_CONFIRM) {
+                    getStyleClass().remove("confirming");
+                    confirmationsProperty.unbind();
+                }
+            });
+        }
+
+        return confirmationsProperty;
+    }
+
+    private static void increaseFee(TransactionEntry transactionEntry, boolean cancelTransaction) {
         BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
         Map<BlockTransactionHashIndex, WalletNode> walletTxos = transactionEntry.getWallet().getWalletTxos();
         List<BlockTransactionHashIndex> utxos = transactionEntry.getChildren().stream()
@@ -188,59 +217,89 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 .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());
 
+        if(utxos.isEmpty()) {
+            log.error("No UTXOs to replace");
+            AppServices.showErrorDialog("Replace By Fee Error", "Error creating RBF transaction - no replaceable UTXOs were found.");
+            return;
+        }
+
         List<TransactionOutput> ourOutputs = transactionEntry.getChildren().stream()
                 .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());
 
-        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
+        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());
-        Collections.shuffle(walletUtxos);
-        while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty()) {
-            //If there is insufficent 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);
         externalOutputs.addAll(consolidationOutputs);
+        final long rbfChange = changeTotal;
         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) {
-                    return new Payment(txOutput.getScript().getToAddress(), label, txOutput.getValue(), false);
+                    //Disable change creation by enabling max payment when there is only one output and no additional UTXOs included
+                    return new Payment(txOutput.getScript().getToAddress(), label, txOutput.getValue(), blockTransaction.getTransaction().getOutputs().size() == 1 && rbfChange == 0);
                 }
 
                 return null;
@@ -267,8 +326,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
             return;
         }
 
+        if(cancelTransaction) {
+            Payment existing = payments.get(0);
+            Address address = transactionEntry.getWallet().getFreshNode(KeyPurpose.CHANGE).getAddress();
+            Payment payment = new Payment(address, existing.getLabel(), existing.getAmount(), true);
+            payments.clear();
+            payments.add(payment);
+            opReturns.clear();
+        }
+
         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() {
@@ -284,30 +352,57 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         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.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
+        return wallet.getKeystores().size() == 1 && (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
     }
 
     private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
@@ -361,11 +456,11 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
     private String getTooltip(TransactionEntry transactionEntry) {
         String tooltip = transactionEntry.getBlockTransaction().getHash().toString();
         if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
-            if(!AppServices.getMempoolHistogram().isEmpty()) {
-                Set<MempoolRateSize> rateSizes = AppServices.getMempoolHistogram().get(AppServices.getMempoolHistogram().lastKey());
-                double vSize = transactionEntry.getBlockTransaction().getTransaction().getVirtualSize();
-                double feeRate = transactionEntry.getBlockTransaction().getFee() / vSize;
-                long vSizefromTip = rateSizes.stream().filter(rateSize -> rateSize.getFee() > feeRate).mapToLong(MempoolRateSize::getVSize).sum();
+            Double feeRate = transactionEntry.getBlockTransaction().getFeeRate();
+            Long vSizefromTip = transactionEntry.getVSizeFromTip();
+            if(feeRate != null && vSizefromTip != null) {
+                long blocksFromTip = (long)Math.ceil((double)vSizefromTip / Transaction.MAX_BLOCK_SIZE);
+
                 String amount = vSizefromTip + " vB";
                 if(vSizefromTip > 1000 * 1000) {
                     amount = String.format("%.2f", (double)vSizefromTip / (1000 * 1000)) + " MvB";
@@ -373,10 +468,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                     amount = String.format("%.2f", (double)vSizefromTip / 1000) + " kvB";
                 }
 
-                tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB (" + amount + " from tip)";
+                tooltip += "\nConfirms in: " + (blocksFromTip > 1 ? blocksFromTip + "+ blocks" : "1 block") + " (" + amount + " from tip)";
             }
 
-            tooltip += "\nRBF: " + (transactionEntry.getBlockTransaction().getTransaction().isReplaceByFee() ? "Enabled" : "Disabled");
+            if(feeRate != null) {
+                tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB";
+            }
+
+            tooltip += "\nRBF: " + (canRBF(transactionEntry.getBlockTransaction()) ? "Enabled" : "Disabled");
         }
 
         return tooltip;
@@ -394,6 +493,12 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         return increaseFeeGlyph;
     }
 
+    private static Glyph getCancelTransactionRBFGlyph() {
+        Glyph cancelTxGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.BAN);
+        cancelTxGlyph.setFontSize(12);
+        return cancelTxGlyph;
+    }
+
     private static Glyph getIncreaseFeeCPFPGlyph() {
         Glyph cpfpGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SIGN_OUT_ALT);
         cpfpGlyph.setFontSize(12);
@@ -447,17 +552,28 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
             });
             getItems().add(viewTransaction);
 
-            if(blockTransaction.getTransaction().isReplaceByFee() && 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 -> {
                     hide();
-                    increaseFee(transactionEntry);
+                    increaseFee(transactionEntry, false);
                 });
 
                 getItems().add(increaseFee);
             }
 
+            if(canRBF(blockTransaction) && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                MenuItem cancelTx = new MenuItem("Cancel Transaction (RBF)");
+                cancelTx.setGraphic(getCancelTransactionRBFGlyph());
+                cancelTx.setOnAction(AE -> {
+                    hide();
+                    increaseFee(transactionEntry, true);
+                });
+
+                getItems().add(cancelTx);
+            }
+
             if(containsWalletOutputs(transactionEntry)) {
                 MenuItem createCpfp = new MenuItem("Increase Effective Fee (CPFP)");
                 createCpfp.setGraphic(getIncreaseFeeCPFPGlyph());
@@ -469,6 +585,15 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 getItems().add(createCpfp);
             }
 
+            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 -> {
                 hide();
@@ -489,6 +614,16 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 hide();
                 EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
             });
+            getItems().add(viewTransaction);
+
+            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 -> {
@@ -497,6 +632,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 content.putString(date);
                 Clipboard.getSystemClipboard().setContent(content);
             });
+            getItems().add(copyDate);
 
             MenuItem copyTxid = new MenuItem("Copy Transaction ID");
             copyTxid.setOnAction(AE -> {
@@ -505,6 +641,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 content.putString(blockTransaction.getHashAsString());
                 Clipboard.getSystemClipboard().setContent(content);
             });
+            getItems().add(copyTxid);
 
             MenuItem copyHeight = new MenuItem("Copy Block Height");
             copyHeight.setOnAction(AE -> {
@@ -513,13 +650,12 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 content.putString(blockTransaction.getHeight() > 0 ? Integer.toString(blockTransaction.getHeight()) : "Mempool");
                 Clipboard.getSystemClipboard().setContent(content);
             });
-
-            getItems().addAll(viewTransaction, copyDate, copyTxid, copyHeight);
+            getItems().add(copyHeight);
         }
     }
 
     public static class AddressContextMenu extends ContextMenu {
-        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry) {
+        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());
@@ -537,11 +673,48 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 signVerifyMessage.setOnAction(AE -> {
                     hide();
                     MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                    messageSignDialog.initOwner(treetable.getScene().getWindow());
                     messageSignDialog.showAndWait();
                 });
                 getItems().add(signVerifyMessage);
             }
 
+            if(addUtxoItems && nodeEntry != null && !nodeEntry.getNode().getUnspentTransactionOutputs().isEmpty()) {
+                List<BlockTransactionHashIndex> utxos = nodeEntry.getNode().getUnspentTransactionOutputs().stream().collect(Collectors.toList());
+                MenuItem spendUtxos = new MenuItem("Spend UTXOs");
+                spendUtxos.setGraphic(getSendGlyph());
+                spendUtxos.setOnAction(AE -> {
+                    hide();
+                    EventManager.get().post(new SendActionEvent(nodeEntry.getWallet(), utxos));
+                    Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(nodeEntry.getWallet(), utxos)));
+                });
+                getItems().add(spendUtxos);
+
+                List<BlockTransactionHashIndex> unfrozenUtxos = nodeEntry.getNode().getUnspentTransactionOutputs().stream().filter(utxo -> utxo.getStatus() != Status.FROZEN).collect(Collectors.toList());
+                if(!unfrozenUtxos.isEmpty()) {
+                    MenuItem freezeUtxos = new MenuItem("Freeze UTXOs");
+                    freezeUtxos.setGraphic(getFreezeGlyph());
+                    freezeUtxos.setOnAction(AE -> {
+                        hide();
+                        unfrozenUtxos.forEach(utxo -> utxo.setStatus(Status.FROZEN));
+                        EventManager.get().post(new WalletUtxoStatusChangedEvent(nodeEntry.getWallet(), unfrozenUtxos));
+                    });
+                    getItems().add(freezeUtxos);
+                }
+
+                List<BlockTransactionHashIndex> frozenUtxos = nodeEntry.getNode().getUnspentTransactionOutputs().stream().filter(utxo -> utxo.getStatus() == Status.FROZEN).collect(Collectors.toList());
+                if(!frozenUtxos.isEmpty()) {
+                    MenuItem unfreezeUtxos = new MenuItem("Unfreeze UTXOs");
+                    unfreezeUtxos.setGraphic(getUnfreezeGlyph());
+                    unfreezeUtxos.setOnAction(AE -> {
+                        hide();
+                        frozenUtxos.forEach(utxo -> utxo.setStatus(null));
+                        EventManager.get().post(new WalletUtxoStatusChangedEvent(nodeEntry.getWallet(), frozenUtxos));
+                    });
+                    getItems().add(unfreezeUtxos);
+                }
+            }
+
             MenuItem copyAddress = new MenuItem("Copy Address");
             copyAddress.setOnAction(AE -> {
                 hide();
@@ -550,14 +723,6 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 Clipboard.getSystemClipboard().setContent(content);
             });
 
-            MenuItem copyHex = new MenuItem("Copy Script Output Bytes");
-            copyHex.setOnAction(AE -> {
-                hide();
-                ClipboardContent content = new ClipboardContent();
-                content.putString(Utils.bytesToHex(address.getOutputScriptData()));
-                Clipboard.getSystemClipboard().setContent(content);
-            });
-
             MenuItem copyOutputDescriptor = new MenuItem("Copy Output Descriptor");
             copyOutputDescriptor.setOnAction(AE -> {
                 hide();
@@ -566,11 +731,23 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 Clipboard.getSystemClipboard().setContent(content);
             });
 
-            getItems().addAll(copyAddress, copyHex, copyOutputDescriptor);
+            getItems().addAll(copyAddress, copyOutputDescriptor);
+
+            if(nodeEntry != null) {
+                MenuItem copyHex = new MenuItem("Copy Script Output Bytes");
+                copyHex.setOnAction(AE -> {
+                    hide();
+                    Script outputScript = nodeEntry.getWallet().getOutputScript(nodeEntry.getNode());
+                    ClipboardContent content = new ClipboardContent();
+                    content.putString(Utils.bytesToHex(outputScript.getProgram()));
+                    Clipboard.getSystemClipboard().setContent(content);
+                });
+                getItems().add(copyHex);
+            }
         }
     }
 
-    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());
@@ -626,6 +803,8 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         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");
@@ -637,13 +816,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
             if(entry instanceof TransactionEntry) {
                 cell.getStyleClass().add("transaction-row");
                 TransactionEntry transactionEntry = (TransactionEntry)entry;
-                if(transactionEntry.isConfirming()) {
-                    cell.getStyleClass().add("confirming");
-                    transactionEntry.confirmationsProperty().addListener((observable, oldValue, newValue) -> {
-                        if(!transactionEntry.isConfirming()) {
-                            cell.getStyleClass().remove("confirming");
-                        }
-                    });
+
+                if(cell instanceof ConfirmationsListener confirmationsListener) {
+                    if(transactionEntry.isConfirming()) {
+                        cell.getStyleClass().add("confirming");
+                        confirmationsListener.getConfirmationsProperty().bind(transactionEntry.confirmationsProperty());
+                    } else {
+                        confirmationsListener.getConfirmationsProperty().unbind();
+                    }
                 }
             } else if(entry instanceof NodeEntry) {
                 cell.getStyleClass().add("node-row");
@@ -659,6 +839,10 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 if(hashIndexEntry.isSpent()) {
                     cell.getStyleClass().add("spent");
                 }
+            } else if(entry instanceof WalletSummaryDialog.UnconfirmedEntry) {
+                cell.getStyleClass().add("unconfirmed-row");
+            } else if(entry instanceof WalletSummaryDialog.SummaryEntry) {
+                cell.getStyleClass().add("summary-row");
             }
         }
     }

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

@@ -0,0 +1,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);
+    }
+}

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

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

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

@@ -1,7 +1,9 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.CurrencyRate;
+import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.*;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
@@ -10,14 +12,9 @@ import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 
 import java.math.BigDecimal;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
 import java.util.Currency;
-import java.util.Locale;
 
 public class FiatLabel extends CopyableLabel {
-    private static final DecimalFormat CURRENCY_FORMAT = new DecimalFormat("#,##0.00", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
-
     private final LongProperty valueProperty = new SimpleLongProperty(-1);
     private final DoubleProperty btcRateProperty = new SimpleDoubleProperty(0.0);
     private final ObjectProperty<Currency> currencyProperty = new SimpleObjectProperty<>(null);
@@ -30,9 +27,9 @@ public class FiatLabel extends CopyableLabel {
 
     public FiatLabel(String text) {
         super(text);
-        valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue));
-        btcRateProperty().addListener((observable, oldValue, newValue) -> setValueAsText(getValue()));
-        currencyProperty().addListener((observable, oldValue, newValue) -> setValueAsText(getValue()));
+        valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getUnitFormat()));
+        btcRateProperty().addListener((observable, oldValue, newValue) -> setValueAsText(getValue(), Config.get().getUnitFormat()));
+        currencyProperty().addListener((observable, oldValue, newValue) -> setValueAsText(getValue(), Config.get().getUnitFormat()));
         tooltip = new Tooltip();
         contextMenu = new FiatContextMenu();
     }
@@ -83,14 +80,22 @@ public class FiatLabel extends CopyableLabel {
         setCurrency(currency);
     }
 
-    private void setValueAsText(long balance) {
+    public void refresh() {
+        refresh(Config.get().getUnitFormat());
+    }
+
+    public void refresh(UnitFormat unitFormat) {
+        setValueAsText(getValue(), unitFormat);
+    }
+
+    private void setValueAsText(long balance, UnitFormat unitFormat) {
         if(getCurrency() != null && getBtcRate() > 0.0) {
             BigDecimal satsBalance = BigDecimal.valueOf(balance);
             BigDecimal btcBalance = satsBalance.divide(BigDecimal.valueOf(Transaction.SATOSHIS_PER_BITCOIN));
             BigDecimal fiatBalance = btcBalance.multiply(BigDecimal.valueOf(getBtcRate()));
 
-            String label = getCurrency().getSymbol() + " " + CURRENCY_FORMAT.format(fiatBalance.doubleValue());
-            tooltip.setText("1 BTC = " + getCurrency().getSymbol() + " " + CURRENCY_FORMAT.format(getBtcRate()));
+            String label = getCurrency().getSymbol() + " " + unitFormat.formatCurrencyValue(fiatBalance.doubleValue());
+            tooltip.setText("1 BTC = " + getCurrency().getSymbol() + " " + unitFormat.formatCurrencyValue(getBtcRate()));
 
             setText(label);
             setTooltip(tooltip);

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

@@ -150,6 +150,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
 
     private void importQR() {
         QRScanDialog qrScanDialog = new QRScanDialog();
+        qrScanDialog.initOwner(this.getScene().getWindow());
         Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
         if(optionalResult.isPresent()) {
             QRScanDialog.Result result = optionalResult.get();
@@ -162,8 +163,8 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                     setError("Import Error", e.getMessage());
                 }
             } else if(result.outputDescriptor != null) {
-                wallets = List.of(result.outputDescriptor.toKeystoreWallet(null));
                 try {
+                    wallets = List.of(result.outputDescriptor.toWallet());
                     importFile(importer.getName(), null, null);
                 } catch(ImportException e) {
                     log.error("Error importing QR", e);
@@ -193,6 +194,10 @@ public abstract class FileImportPane extends TitledDescriptionPane {
         }
     }
 
+    protected List<Wallet> getScannedWallets() {
+        return wallets;
+    }
+
     protected Keystore getScannedKeystore(ScriptType scriptType) throws ImportException {
         if(wallets != null) {
             for(Wallet wallet : wallets) {
@@ -215,7 +220,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
 
     private Node getPasswordEntry(File file) {
         CustomPasswordField passwordField = new ViewPasswordField();
-        passwordField.setPromptText("Wallet password");
+        passwordField.setPromptText("Password");
         password.bind(passwordField.textProperty());
         HBox.setHgrow(passwordField, Priority.ALWAYS);
 

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

@@ -0,0 +1,175 @@
+package com.sparrowwallet.sparrow.control;
+
+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.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;
+import javafx.scene.control.Control;
+import javafx.scene.control.ToggleButton;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.controlsfx.control.SegmentedButton;
+import org.controlsfx.glyphfont.Glyph;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+
+public class FileKeystoreExportPane extends TitledDescriptionPane {
+    private final Keystore keystore;
+    private final KeystoreFileExport exporter;
+    private final boolean scannable;
+    private final boolean file;
+
+    public FileKeystoreExportPane(Keystore keystore, KeystoreFileExport exporter) {
+        super(exporter.getName(), "Keystore export", exporter.getKeystoreExportDescription(), "image/" + exporter.getWalletModel().getType() + ".png");
+        this.keystore = keystore;
+        this.exporter = exporter;
+        this.scannable = exporter.isKeystoreExportScannable();
+        this.file = exporter.isKeystoreExportFile();
+
+        buttonBox.getChildren().clear();
+        buttonBox.getChildren().add(createButton());
+    }
+
+    @Override
+    protected Control createButton() {
+        if(scannable && file) {
+            ToggleButton showButton = new ToggleButton("Show...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            showButton.setGraphic(cameraGlyph);
+            showButton.setOnAction(event -> {
+                showButton.setSelected(false);
+                exportQR();
+            });
+
+            ToggleButton fileButton = new ToggleButton("Export File...");
+            fileButton.setAlignment(Pos.CENTER_RIGHT);
+            fileButton.setOnAction(event -> {
+                fileButton.setSelected(false);
+                exportFile();
+            });
+
+            SegmentedButton segmentedButton = new SegmentedButton();
+            segmentedButton.getButtons().addAll(showButton, fileButton);
+            return segmentedButton;
+        } else if(scannable) {
+            Button showButton = new Button("Show...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            showButton.setGraphic(cameraGlyph);
+            showButton.setOnAction(event -> {
+                exportQR();
+            });
+            return showButton;
+        } else {
+            Button exportButton = new Button("Export File...");
+            exportButton.setAlignment(Pos.CENTER_RIGHT);
+            exportButton.setOnAction(event -> {
+                exportFile();
+            });
+            return exportButton;
+        }
+    }
+
+    private void exportQR() {
+        exportKeystore(null, keystore);
+    }
+
+    private void exportFile() {
+        Stage window = new Stage();
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Export " + exporter.getWalletModel().toDisplayString() + " File");
+        String extension = exporter.getExportFileExtension(keystore);
+        String fileName = keystore.getLabel();
+        fileChooser.setInitialFileName(fileName + (extension == null || extension.isEmpty() ? "" : "." + extension));
+
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            exportKeystore(file, keystore);
+        }
+    }
+
+    private void exportKeystore(File file, Keystore exportKeystore) {
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            exporter.exportKeystore(exportKeystore, baos);
+
+            if(exporter.requiresSignature()) {
+                String message = baos.toString(StandardCharsets.UTF_8);
+
+                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();
+
+                    Wallet wallet = new Wallet();
+                    wallet.setScriptType(ScriptType.P2PKH);
+                    wallet.getKeystores().add(keystore);
+                    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);
+                    }
+                } else if(keystore.getSource() == KeystoreSource.SW_SEED) {
+                    String signature = keystore.getExtendedPrivateKey().getKey().signMessage(message, ScriptType.P2PKH);
+                    exporter.addSignature(keystore, signature, baos);
+                } else {
+                    Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Cannot sign export",
+                            "Signing the " +  exporter.getName() + " export with " + keystore.getWalletModel().toDisplayString() + " is not supported." +
+                            "Proceed without signing?", ButtonType.NO, ButtonType.YES);
+                    if(optButtonType.isPresent() && optButtonType.get() == ButtonType.NO) {
+                        throw new RuntimeException("Export aborted due to lack of device message signing support.");
+                    }
+                }
+            }
+
+            if(file != null) {
+                try(OutputStream outputStream = new FileOutputStream(file)) {
+                    outputStream.write(baos.toByteArray());
+                    EventManager.get().post(new KeystoreExportEvent(exportKeystore));
+                }
+            } else {
+                QRDisplayDialog qrDisplayDialog;
+                if(exporter instanceof Bip129) {
+                    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) {
+            String errorMessage = e.getMessage();
+            if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                errorMessage = e.getCause().getMessage();
+            }
+            setError("Export Error", errorMessage);
+        }
+    }
+}

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

@@ -29,22 +29,9 @@ 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));
         }
     }
-
-    private static int getAccount(Wallet wallet, KeyDerivation requiredDerivation) {
-        if(wallet == null || requiredDerivation == null) {
-            return 0;
-        }
-
-        int account = wallet.getScriptType().getAccount(requiredDerivation.getDerivationPath());
-        if(account < 0) {
-            account = 0;
-        }
-
-        return account;
-    }
 }

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

@@ -1,7 +1,11 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.hummingbird.UR;
+import com.sparrowwallet.hummingbird.registry.CryptoOutput;
 import com.sparrowwallet.hummingbird.registry.RegistryType;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
@@ -10,6 +14,10 @@ import com.sparrowwallet.sparrow.event.TimedEvent;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import com.sparrowwallet.sparrow.io.bbqr.BBQR;
+import com.sparrowwallet.sparrow.io.bbqr.BBQRType;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Control;
@@ -21,18 +29,23 @@ import org.controlsfx.glyphfont.Glyph;
 
 import java.io.*;
 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;
     private final boolean scannable;
+    private final boolean file;
 
     public FileWalletExportPane(Wallet wallet, WalletExport exporter) {
-        super(exporter.getName(), "Wallet file export", exporter.getWalletExportDescription(), "image/" + exporter.getWalletModel().getType() + ".png");
+        super(exporter.getName(), "Wallet export", exporter.getWalletExportDescription(), "image/" + exporter.getWalletModel().getType() + ".png");
         this.wallet = wallet;
         this.exporter = exporter;
         this.scannable = exporter.isWalletExportScannable();
+        this.file = exporter.isWalletExportFile();
 
         buttonBox.getChildren().clear();
         buttonBox.getChildren().add(createButton());
@@ -40,7 +53,7 @@ public class FileWalletExportPane extends TitledDescriptionPane {
 
     @Override
     protected Control createButton() {
-        if(scannable) {
+        if(scannable && file) {
             ToggleButton showButton = new ToggleButton("Show...");
             Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
             cameraGlyph.setFontSize(12);
@@ -60,6 +73,15 @@ public class FileWalletExportPane extends TitledDescriptionPane {
             SegmentedButton segmentedButton = new SegmentedButton();
             segmentedButton.getButtons().addAll(showButton, fileButton);
             return segmentedButton;
+        } else if(scannable) {
+            Button showButton = new Button("Show...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            showButton.setGraphic(cameraGlyph);
+            showButton.setOnAction(event -> {
+                exportQR();
+            });
+            return showButton;
         } else {
             Button exportButton = new Button("Export File...");
             exportButton.setAlignment(Pos.CENTER_RIGHT);
@@ -80,9 +102,11 @@ public class FileWalletExportPane extends TitledDescriptionPane {
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Export " + exporter.getWalletModel().toDisplayString() + " File");
         String extension = exporter.getExportFileExtension(wallet);
-        String fileName = wallet.getFullName() + "-" + exporter.getWalletModel().toDisplayString().toLowerCase().replace(" ", "");
-        if(exporter instanceof Sparrow) {
-            fileName = wallet.getMasterName();
+        String walletModel = exporter.getWalletModel().toDisplayString().toLowerCase(Locale.ROOT).replace(" ", "");
+        String postfix = walletModel.equals(extension) ? "" : "-" + walletModel;
+        String fileName = wallet.getFullName() + postfix;
+        if(exporter.exportsAllWallets()) {
+            fileName = wallet.getMasterName() + postfix;
         }
         fileChooser.setInitialFileName(fileName + (extension == null || extension.isEmpty() ? "" : "." + extension));
 
@@ -97,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"));
@@ -119,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) {
+                } 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) {
@@ -149,6 +188,42 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 errorMessage = e.getCause().getMessage();
             }
             setError("Export Error", errorMessage);
+        } finally {
+            if(file == null && password != null) {
+                exportWallet.clearPrivate();
+            }
+        }
+    }
+
+    public static class FileWalletExportService extends Service<Void> {
+        private final WalletExport exporter;
+        private final File file;
+        private final Wallet wallet;
+        private final String password;
+
+        public FileWalletExportService(WalletExport exporter, File file, Wallet wallet, String password) {
+            this.exporter = exporter;
+            this.file = file;
+            this.wallet = wallet;
+            this.password = password;
+        }
+
+        @Override
+        protected Task<Void> createTask() {
+            return new Task<>() {
+                @Override
+                protected Void call() throws Exception {
+                    try(OutputStream outputStream = new FileOutputStream(file)) {
+                        exporter.exportWallet(wallet, outputStream, password);
+                    } finally {
+                        if(password != null) {
+                            wallet.clearPrivate();
+                        }
+                    }
+
+                    return null;
+                }
+            };
         }
     }
 }

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

@@ -12,13 +12,19 @@ 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;
     }
 
     @Override
     protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
-        Wallet wallet = importer.importWallet(inputStream, password);
+        Wallet wallet;
+        if(getScannedWallets() != null && !getScannedWallets().isEmpty()) {
+            wallet = getScannedWallets().iterator().next();
+        } else {
+            wallet = importer.importWallet(inputStream, password);
+        }
+
         if(wallet.getName() == null) {
             wallet.setName(fileName);
         }

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

@@ -0,0 +1,83 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.beans.NamedArg;
+import javafx.scene.control.Spinner;
+import javafx.scene.control.SpinnerValueFactory;
+import javafx.util.converter.IntegerStringConverter;
+
+public class IntegerSpinner extends Spinner<Integer> {
+    public IntegerSpinner() {
+        super();
+        setupEditor();
+    }
+
+    public IntegerSpinner(@NamedArg("min") int min,
+                          @NamedArg("max") int max,
+                          @NamedArg("initialValue") int initialValue) {
+        super(min, max, initialValue);
+        setupEditor();
+    }
+
+    public IntegerSpinner(@NamedArg("min") int min,
+                          @NamedArg("max") int max,
+                          @NamedArg("initialValue") int initialValue,
+                          @NamedArg("amountToStepBy") int amountToStepBy) {
+        super(min, max, initialValue, amountToStepBy);
+        setupEditor();
+    }
+
+    private void setupEditor() {
+        getEditor().focusedProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null && !newValue) {
+                commitValue();
+            }
+        });
+        getEditor().textProperty().addListener((observable, oldValue, newValue) -> {
+            if(!newValue.matches("\\d*")) {
+                getEditor().setText(newValue.replaceAll("[^\\d]", ""));
+            }
+        });
+    }
+
+    public static class ValueFactory extends SpinnerValueFactory.IntegerSpinnerValueFactory {
+        public ValueFactory(@NamedArg("min") int min,
+                            @NamedArg("max") int max) {
+            super(min, max);
+            setupConverter(min);
+        }
+
+        public ValueFactory(@NamedArg("min") int min,
+                            @NamedArg("max") int max,
+                            @NamedArg("initialValue") int initialValue) {
+            super(min, max, initialValue);
+            setupConverter(initialValue);
+        }
+
+        public ValueFactory(@NamedArg("min") int min,
+                            @NamedArg("max") int max,
+                            @NamedArg("initialValue") int initialValue,
+                            @NamedArg("amountToStepBy") int amountToStepBy) {
+            super(min, max, initialValue, amountToStepBy);
+            setupConverter(initialValue);
+        }
+
+        private void setupConverter(Integer defaultValue) {
+            setConverter(new IntegerStringConverter() {
+                @Override
+                public Integer fromString(String value) {
+                    if(value == null) {
+                        return null;
+                    }
+
+                    value = value.trim();
+
+                    if(value.length() < 1) {
+                        return defaultValue;
+                    }
+
+                    return Integer.valueOf(value);
+                }
+            });
+        }
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.KeystoreExportEvent;
+import com.sparrowwallet.sparrow.io.*;
+import javafx.scene.control.*;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.StackPane;
+
+import java.util.Comparator;
+import java.util.List;
+
+public class KeystoreExportDialog extends Dialog<Keystore> {
+    public KeystoreExportDialog(Keystore keystore) {
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        StackPane stackPane = new StackPane();
+        dialogPane.setContent(stackPane);
+
+        AnchorPane anchorPane = new AnchorPane();
+        stackPane.getChildren().add(anchorPane);
+
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.setPrefHeight(200);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        anchorPane.getChildren().add(scrollPane);
+        scrollPane.setFitToWidth(true);
+        AnchorPane.setLeftAnchor(scrollPane, 0.0);
+        AnchorPane.setRightAnchor(scrollPane, 0.0);
+
+        List<KeystoreFileExport> exporters = List.of(new Bip129());
+
+        Accordion exportAccordion = new Accordion();
+        for(KeystoreFileExport exporter : exporters) {
+            if(!exporter.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
+                FileKeystoreExportPane exportPane = new FileKeystoreExportPane(keystore, exporter);
+                exportAccordion.getPanes().add(exportPane);
+            }
+        }
+
+        exportAccordion.getPanes().sort(Comparator.comparing(o -> ((TitledDescriptionPane) o).getTitle()));
+        scrollPane.setContent(exportAccordion);
+
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialogPane.getButtonTypes().addAll(cancelButtonType);
+        dialogPane.setPrefWidth(500);
+        dialogPane.setPrefHeight(280);
+        AppServices.moveToActiveWindowScreen(this);
+
+        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? keystore : null);
+    }
+
+    @Subscribe
+    public void keystoreExported(KeystoreExportEvent event) {
+        setResult(event.getKeystore());
+    }
+}

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

@@ -1,20 +1,23 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.application.Platform;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Dialog;
-import javafx.scene.control.DialogPane;
-import javafx.scene.control.Label;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
 
 public class KeystorePassphraseDialog extends Dialog<String> {
     private final CustomPasswordField passphrase;
+    private final ObjectProperty<byte[]> masterFingerprint = new SimpleObjectProperty<>();
 
     public KeystorePassphraseDialog(Keystore keystore) {
         this(null, keystore);
@@ -45,10 +48,38 @@ public class KeystorePassphraseDialog extends Dialog<String> {
         content.setPrefHeight(50);
         content.getChildren().add(passphrase);
 
+        passphrase.textProperty().addListener((observable, oldValue, passphrase) -> {
+            masterFingerprint.set(getMasterFingerprint(keystore, passphrase));
+        });
+
+        HBox fingerprintBox = new HBox(10);
+        fingerprintBox.setAlignment(Pos.CENTER_LEFT);
+        Label fingerprintLabel = new Label("Master fingerprint:");
+        TextField fingerprintHex = new TextField();
+        fingerprintHex.setDisable(true);
+        fingerprintHex.setMaxWidth(80);
+        fingerprintHex.getStyleClass().addAll("fixed-width");
+        fingerprintHex.setStyle("-fx-opacity: 0.6");
+        masterFingerprint.addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                fingerprintHex.setText(Utils.bytesToHex(newValue));
+            }
+        });
+        LifeHashIcon lifeHashIcon = new LifeHashIcon();
+        lifeHashIcon.dataProperty().bind(masterFingerprint);
+        HelpLabel helpLabel = new HelpLabel();
+        helpLabel.setHelpText("All passphrases create valid wallets." +
+                "\nThe master fingerprint identifies the keystore and changes as the passphrase changes." +
+                "\n" + (confirm ? "Take a moment to identify it before proceeding." : "Make sure you recognise it before proceeding."));
+        fingerprintBox.getChildren().addAll(fingerprintLabel, fingerprintHex, lifeHashIcon, helpLabel);
+        content.getChildren().add(fingerprintBox);
+
+        masterFingerprint.set(getMasterFingerprint(keystore, ""));
+
         Glyph warnGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
         warnGlyph.getStyleClass().add("warn-icon");
         warnGlyph.setFontSize(12);
-        Label warnLabel = new Label("A BIP39 passphrase is not a wallet password!", warnGlyph);
+        Label warnLabel = new Label((confirm ? "Note" : "Check") + " the master fingerprint before proceeding!", warnGlyph);
         warnLabel.setGraphicTextGap(5);
         content.getChildren().add(warnLabel);
 
@@ -57,4 +88,14 @@ public class KeystorePassphraseDialog extends Dialog<String> {
 
         setResultConverter(dialogButton -> dialogButton == ButtonType.OK ? passphrase.getText() : null);
     }
+
+    private byte[] getMasterFingerprint(Keystore keystore, String passphrase) {
+        try {
+            Keystore copyKeystore = keystore.copy();
+            copyKeystore.getSeed().setPassphrase(passphrase);
+            return copyKeystore.getExtendedMasterPrivateKey().getKey().getFingerprint();
+        } catch(MnemonicException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

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

@@ -1,6 +1,10 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
 import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.application.Platform;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.event.Event;
 import javafx.scene.control.*;
 import javafx.scene.control.cell.TextFieldTreeTableCell;
@@ -13,9 +17,11 @@ import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Field;
 
-class LabelCell extends TextFieldTreeTableCell<Entry, String> {
+class LabelCell extends TextFieldTreeTableCell<Entry, String> implements ConfirmationsListener {
     private static final Logger log = LoggerFactory.getLogger(LabelCell.class);
 
+    private IntegerProperty confirmationsProperty;
+
     public LabelCell() {
         super(new DefaultStringConverter());
         getStyleClass().add("label-cell");
@@ -60,6 +66,7 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
         }
 
         super.commitEdit(label);
+        Platform.runLater(() -> getTreeTableView().requestFocus());
     }
 
     @Override
@@ -81,6 +88,21 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
         }
     }
 
+    @Override
+    public IntegerProperty getConfirmationsProperty() {
+        if(confirmationsProperty == null) {
+            confirmationsProperty = new SimpleIntegerProperty();
+            confirmationsProperty.addListener((observable, oldValue, newValue) -> {
+                if(newValue.intValue() >= BlockTransactionHash.BLOCKS_TO_CONFIRM) {
+                    getStyleClass().remove("confirming");
+                    confirmationsProperty.unbind();
+                }
+            });
+        }
+
+        return confirmationsProperty;
+    }
+
     private static class LabelContextMenu extends ContextMenu {
         public LabelContextMenu(Entry entry, String label) {
             MenuItem copyLabel = new MenuItem("Copy Label");

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

@@ -0,0 +1,70 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.sparrow.io.ImageUtils;
+import com.sparrowwallet.toucan.LifeHash;
+import com.sparrowwallet.toucan.LifeHashVersion;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.embed.swing.SwingFXUtils;
+import javafx.scene.Group;
+import javafx.scene.image.Image;
+import javafx.scene.paint.Color;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.shape.Rectangle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.image.BufferedImage;
+import java.util.Arrays;
+
+public class LifeHashIcon extends Group {
+    private static final Logger log = LoggerFactory.getLogger(LifeHashIcon.class);
+
+    private static final int SIZE = 24;
+
+    private final ObjectProperty<byte[]> dataProperty = new SimpleObjectProperty<>(null);
+
+    public LifeHashIcon() {
+        super();
+
+        dataProperty.addListener((observable, oldValue, data) -> {
+            if(data == null) {
+                getChildren().clear();
+            } else if(oldValue == null || !Arrays.equals(oldValue, data)) {
+                LifeHash.Image lifeHashImage = LifeHash.makeFromData(data, LifeHashVersion.VERSION2, 1, false);
+                BufferedImage bufferedImage = LifeHash.getBufferedImage(lifeHashImage);
+                BufferedImage resizedImage = ImageUtils.resizeToImage(bufferedImage, SIZE, SIZE);
+                Image image = SwingFXUtils.toFXImage(resizedImage, null);
+                setImage(image);
+            }
+        });
+    }
+
+    private void setImage(Image image) {
+        getChildren().clear();
+        Rectangle rectangle = new Rectangle(SIZE, SIZE);
+        rectangle.setArcWidth(6);
+        rectangle.setArcHeight(6);
+        rectangle.setFill(new ImagePattern(image));
+        rectangle.setStroke(Color.rgb(65, 72, 77));
+        rectangle.setStrokeWidth(1.0);
+        getChildren().add(rectangle);
+    }
+
+    public byte[] getData() {
+        return dataProperty.get();
+    }
+
+    public ObjectProperty<byte[]> dataProperty() {
+        return dataProperty;
+    }
+
+    public void setData(byte[] data) {
+        this.dataProperty.set(data);
+    }
+
+    public void setHex(String hex) {
+        setData(hex == null ? null : Utils.hexToBytes(hex));
+    }
+}

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

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

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

@@ -5,19 +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.Keystore;
-import com.sparrowwallet.drongo.wallet.KeystoreSource;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.drongo.wallet.WalletNode;
+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.*;
@@ -25,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,8 +35,11 @@ import tornadofx.control.Form;
 import java.security.SignatureException;
 import java.util.Arrays;
 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);
 
@@ -48,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;
 
     /**
@@ -91,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;
@@ -127,6 +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 singlesig addresses can sign"));
         addressField.getInputs().add(address);
 
         if(walletNode != null) {
@@ -137,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();
@@ -155,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);
@@ -177,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);
@@ -184,7 +186,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         if(buttons.length > 0) {
             dialogPane.getButtonTypes().addAll(buttons);
 
-            ButtonType customSignButtonType = Arrays.stream(buttons).filter(buttonType -> buttonType.getText().toLowerCase().contains("sign")).findFirst().orElse(null);
+            ButtonType customSignButtonType = Arrays.stream(buttons).filter(buttonType -> buttonType.getText().toLowerCase(Locale.ROOT).contains("sign")).findFirst().orElse(null);
             if(customSignButtonType != null) {
                 Button customSignButton = (Button)dialogPane.lookupButton(customSignButtonType);
                 customSignButton.setDefaultButton(true);
@@ -195,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();
             });
@@ -210,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();
@@ -221,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
                     }
@@ -250,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()) {
@@ -259,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);
+            }
         });
     }
 
@@ -267,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) {
-            throw new IllegalArgumentException("Cannot sign messages using a wallet without private keys or a USB 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 {
@@ -280,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;
+            return address.getScriptType().isAllowed(PolicyType.SINGLE) || address.getScriptType() == ScriptType.P2SH;
         } catch (InvalidAddressException e) {
             return false;
         }
@@ -303,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()) {
@@ -317,8 +355,8 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             } else {
                 signUnencryptedKeystore(signingWallet);
             }
-        } else if(signingWallet.containsSource(KeystoreSource.HW_USB)) {
-            signUsbKeystore(signingWallet);
+        } else if(signingWallet.containsSource(KeystoreSource.HW_USB) || wallet.getKeystores().get(0).getWalletModel().isCard()) {
+            signDeviceKeystore(signingWallet);
         }
     }
 
@@ -326,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();
@@ -337,10 +381,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         }
     }
 
-    private void signUsbKeystore(Wallet usbWallet) {
-        List<String> fingerprints = List.of(usbWallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint());
-        KeyDerivation fullDerivation = usbWallet.getKeystores().get(0).getKeyDerivation().extend(walletNode.getDerivation());
-        DeviceSignMessageDialog deviceSignMessageDialog = new DeviceSignMessageDialog(fingerprints, usbWallet, message.getText().trim(), fullDerivation);
+    private void signDeviceKeystore(Wallet deviceWallet) {
+        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();
@@ -354,31 +399,42 @@ 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
                 }
             }
 
             if(verified) {
-                Alert alert = new Alert(Alert.AlertType.INFORMATION);
-                AppServices.setStageIcon(alert.getDialogPane().getScene().getWindow());
-                alert.setTitle("Verification Succeeded");
-                alert.setHeaderText("Verification Succeeded");
-                alert.setContentText("The signature verified against the message.");
-                AppServices.moveToActiveWindowScreen(alert);
-                alert.showAndWait();
+                AppServices.showSuccessDialog("Verification Succeeded", "The signature verified against the message.");
             } else {
-                AppServices.showErrorDialog("Verification failed", "The provided signature did not match the message for this address.");
+                AppServices.showErrorDialog("Verification Failed", "The provided signature did not match the message for this address.");
             }
         } catch(IllegalArgumentException e) {
             AppServices.showErrorDialog("Could not verify message", e.getMessage());
@@ -402,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);
@@ -411,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());
@@ -422,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();

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

@@ -17,6 +17,8 @@ import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.tools.Platform;
 
+import java.util.Locale;
+
 public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
     private static final int ERROR_DISPLAY_MILLIS = 5 * 60 * 1000;
 
@@ -68,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.
@@ -114,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() + 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);

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

@@ -0,0 +1,429 @@
+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;
+import com.sparrowwallet.sparrow.io.PdfUtils;
+import javafx.beans.binding.Bindings;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+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 java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.stream.Collectors;
+
+
+public class MnemonicGridDialog extends Dialog<List<String>> {
+    private final SpreadsheetView spreadsheetView;
+
+    private final int GRID_COLUMN_COUNT = 16;
+
+    private final BooleanProperty initializedProperty = new SimpleBooleanProperty(false);
+    private final BooleanProperty wordsSelectedProperty = new SimpleBooleanProperty(false);
+
+    private final ObservableList<TablePosition> selectedCells = FXCollections.observableArrayList();
+
+    public MnemonicGridDialog() {
+        DialogPane dialogPane = new MnemonicGridDialogPane();
+        setDialogPane(dialogPane);
+        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.\nThe order of selection is important!");
+        javafx.scene.image.Image image = new Image("/image/border-wallets.png");
+        dialogPane.setGraphic(new ImageView(image));
+
+        String[][] emptyWordGrid = new String[128][GRID_COLUMN_COUNT];
+        Grid grid = getGrid(emptyWordGrid);
+
+        spreadsheetView = new SpreadsheetView(grid);
+        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.wasAdded()) {
+                        for(TablePosition<?, ?> pos : c.getAddedSubList()) {
+                            if(selectedCells.contains(pos)) {
+                                selectedCells.remove(pos);
+                            } else {
+                                selectedCells.add(pos);
+                            }
+                        }
+                    }
+                }
+
+                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);
+
+        stackPane.widthProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                for(SpreadsheetColumn column : spreadsheetView.getColumns()) {
+                    column.setPrefWidth((newValue.doubleValue() - spreadsheetView.getRowHeaderWidth() - 3) / 17);
+                }
+            }
+        });
+
+        dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        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_2);
+        dialogPane.getButtonTypes().add(generateButtonType);
+
+        final ButtonType clearButtonType = new javafx.scene.control.ButtonType("Clear Selection", ButtonBar.ButtonData.OTHER);
+        dialogPane.getButtonTypes().add(clearButtonType);
+
+        Button okButton = (Button)dialogPane.lookupButton(ButtonType.OK);
+        okButton.disableProperty().bind(Bindings.not(Bindings.and(initializedProperty, wordsSelectedProperty)));
+
+        setResultConverter((dialogButton) -> {
+            ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
+            return data == ButtonBar.ButtonData.OK_DONE ? getSelectedWords() : null;
+        });
+
+        dialogPane.setPrefWidth(952);
+        dialogPane.setPrefHeight(500);
+        dialogPane.setMinHeight(dialogPane.getPrefHeight());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.moveToActiveWindowScreen(this);
+    }
+
+    private Grid getGrid(String[][] wordGrid) {
+        int rowCount = wordGrid.length;
+        int columnCount = wordGrid[0].length;
+        GridBase grid = new GridBase(rowCount, columnCount);
+        ObservableList<ObservableList<SpreadsheetCell>> rows = FXCollections.observableArrayList();
+        grid.getColumnHeaders().setAll("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P");
+        for(int i = 0; i < rowCount; i++) {
+            final ObservableList<SpreadsheetCell> list = FXCollections.observableArrayList();
+            for(int j = 0; j < columnCount; j++) {
+                list.add(createCell(i, j, wordGrid[i][j]));
+            }
+            rows.add(list);
+            grid.getRowHeaders().add(String.format("%03d", i + 1));
+        }
+        grid.setRows(rows);
+
+        return grid;
+    }
+
+    private SpreadsheetCell createCell(int row, int column, String word) {
+        return SpreadsheetCellType.STRING.createCell(row, column, 1, 1, word == null ? "" : word);
+    }
+
+    private List<String> getSelectedWords() {
+        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) {
+            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);
+                    }
+                }
+            }
+        }
+
+        if(words.size() != abbreviations.size()) {
+            abbreviations.removeIf(abbr -> words.stream().anyMatch(w -> w.startsWith(abbr)));
+            throw new IllegalStateException("Could not find words for abbreviations: " + abbreviations);
+        }
+
+        return words;
+    }
+
+    public List<String> shuffle(List<String> mnemonic) {
+        String mnemonicString = String.join(" ", mnemonic);
+        List<String> words = new ArrayList<>(Bip39MnemonicCode.INSTANCE.getWordList());
+
+        UltraHighEntropyPrng uhePrng = new UltraHighEntropyPrng();
+        uhePrng.initState();
+        uhePrng.hashString(mnemonicString);
+        for(int i = words.size() - 1; i > 0; i--) {
+            int j = (int)uhePrng.random(i + 1);
+            String tmp = words.get(i);
+            words.set(i, words.get(j));
+            words.set(j, tmp);
+        }
+
+        return words;
+    }
+
+    private String[][] toGrid(List<String> words) {
+        String[][] grid = new String[words.size()/GRID_COLUMN_COUNT][GRID_COLUMN_COUNT];
+
+        int row = 0;
+        int col = 0;
+        for(String word : words) {
+            String abbr = word.length() < 4 ? word : word.substring(0, 4);
+            grid[row][col] = abbr;
+            col++;
+            if(col >= GRID_COLUMN_COUNT) {
+                col = 0;
+                row++;
+            }
+        }
+
+        return grid;
+    }
+
+    private class MnemonicGridDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            Node button;
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                Button loadButton = new Button(buttonType.getText());
+                loadButton.setGraphicTextGap(5);
+                loadButton.setGraphic(getGlyph(FontAwesome5.Glyph.ARROW_UP));
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(loadButton, buttonData);
+                loadButton.setOnAction(event -> {
+                    FileChooser fileChooser = new FileChooser();
+                    fileChooser.setTitle("Open PDF");
+                    fileChooser.getExtensionFilters().addAll(
+                            new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                            new FileChooser.ExtensionFilter("PDF", "*.pdf")
+                    );
+
+                    AppServices.moveToActiveWindowScreen(this.getScene().getWindow(), 800, 450);
+                    File file = fileChooser.showOpenDialog(this.getScene().getWindow());
+                    if(file != null) {
+                        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());
+                        }
+                    }
+                });
+
+                button = loadButton;
+            } 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("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()) {
+                            PdfUtils.saveWordGrid(wordGrid, mnemonicWords);
+                        }
+                    }
+                });
+
+                button = generateButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.OTHER) {
+                Button clearButton = new Button(buttonType.getText());
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(clearButton, buttonData);
+                clearButton.setOnAction(event -> {
+                    selectedCells.clear();
+                    spreadsheetView.getSelectionModel().clearSelection();
+                });
+
+                button = clearButton;
+            } else {
+                button = super.createButton(buttonType);
+            }
+
+            return button;
+        }
+
+        private Glyph getGlyph(FontAwesome5.Glyph glyphName) {
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
+            glyph.setFontSize(11);
+            return glyph;
+        }
+    }
+
+    public static class UltraHighEntropyPrng {
+        private final int order;
+        private double carry;
+        private int phase;
+        private final double[] intermediates;
+        private int i, j, k; // general purpose locals
+
+        public UltraHighEntropyPrng() {
+            order = 48; // set the 'order' number of ENTROPY-holding 32-bit values
+            carry = 1; // init the 'carry' used by the multiply-with-carry (MWC) algorithm
+            phase = order; // init the 'phase' (max-1) of the intermediate variable pointer
+            intermediates = new double[order]; // declare our intermediate variables array
+
+            for(i = 0; i < order; i++) {
+                // Used to simulate javascript's Math.random
+                Random random = new Random();
+                intermediates[i] = mash(random.nextInt(Integer.MAX_VALUE)); // fill the array with initial mash hash values
+            }
+        }
+
+        public double random(int range) {
+            return Math.floor(range * (rawPrng() + ((long)(rawPrng() * 0x200000L)) * 1.1102230246251565e-16)); // 2^-53
+        }
+
+        private String randomString(int count) {
+            StringBuilder stringBuilder = new StringBuilder();
+            for(i = 0; i < count; i++) {
+                char newChar = (char) (33 + random(94));
+                stringBuilder.append(newChar);
+            }
+            return stringBuilder.toString();
+        }
+
+        private double rawPrng() {
+            if(++phase >= order) {
+                phase = 0;
+            }
+            double t = 1768863 * intermediates[phase] + carry * 2.3283064365386963e-10; // 2^-32
+            long temp = (long)t;
+            return intermediates[phase] = t - (carry = temp);
+        }
+
+        private void hash(String args) {
+            for(i = 0; i < args.length(); i++) {
+                for(j = 0; j < order; j++) {
+                    intermediates[j] -= mash(args.charAt(i));
+                    if(intermediates[j] < 0) {
+                        intermediates[j] = intermediates[j] + 1;
+                    }
+                }
+            }
+        }
+
+        public void hashString(String input) {
+            mash(input); // use the string to evolve the 'mash' state
+
+            char[] inputAry = input.toCharArray();
+            for(i = 0; i < inputAry.length; i++) // scan through the characters in our string
+            {
+                k = inputAry[i]; // get the character code at the location
+                for(j = 0; j < order; j++) // "mash" it into the UHEPRNG state
+                {
+                    intermediates[j] -= mash(k);
+                    if(intermediates[j] < 0) {
+                        intermediates[j] += 1;
+                    }
+                }
+            }
+        }
+
+        public void initState() {
+            mash(null);
+            for(i = 0; i < order; i++) {
+                intermediates[i] = mash(' '); // fill the array with initial mash hash values
+            }
+            carry = 1; // init our multiply-with-carry carry
+            phase = order; // init our phase
+        }
+
+        double n = Integer.toUnsignedLong(0xefc8249d);
+
+        private double mash(Object data) {
+            if(data != null) {
+                String strData = data.toString();
+                for(int i = 0; i < strData.length(); i++) {
+                    n += strData.charAt(i);
+                    double h = 0.02519603282416938 * n;
+                    n = Integer.toUnsignedLong((int)h);
+                    h -= n;
+                    h *= n;
+                    n = Integer.toUnsignedLong((int)h);
+                    h -= n;
+                    n += h * 0x100000000L; // 2^32
+                }
+                return ((long)n) * 2.3283064365386963e-10; // 2^-32
+            } else {
+                n = Integer.toUnsignedLong(0xefc8249d);
+            }
+
+            return n;
+        }
+    }
+}

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

@@ -1,6 +1,5 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.drongo.wallet.DeterministicSeed;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.WalletModel;
 import javafx.beans.property.SimpleListProperty;
@@ -17,26 +16,15 @@ import java.util.List;
 
 public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
     public MnemonicKeystoreDisplayPane(Keystore keystore) {
-        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
+        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() && (keystore.getSeed().getPassphrase() == null || keystore.getSeed().getPassphrase().length() > 0) ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
         showHideLink.setVisible(false);
         buttonBox.getChildren().clear();
 
         showWordList(keystore.getSeed());
     }
 
-    private void showWordList(DeterministicSeed seed) {
-        List<String> words = seed.getMnemonicCode();
-        setContent(getMnemonicWordsEntry(words.size()));
-        setExpanded(true);
-
-        for(int i = 0; i < wordsPane.getChildren().size(); i++) {
-            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
-            wordEntry.getEditor().setText(words.get(i));
-            wordEntry.getEditor().setEditable(false);
-        }
-    }
-
-    protected Node getMnemonicWordsEntry(int numWords) {
+    @Override
+    protected Node getMnemonicWordsEntry(int numWords, boolean showPassphrase, boolean editPassphrase) {
         VBox vBox = new VBox();
         vBox.setSpacing(10);
 

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

@@ -0,0 +1,95 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.util.List;
+
+public class MnemonicKeystoreEntryPane extends MnemonicKeystorePane {
+    private final BooleanProperty validProperty = new SimpleBooleanProperty(false);
+
+    private boolean generated;
+
+    public MnemonicKeystoreEntryPane(String name, int numWords) {
+        super(name, "Enter seed words", "", "image/" + WalletModel.SEED.getType() + ".png");
+        showHideLink.setVisible(false);
+        buttonBox.getChildren().clear();
+
+        defaultWordSizeProperty.set(numWords);
+        setDescription("Generate new or enter existing");
+        showHideLink.setVisible(false);
+        setContent(getMnemonicWordsEntry(numWords, false, true));
+        setExpanded(true);
+    }
+
+    @Override
+    protected List<Node> createRightButtons() {
+        Button button = new Button("Next");
+        button.setVisible(false);
+        return List.of(button);
+    }
+
+    @Override
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        if(!empty && validWords) {
+            try {
+                Bip39MnemonicCode.INSTANCE.check(wordEntriesProperty.get());
+                validChecksum = true;
+            } catch(MnemonicException e) {
+                invalidLabel.setText("Invalid checksum");
+                invalidLabel.setTooltip(null);
+            }
+        }
+
+        validProperty.set(validChecksum);
+        validLabel.setVisible(validChecksum);
+        invalidLabel.setVisible(!validChecksum && !empty);
+    }
+
+    public void generateNew() {
+        int mnemonicSeedLength = wordEntriesProperty.get().size() * 11;
+        int entropyLength = mnemonicSeedLength - (mnemonicSeedLength/33);
+
+        SecureRandom secureRandom;
+        try {
+            secureRandom = SecureRandom.getInstanceStrong();
+        } catch(NoSuchAlgorithmException e) {
+            secureRandom = new SecureRandom();
+        }
+
+        DeterministicSeed deterministicSeed = new DeterministicSeed(secureRandom, entropyLength, "");
+        displayMnemonicCode(deterministicSeed);
+        generated = true;
+    }
+
+    private void displayMnemonicCode(DeterministicSeed deterministicSeed) {
+        setDescription("Write down these words");
+        showHideLink.setVisible(false);
+
+        for (int i = 0; i < wordsPane.getChildren().size(); i++) {
+            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+            wordEntry.getEditor().setText(deterministicSeed.getMnemonicCode().get(i));
+            wordEntry.getEditor().setEditable(false);
+        }
+    }
+
+    public boolean isValid() {
+        return validProperty.get();
+    }
+
+    public BooleanProperty validProperty() {
+        return validProperty;
+    }
+
+    public boolean isGenerated() {
+        return generated;
+    }
+}

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

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

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

@@ -1,6 +1,8 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
@@ -10,6 +12,8 @@ import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
+import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Task;
 import javafx.geometry.Insets;
 import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
@@ -18,28 +22,31 @@ import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.layout.*;
 import javafx.util.Callback;
+import javafx.util.Duration;
 import org.controlsfx.control.textfield.AutoCompletionBinding;
-import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
 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 java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
+
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
 
 public class MnemonicKeystorePane extends TitledDescriptionPane {
+    private static final Logger log = LoggerFactory.getLogger(MnemonicKeystorePane.class);
+
     protected SplitMenuButton enterMnemonicButton;
     protected TilePane wordsPane;
     protected Label validLabel;
     protected Label invalidLabel;
 
     protected SimpleListProperty<String> wordEntriesProperty;
-    protected final SimpleStringProperty passphraseProperty = new SimpleStringProperty();
+    protected final SimpleStringProperty passphraseProperty = new SimpleStringProperty("");
     protected IntegerProperty defaultWordSizeProperty;
 
     public MnemonicKeystorePane(String title, String description, String content, String imageUrl) {
@@ -73,17 +80,97 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
             });
             enterMnemonicButton.getItems().add(item);
         }
+        enterMnemonicButton.getItems().add(new SeparatorMenuItem());
+        MenuItem gridItem = new MenuItem("Border Wallets Grid...");
+        gridItem.setOnAction(event -> {
+            showGrid();
+        });
+        enterMnemonicButton.getItems().add(gridItem);
+
+        MenuItem scanItem = new MenuItem("Scan QR...");
+        scanItem.setOnAction(event -> {
+            scanQR();
+        });
+        enterMnemonicButton.getItems().add(scanItem);
         enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
     }
 
+    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();
+            defaultWordSizeProperty.set(words.size() + 1);
+            setContent(getMnemonicWordsEntry(words.size() + 1, true, true));
+            setExpanded(true);
+
+            for(int i = 0; i < wordsPane.getChildren().size(); i++) {
+                WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+                if(i < words.size()) {
+                    wordEntry.getEditor().setText(words.get(i));
+                    wordEntry.getEditor().setEditable(false);
+                } else {
+                    ScheduledService<Void> service = new ScheduledService<>() {
+                        @Override
+                        protected Task<Void> createTask() {
+                            return new Task<>() {
+                                @Override
+                                protected Void call() {
+                                    return null;
+                                }
+                            };
+                        }
+                    };
+                    service.setDelay(Duration.millis(500));
+                    service.setOnSucceeded(event1 -> {
+                        service.cancel();
+                        Platform.runLater(() -> wordEntry.getEditor().requestFocus());
+                    });
+                    service.start();
+                }
+            }
+        }
+    }
+
+    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();
+            if(result.seed != null) {
+                showWordList(result.seed);
+                Platform.runLater(() -> validLabel.requestFocus());
+            } 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 seed.");
+            }
+        }
+    }
+
+    protected void showWordList(DeterministicSeed seed) {
+        List<String> words = seed.getMnemonicCode();
+        setContent(getMnemonicWordsEntry(words.size(), true, true));
+        setExpanded(true);
+
+        for(int i = 0; i < wordsPane.getChildren().size(); i++) {
+            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+            wordEntry.getEditor().setText(words.get(i));
+            wordEntry.getEditor().setEditable(false);
+        }
+    }
+
     protected void enterMnemonic(int numWords) {
         setDescription("Generate new or enter existing");
         showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(numWords));
+        setContent(getMnemonicWordsEntry(numWords, true, true));
         setExpanded(true);
     }
 
-    protected Node getMnemonicWordsEntry(int numWords) {
+    protected Node getMnemonicWordsEntry(int numWords, boolean showPassphrase, boolean editPassphrase) {
         VBox vBox = new VBox();
         vBox.setSpacing(10);
 
@@ -112,10 +199,12 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
         vBox.getChildren().add(wordsPane);
 
-        PassphraseEntry passphraseEntry = new PassphraseEntry();
-        wordEntries.get(wordEntries.size() - 1).setNextField(passphraseEntry.getEditor());
-        passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
-        vBox.getChildren().add(passphraseEntry);
+        if(showPassphrase) {
+            PassphraseEntry passphraseEntry = new PassphraseEntry(editPassphrase);
+            wordEntries.get(wordEntries.size() - 1).setNextField(passphraseEntry.getEditor());
+            passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
+            vBox.getChildren().add(passphraseEntry);
+        }
 
         AnchorPane buttonPane = new AnchorPane();
         buttonPane.setPadding(new Insets(0, 26, 0, 10));
@@ -210,9 +299,14 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                     if(clipboard.hasString() && clipboard.getString().matches("(?m).+[\\n\\s][\\S\\s]*")) {
                         String[] words = clipboard.getString().split("[\\n\\s]");
                         WordEntry entry = WordEntry.this;
-                        for(String word : words) {
+                        for(int i = 0; i < words.length; i++) {
+                            String word = words[i];
                             if(entry.nextField != null) {
-                                entry.nextField.requestFocus();
+                                if(i == words.length - 2 && isValid(word)) {
+                                    label.requestFocus();
+                                } else {
+                                    entry.nextField.requestFocus();
+                                }
                             }
 
                             entry.wordField.setText(word);
@@ -231,7 +325,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                 String text = change.getText();
                 // if text was added, fix the text to fit the requirements
                 if(!text.isEmpty()) {
-                    String newText = text.replace(" ", "").toLowerCase();
+                    String newText = text.replace(" ", "").toLowerCase(Locale.ROOT);
                     int carretPos = change.getCaretPosition() - text.length() + newText.length();
                     change.setText(newText);
                     // fix caret position based on difference in originally added text and fixed text
@@ -242,7 +336,7 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
             wordField.setTextFormatter(formatter);
 
             wordList = Bip39MnemonicCode.INSTANCE.getWordList();
-            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));
+            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList, wordNumber, wordEntryList));
             autoCompletionBinding.setDelay(50);
             autoCompletionBinding.setOnAutoCompleted(event -> {
                 if(nextField != null) {
@@ -250,11 +344,20 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
                 }
             });
 
+            //Show autocomplete for the last word on focus if empty
+            boolean lastWord = wordNumber == wordEntryList.size() - 1;
+            if(lastWord) {
+                wordField.focusedProperty().addListener((observable, oldValue, focused) -> {
+                    if(focused && wordField.getText().isEmpty()) {
+                        autoCompletionBinding.setUserInput("");
+                    }
+                });
+            }
+
             ValidationSupport validationSupport = new ValidationSupport();
             validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
             validationSupport.registerValidator(wordField, Validator.combine(
-                    Validator.createEmptyValidator("Word is required"),
-                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", !wordList.contains(newValue))
+                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", (newValue.length() > 0 || !lastWord) && !wordList.contains(newValue))
             ));
 
             wordField.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -283,13 +386,30 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
     protected static class WordlistSuggestionProvider implements Callback<AutoCompletionBinding.ISuggestionRequest, Collection<String>> {
         private final List<String> wordList;
+        private final int wordNumber;
+        private final ObservableList<String> wordEntryList;
 
-        public WordlistSuggestionProvider(List<String> wordList) {
+        public WordlistSuggestionProvider(List<String> wordList, int wordNumber, ObservableList<String> wordEntryList) {
             this.wordList = wordList;
+            this.wordNumber = wordNumber;
+            this.wordEntryList = wordEntryList;
         }
 
         @Override
         public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
+            if(wordNumber == wordEntryList.size() - 1 && allPreviousWordsValid()) {
+                try {
+                    List<String> possibleLastWords = Bip39MnemonicCode.INSTANCE.getPossibleLastWords(wordEntryList.subList(0, wordEntryList.size() - 1));
+                    if(!request.getUserText().isEmpty()) {
+                        possibleLastWords.removeIf(s -> !s.startsWith(request.getUserText()));
+                    }
+
+                    return possibleLastWords;
+                } catch(Exception e) {
+                    log.warn("Cannot determine possible last words", e);
+                }
+            }
+
             List<String> suggestions = new ArrayList<>();
             if(!request.getUserText().isEmpty()) {
                 for(String word : wordList) {
@@ -301,26 +421,63 @@ public class MnemonicKeystorePane extends TitledDescriptionPane {
 
             return suggestions;
         }
+
+        private boolean allPreviousWordsValid() {
+            for(int i = 0; i < wordEntryList.size() - 1; i++) {
+                if(!WordEntry.isValid(wordEntryList.get(i))) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
     }
 
     protected class PassphraseEntry extends HBox {
-        private final CustomTextField passphraseField;
+        private final TextField passphraseField;
 
-        public PassphraseEntry() {
+        public PassphraseEntry(boolean editable) {
             super();
 
             setAlignment(Pos.CENTER_LEFT);
             setSpacing(10);
+            Label usePassphraseLabel = new Label("Use passphrase?");
+            usePassphraseLabel.managedProperty().bind(usePassphraseLabel.visibleProperty());
+            CheckBox usePassphraseCheckbox = new CheckBox(" ");
+            usePassphraseCheckbox.setDisable(!editable);
+            usePassphraseCheckbox.managedProperty().bind(usePassphraseCheckbox.visibleProperty());
+            usePassphraseLabel.visibleProperty().bind(usePassphraseCheckbox.visibleProperty());
+            usePassphraseCheckbox.setVisible(passphraseProperty.isEmpty().get());
+            usePassphraseCheckbox.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                if(newValue) {
+                    Optional<ButtonType> optType = AppServices.showWarningDialog("Add a passphrase?", "A passphrase is not a password! " +
+                            "Any variation entered in future loads a valid wallet, but with different addresses.\n\n" +
+                            "This feature provides optional added security for advanced users only. Are you sure?", ButtonType.NO, ButtonType.YES);
+                    if(optType.isPresent() && optType.get() == ButtonType.YES) {
+                        usePassphraseCheckbox.setVisible(false);
+                    } else {
+                        usePassphraseCheckbox.setSelected(false);
+                    }
+                }
+            });
+
             Label passphraseLabel = new Label("Passphrase:");
-            passphraseField = (CustomTextField) TextFields.createClearableTextField();
+            passphraseLabel.managedProperty().bind(passphraseLabel.visibleProperty());
+            passphraseField = new TextField();
+            passphraseField.setPromptText(passphraseProperty.isEmpty().get() ? "Leave blank for none" : "");
+            passphraseField.setText(passphraseProperty.get());
+            passphraseField.setDisable(!editable);
+            passphraseField.managedProperty().bind(passphraseField.visibleProperty());
+            passphraseLabel.visibleProperty().bind(passphraseField.visibleProperty());
+            passphraseField.visibleProperty().bind(usePassphraseCheckbox.visibleProperty().not());
             passphraseProperty.bind(passphraseField.textProperty());
-            passphraseField.setPromptText("Leave blank for none");
 
             HelpLabel helpLabel = new HelpLabel();
+            helpLabel.setPrefHeight(28);
             helpLabel.setStyle("-fx-padding: 0 0 0 0");
-            helpLabel.setHelpText("A passphrase provides optional added security - it is not stored so it must be remembered!");
+            helpLabel.setHelpText("Advanced feature: a passphrase provides optional added security, but it is not stored so it must be remembered!");
 
-            getChildren().addAll(passphraseLabel, passphraseField, helpLabel);
+            getChildren().addAll(usePassphraseLabel, usePassphraseCheckbox, passphraseLabel, passphraseField, helpLabel);
         }
 
         public TextField getEditor() {

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

@@ -10,9 +10,11 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletImportEvent;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.ImportException;
 import com.sparrowwallet.sparrow.io.KeystoreMnemonicImport;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
+import com.sparrowwallet.sparrow.net.ServerType;
 import javafx.collections.FXCollections;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -107,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) {
@@ -135,7 +138,10 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
                 EventManager.get().post(new WalletImportEvent(optWallet.get()));
             } else {
                 discoverButton.setDisable(false);
-                Optional<ButtonType> optButtonType = AppServices.showErrorDialog("No existing wallet found", "Could not find a wallet with existing transactions using this mnemonic. Import this wallet anyway?", ButtonType.NO, ButtonType.YES);
+                Optional<ButtonType> optButtonType = AppServices.showErrorDialog("No existing wallet found",
+                        Config.get().getServerType() == ServerType.BITCOIN_CORE ? "The configured server type is Bitcoin Core, which does not support wallet discovery.\n\n" +
+                                "You can however import this wallet and scan the blockchain by supplying a start date. Do you want to import this wallet?" :
+                                "Could not find a wallet with existing transactions using this mnemonic. Import this wallet anyway?", ButtonType.NO, ButtonType.YES);
                 if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
                     setContent(getScriptTypeEntry());
                     setExpanded(true);
@@ -183,7 +189,7 @@ public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
         scriptTypeComboBox.setMaxWidth(170);
 
         HelpLabel helpLabel = new HelpLabel();
-        helpLabel.setHelpText("P2WPKH is a Native Segwit type and is usually the best choice for new wallets.\nP2SH-P2WPKH is a Wrapped Segwit type and is a reasonable choice for the widest compatibility.\nP2PKH is a Legacy type and should be avoided for new wallets.\nFor existing wallets, be sure to choose the type that matches the wallet you are importing.");
+        helpLabel.setHelpText("Native Segwit is usually the best choice for new wallets.\nTaproot is a new type useful for specific needs.\nNested Segwit and Legacy are useful for recovering older wallets.\nFor existing wallets, be sure to choose the type that matches the wallet you are importing.");
         fieldBox.getChildren().addAll(scriptTypeComboBox, helpLabel);
 
         Region region = new Region();

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

@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.scene.control.TreeTableCell;
+import org.controlsfx.tools.Platform;
+
+public class NumberCell extends TreeTableCell<Entry, Number> {
+    public NumberCell() {
+        super();
+        getStyleClass().add("number-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);
+        } else {
+            setText(amount.toString());
+            setGraphic(null);
+        }
+    }
+}

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

@@ -2,8 +2,11 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.PayNymImageLoadedEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.paynym.PayNymService;
+import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.concurrent.Service;
@@ -121,9 +124,14 @@ public class PayNymAvatar extends StackPane {
                         Proxy proxy = AppServices.getProxy();
                         String url = PayNymService.getHostUrl(proxy != null) + "/" + paymentCodeStr + "/avatar";
 
+                        if(log.isDebugEnabled()) {
+                            log.debug("Requesting PayNym avatar from " + url);
+                        }
+
                         try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream())) {
                             Image image = new Image(is, 150, 150, true, false);
                             paymentCodeCache.put(cacheId, image);
+                            Platform.runLater(() -> EventManager.get().post(new PayNymImageLoadedEvent(paymentCode, image)));
                             return image;
                         } catch(Exception e) {
                             log.debug("Error loading PayNym avatar", e);

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

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

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

@@ -1,9 +1,12 @@
 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;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.crypto.BIP38;
 import com.sparrowwallet.drongo.crypto.DumpedPrivateKey;
 import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.policy.PolicyType;
@@ -12,8 +15,14 @@ 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;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
+import com.sparrowwallet.sparrow.net.ServerType;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.event.ActionEvent;
@@ -27,6 +36,7 @@ import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
+import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -40,9 +50,7 @@ import tornadofx.control.Form;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.drongo.protocol.ScriptType.P2TR;
@@ -55,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();
@@ -80,7 +90,7 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         keyField.setText("Private Key:");
         key = new TextArea();
         key.setWrapText(true);
-        key.setPromptText("Wallet Import Format (WIF)");
+        key.setPromptText("Wallet Import Format (WIF) or BIP38 encrypted key");
         key.setPrefRowCount(2);
         key.getStyleClass().add("fixed-width");
         HBox keyBox = new HBox(5);
@@ -94,6 +104,14 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         HBox.setHgrow(key, Priority.ALWAYS);
         keyField.getInputs().add(keyBox);
 
+        if(CardApi.isReaderAvailable()) {
+            VBox cardButtonBox = new VBox(5);
+            Button cardKey = new Button("", getGlyph(FontAwesome5.Glyph.WIFI));
+            cardKey.setOnAction(event -> unsealPrivateKey());
+            cardButtonBox.getChildren().add(cardKey);
+            keyBox.getChildren().add(cardButtonBox);
+        }
+
         Field keyScriptTypeField = new Field();
         keyScriptTypeField.setText("Script Type:");
         keyScriptType = new ComboBox<>();
@@ -131,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);
 
@@ -149,8 +184,13 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         });
 
         key.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(isEncryptedKey()) {
+                decryptKey();
+            }
+
             boolean isValidKey = isValidKey();
             createButton.setDisable(!isValidKey || !isValidToAddress());
+            setScriptTypes(isValidKey);
             if(isValidKey) {
                 setFromAddress();
             }
@@ -182,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());
@@ -199,6 +244,28 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         }
     }
 
+    private boolean isEncryptedKey() {
+        return key.getText().length() == 58 && key.getText().startsWith("6P");
+    }
+
+    private void decryptKey() {
+        PassphraseDialog passphraseDialog = new PassphraseDialog();
+        passphraseDialog.initOwner(getDialogPane().getScene().getWindow());
+        Optional<String> optPassphrase = passphraseDialog.showAndWait();
+        if(optPassphrase.isPresent()) {
+            try {
+                DumpedPrivateKey decryptedKey = BIP38.decrypt(optPassphrase.get(), key.getText());
+                Platform.runLater(() -> key.setText(decryptedKey.toString()));
+            } catch(Exception e) {
+                log.error("Failed to decrypt BIP38 key", e);
+                AppServices.showErrorDialog("Failed to decrypt BIP38 key", e.getMessage());
+                Platform.runLater(() -> key.setText(""));
+            }
+        } else {
+            Platform.runLater(() -> key.setText(""));
+        }
+    }
+
     private DumpedPrivateKey getPrivateKey() {
         return DumpedPrivateKey.fromBase58(key.getText());
     }
@@ -223,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);
@@ -252,6 +330,17 @@ 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();
+            key.setText(devicePrivateKey.privateKey().getPrivateKeyEncoded().toBase58());
+            keyScriptType.setValue(devicePrivateKey.scriptType());
+        }
+    }
+
     private void createTransaction() {
         try {
             DumpedPrivateKey privateKey = getPrivateKey();
@@ -259,14 +348,32 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
             Address fromAddress = scriptType.getAddress(privateKey.getKey());
             Address destAddress = getToAddress();
 
-            ElectrumServer.AddressUtxosService addressUtxosService = new ElectrumServer.AddressUtxosService(fromAddress);
+            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();
+                }
+            }
+
+            ElectrumServer.AddressUtxosService addressUtxosService = new ElectrumServer.AddressUtxosService(fromAddress, since);
             addressUtxosService.setOnSucceeded(successEvent -> {
                 createTransaction(privateKey.getKey(), scriptType, addressUtxosService.getValue(), destAddress);
             });
             addressUtxosService.setOnFailed(failedEvent -> {
+                Throwable rootCause = Throwables.getRootCause(failedEvent.getSource().getException());
                 log.error("Error retrieving outputs for address " + fromAddress, failedEvent.getSource().getException());
-                AppServices.showErrorDialog("Error retrieving outputs for address", failedEvent.getSource().getException().getMessage());
+                AppServices.showErrorDialog("Error retrieving outputs for address", rootCause.getMessage());
             });
+
+            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);
+            }
+
             addressUtxosService.start();
         } catch(Exception e) {
             log.error("Error creating sweep transaction", e);
@@ -286,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++;
@@ -294,8 +401,13 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
 
         long dustThreshold = destAddress.getScriptType().getDustThreshold(sweepOutput, Transaction.DUST_RELAY_TX_FEE);
         if(total - fee <= dustThreshold) {
-            AppServices.showErrorDialog("Insufficient funds", "The unspent outputs for this private key contain insufficient funds to spend (" + total + " sats).");
-            return;
+            feeRate = Transaction.DEFAULT_MIN_RELAY_FEE;
+            fee = (long)Math.ceil(noFeeTransaction.getVirtualSize() * feeRate) + 1;
+
+            if(total - fee <= dustThreshold) {
+                AppServices.showErrorDialog("Insufficient funds", "The unspent outputs for this private key contain insufficient funds to spend (" + total + " sats).");
+                return;
+            }
         }
 
         Transaction transaction = new Transaction();
@@ -307,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());
@@ -342,4 +460,45 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         glyph.setFontSize(12);
         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;
+
+        public PassphraseDialog() {
+            this.passphrase = new ViewPasswordField();
+
+            final DialogPane dialogPane = getDialogPane();
+            setTitle("BIP38 Passphrase");
+            dialogPane.setHeaderText("Enter the BIP38 passphrase for this key:");
+            dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+            AppServices.setStageIcon(dialogPane.getScene().getWindow());
+            dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
+            dialogPane.setPrefWidth(380);
+            dialogPane.setPrefHeight(200);
+            AppServices.moveToActiveWindowScreen(this);
+
+            Glyph key = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.KEY);
+            key.setFontSize(50);
+            dialogPane.setGraphic(key);
+
+            final VBox content = new VBox(10);
+            content.setPrefHeight(50);
+            content.getChildren().add(passphrase);
+
+            dialogPane.setContent(content);
+            Platform.runLater(passphrase::requestFocus);
+
+            setResultConverter(dialogButton -> dialogButton == ButtonType.OK ? passphrase.getText() : null);
+        }
+    }
 }

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

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

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
 import com.google.zxing.client.j2se.MatrixToImageConfig;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
@@ -9,9 +10,13 @@ import com.sparrowwallet.hummingbird.LegacyUREncoder;
 import com.sparrowwallet.hummingbird.registry.RegistryType;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+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;
@@ -27,42 +32,65 @@ 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 MAX_FRAGMENT_LENGTH = 250;
 
     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 final UREncoder encoder;
+    private UREncoder urEncoder;
+
+    private final BBQR bbqr;
+    private BBQREncoder bbqrEncoder;
+    private boolean useBbqrEncoding;
 
     private final ImageView qrImageView;
 
     private AnimateQRService animateQRService;
     private String currentPart;
 
+    private boolean addLegacyEncodingOption;
     private boolean useLegacyEncoding;
     private String[] legacyParts;
     private int legacyPartIndex;
 
+    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.encoder = new UREncoder(ur, MAX_FRAGMENT_LENGTH, 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);
@@ -75,37 +103,53 @@ public class QRDisplayDialog extends Dialog<UR> {
         dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
 
         nextPart();
-        if(encoder.isSinglePart()) {
+        if(isSinglePart()) {
             qrImageView.setImage(getQrCode(currentPart));
         } else {
-            animateQRService = new AnimateQRService();
-            animateQRService.setPeriod(Duration.millis(ANIMATION_PERIOD_MILLIS));
-            animateQRService.start();
-            setOnCloseRequest(event -> {
-                animateQRService.cancel();
-            });
+            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 {
+            final ButtonType densityButtonType = new javafx.scene.control.ButtonType("Change Density", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(densityButtonType);
         }
 
-        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
-        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
+        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();
@@ -115,19 +159,52 @@ 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() {
+        animateQRService = new AnimateQRService();
+        animateQRService.setPeriod(Duration.millis(ANIMATION_PERIOD_MILLIS));
+        animateQRService.start();
+        setOnCloseRequest(event -> {
+            animateQRService.cancel();
+        });
+    }
+
+    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();
-            currentPart = fragment.toUpperCase();
+        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];
             legacyPartIndex++;
@@ -140,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());
@@ -162,33 +239,53 @@ 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.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();
-                }
+    private void setUseBbqrEncoding(boolean useBbqrEncoding) {
+        if(useBbqrEncoding) {
+            this.useBbqrEncoding = true;
+            restartAnimation();
+        } else {
+            this.useBbqrEncoding = false;
+            restartAnimation();
+        }
+    }
 
-                qrImageView.setImage(getQrCode(currentPart));
-            } else if(!animateQRService.isRunning()) {
-                animateQRService.reset();
-                animateQRService.start();
+    private void changeQRDensity() {
+        if(animateQRService != null) {
+            animateQRService.cancel();
+        }
+
+        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 if(animateQRService == null) {
+            createAnimateQRService();
+        } else if(!animateQRService.isRunning()) {
+            animateQRService.reset();
+            animateQRService.start();
         }
     }
 
@@ -211,18 +308,63 @@ public class QRDisplayDialog extends Dialog<UR> {
         @Override
         protected Node createButton(ButtonType buttonType) {
             if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
-                ToggleButton legacy = new ToggleButton(buttonType.getText());
-                legacy.setGraphicTextGap(5);
-                setLegacyGraphic(legacy, false);
+                if(addLegacyEncodingOption) {
+                    ToggleButton legacy = new ToggleButton(buttonType.getText());
+                    legacy.setGraphicTextGap(5);
+                    setLegacyGraphic(legacy, false);
 
+                    final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                    ButtonBar.setButtonData(legacy, buttonData);
+                    legacy.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                        setUseLegacyEncoding(newValue);
+                        setLegacyGraphic(legacy, newValue);
+                    });
+
+                    return legacy;
+                } else {
+                    Button density = new Button(buttonType.getText());
+                    density.setPrefWidth(160);
+                    density.setGraphicTextGap(5);
+                    updateDensityButton(density);
+
+                    final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                    ButtonBar.setButtonData(density, buttonData);
+                    density.setOnAction(event -> {
+                        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;
+                            } else {
+                                return;
+                            }
+                        }
+
+                        Config.get().setQrDensity(Config.get().getQrDensity() == QRDensity.NORMAL ? QRDensity.LOW : QRDensity.NORMAL);
+                        updateDensityButton(density);
+                        changeQRDensity();
+                    });
+
+                    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(legacy, buttonData);
-                legacy.selectedProperty().addListener((observable, oldValue, newValue) -> {
-                    setUseLegacyEncoding(newValue);
-                    setLegacyGraphic(legacy, newValue);
+                ButtonBar.setButtonData(bbqr, buttonData);
+
+                bbqr.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    setUseBbqrEncoding(newValue);
                 });
 
-                return legacy;
+                return bbqr;
             }
 
             return super.createButton(buttonType);
@@ -236,10 +378,19 @@ public class QRDisplayDialog extends Dialog<UR> {
             }
         }
 
-        private Glyph getGlyph(FontAwesome5.Glyph glyphName) {
-            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
-            glyph.setFontSize(11);
-            return glyph;
+        private void updateDensityButton(Button density) {
+            density.setText(Config.get().getQrDensity() == QRDensity.NORMAL ? "Decrease Density" : "Increase Density");
+            if(Config.get().getQrDensity() == QRDensity.NORMAL) {
+                density.setGraphic(getGlyph(FontAwesome5.Glyph.MAGNIFYING_GLASS_PLUS));
+            } else {
+                density.setGraphic(getGlyph(FontAwesome5.Glyph.MAGNIFYING_GLASS_MINUS));
+            }
         }
     }
+
+    protected static Glyph getGlyph(FontAwesome5.Glyph glyphName) {
+        Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
+        glyph.setFontSize(11);
+        return glyph;
+    }
 }

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

@@ -10,24 +10,29 @@ import com.sparrowwallet.drongo.address.P2PKHAddress;
 import com.sparrowwallet.drongo.address.P2SHAddress;
 import com.sparrowwallet.drongo.address.P2WPKHAddress;
 import com.sparrowwallet.drongo.crypto.*;
-import com.sparrowwallet.drongo.policy.Policy;
-import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.Base43;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 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.Keystore;
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.SeedQR;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.hummingbird.LegacyURDecoder;
 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;
@@ -54,14 +59,16 @@ import java.util.*;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 @SuppressWarnings("deprecation")
 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);
@@ -186,32 +195,46 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             String qrtext = qrResult.getText();
             Matcher partMatcher = PART_PATTERN.matcher(qrtext);
 
-            if(qrtext.toLowerCase().startsWith(UR.UR_PREFIX)) {
+            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));
@@ -257,9 +280,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 BitcoinURI bitcoinURI;
                 Address address;
                 ExtendedKey extendedKey;
+                DeterministicSeed seed;
                 try {
                     extendedKey = ExtendedKey.fromDescriptor(qrtext);
-                    result = new Result(extendedKey);
+                    result = new Result(extendedKey, null);
                     return;
                 } catch(Exception e) {
                     //Ignore, not a valid xpub
@@ -334,6 +358,33 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     //Ignore, not parseable as base43 decoded bytes
                 }
 
+                try {
+                    seed = SeedQR.getSeed(qrtext);
+                    result = new Result(seed);
+                    return;
+                } catch(Exception e) {
+                    //Ignore, not parseable as a SeedQR
+                }
+
+                try {
+                    seed = SeedQR.getSeed(qrResult.getRawBytes());
+                    result = new Result(seed);
+                    return;
+                } catch(Exception e) {
+                    //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);
             }
         }
@@ -392,7 +443,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 } else if(urRegistryType.equals(RegistryType.CRYPTO_HDKEY)) {
                     CryptoHDKey cryptoHDKey = (CryptoHDKey)ur.decodeFromRegistry();
                     ExtendedKey extendedKey = getExtendedKey(cryptoHDKey);
-                    return new Result(extendedKey);
+                    return new Result(extendedKey, cryptoHDKey.getName());
                 } else if(urRegistryType.equals(RegistryType.CRYPTO_OUTPUT)) {
                     CryptoOutput cryptoOutput = (CryptoOutput)ur.decodeFromRegistry();
                     OutputDescriptor outputDescriptor = getOutputDescriptor(cryptoOutput);
@@ -401,6 +452,47 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     CryptoAccount cryptoAccount = (CryptoAccount)ur.decodeFromRegistry();
                     List<Wallet> wallets = getWallets(cryptoAccount);
                     return new Result(wallets);
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_SEED)) {
+                    CryptoSeed cryptoSeed = (CryptoSeed)ur.decodeFromRegistry();
+                    DeterministicSeed seed = getSeed(cryptoSeed);
+                    return new Result(seed);
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_BIP39)) {
+                    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"));
@@ -442,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) {
@@ -460,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");
@@ -518,11 +616,73 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
         private KeyDerivation getKeyDerivation(CryptoKeypath cryptoKeypath) {
             if(cryptoKeypath != null) {
-                return new KeyDerivation(Utils.bytesToHex(cryptoKeypath.getSourceFingerprint()), cryptoKeypath.getPath());
+                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 -> (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;
         }
+
+        private DeterministicSeed getSeed(CryptoSeed cryptoSeed) {
+            return new DeterministicSeed(cryptoSeed.getSeed(), null, cryptoSeed.getBirthdate() == null ? System.currentTimeMillis() : cryptoSeed.getBirthdate().getTime());
+        }
+
+        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 {
@@ -624,8 +784,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         public final PSBT psbt;
         public final BitcoinURI uri;
         public final ExtendedKey extendedKey;
+        public final String extendedKeyName;
         public final OutputDescriptor outputDescriptor;
         public final List<Wallet> wallets;
+        public final DeterministicSeed seed;
         public final String payload;
         public final Throwable exception;
 
@@ -634,8 +796,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -645,8 +809,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = psbt;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -656,8 +822,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = uri;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -667,19 +835,23 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = BitcoinURI.fromAddress(address);
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
 
-        public Result(ExtendedKey extendedKey) {
+        public Result(ExtendedKey extendedKey, String name) {
             this.transaction = null;
             this.psbt = null;
             this.uri = null;
             this.extendedKey = extendedKey;
+            this.extendedKeyName = name;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -689,8 +861,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = outputDescriptor;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = null;
         }
@@ -700,8 +874,23 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = wallets;
+            this.seed = null;
+            this.payload = null;
+            this.exception = null;
+        }
+
+        public Result(DeterministicSeed seed) {
+            this.transaction = null;
+            this.psbt = null;
+            this.uri = null;
+            this.extendedKey = null;
+            this.extendedKeyName = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.seed = seed;
             this.payload = null;
             this.exception = null;
         }
@@ -711,8 +900,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = payload;
             this.exception = null;
         }
@@ -722,8 +913,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.psbt = null;
             this.uri = null;
             this.extendedKey = null;
+            this.extendedKeyName = null;
             this.outputDescriptor = null;
             this.wallets = null;
+            this.seed = null;
             this.payload = null;
             this.exception = exception;
         }

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

@@ -54,10 +54,14 @@ 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()) {
                     Script nestedScript = chunk.getScript();
                     if (nestedScript.equals(redeemScript)) {

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

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

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

@@ -1,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.*;
@@ -20,6 +22,8 @@ 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);
@@ -35,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()) {
@@ -68,23 +75,29 @@ 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.setBitcoinUnit(walletForms.iterator().next().getWallet());
+        results.setPrefWidth(showWallet || showAccount ? 950 : 850);
+        results.setUnitFormat(walletForms.iterator().next().getWallet());
         results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
         results.setPlaceholder(new Label("No results"));
 
         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());
@@ -134,33 +147,31 @@ public class SearchWalletDialog extends Dialog<Entry> {
         });
 
         search.textProperty().addListener((observable, oldValue, newValue) -> {
-            searchWallet(newValue.toLowerCase());
+            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();
                 for(Entry entry : walletTransactionsEntry.getChildren()) {
                     if(entry instanceof TransactionEntry transactionEntry) {
                         if(transactionEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
-                                (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase().contains(searchText)) ||
-                                (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue)) {
+                                (transactionEntry.getLabel() != null && transactionEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
+                                (transactionEntry.getValue() != null && searchValue != null && Math.abs(transactionEntry.getValue()) == searchValue) ||
+                                (searchAddress != null && transactionEntry.getBlockTransaction().getTransaction().getOutputs().stream().map(output -> output.getScript().getToAddress()).filter(Objects::nonNull).anyMatch(address -> address.equals(searchAddress)))) {
                             matchingEntries.add(entry);
                         }
                     }
@@ -170,8 +181,8 @@ public class SearchWalletDialog extends Dialog<Entry> {
                     NodeEntry purposeEntry = walletForm.getNodeEntry(keyPurpose);
                     for(Entry entry : purposeEntry.getChildren()) {
                         if(entry instanceof NodeEntry nodeEntry) {
-                            if(nodeEntry.getAddress().toString().contains(searchText) ||
-                                    (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase().contains(searchText)) ||
+                            if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
+                                    (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
                                     (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
                                 matchingEntries.add(entry);
                             }
@@ -184,8 +195,8 @@ public class SearchWalletDialog extends Dialog<Entry> {
                         NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
                         for(Entry entry : purposeEntry.getChildren()) {
                             if(entry instanceof NodeEntry nodeEntry) {
-                                if(nodeEntry.getAddress().toString().contains(searchText) ||
-                                        (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase().contains(searchText)) ||
+                                if(nodeEntry.getAddress().toString().toLowerCase(Locale.ROOT).contains(searchText) ||
+                                        (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
                                         (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
                                     matchingEntries.add(entry);
                                 }
@@ -197,8 +208,8 @@ public class SearchWalletDialog extends Dialog<Entry> {
                 WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
                 for(Entry entry : walletUtxosEntry.getChildren()) {
                     if(entry instanceof HashIndexEntry hashIndexEntry) {
-                        if(hashIndexEntry.getBlockTransaction().getHash().toString().equals(searchText) ||
-                                (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase().contains(searchText)) ||
+                        if(hashIndexEntry.getBlockTransaction().getHash().toString().toLowerCase(Locale.ROOT).equals(searchText) ||
+                                (hashIndexEntry.getLabel() != null && hashIndexEntry.getLabel().toLowerCase(Locale.ROOT).contains(searchText)) ||
                                 (hashIndexEntry.getValue() != null && searchValue != null && Math.abs(hashIndexEntry.getValue()) == searchValue)) {
                             matchingEntries.add(entry);
                         }
@@ -212,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);

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

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

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

@@ -0,0 +1,91 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.application.Platform;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.StackPane;
+
+import java.util.List;
+
+public class SeedEntryDialog extends Dialog<List<String>> {
+    private final MnemonicKeystoreEntryPane keystorePane;
+
+    public SeedEntryDialog(String name, int numWords) {
+        final DialogPane dialogPane = new MnemonicGridDialogPane();
+        setDialogPane(dialogPane);
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        int lines = numWords / 3;
+        int height = lines * 40;
+
+        StackPane stackPane = new StackPane();
+        dialogPane.setContent(stackPane);
+
+        AnchorPane anchorPane = new AnchorPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.getStyleClass().add("edge-to-edge");
+        scrollPane.setPrefHeight(104 + height);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        anchorPane.getChildren().add(scrollPane);
+        scrollPane.setFitToWidth(true);
+        AnchorPane.setLeftAnchor(scrollPane, 0.0);
+        AnchorPane.setRightAnchor(scrollPane, 0.0);
+
+        Accordion keystoreAccordion = new Accordion();
+        scrollPane.setContent(keystoreAccordion);
+
+        keystorePane = new MnemonicKeystoreEntryPane(name, numWords);
+        keystorePane.setAnimated(false);
+        keystoreAccordion.getPanes().add(keystorePane);
+
+        stackPane.getChildren().addAll(anchorPane);
+
+        dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        Button okButton = (Button)dialogPane.lookupButton(ButtonType.OK);
+        okButton.disableProperty().bind(keystorePane.validProperty().not());
+
+        final ButtonType generateButtonType = new javafx.scene.control.ButtonType("Generate New", ButtonBar.ButtonData.LEFT);
+        dialogPane.getButtonTypes().add(generateButtonType);
+
+        setResultConverter((dialogButton) -> {
+            ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
+            return data == ButtonBar.ButtonData.OK_DONE ? keystorePane.wordEntriesProperty.get() : null;
+        });
+
+        dialogPane.setPrefWidth(500);
+        dialogPane.setPrefHeight(180 + height);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
+    }
+
+    private class MnemonicGridDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            Node button;
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                Button generateButton = new Button(buttonType.getText());
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(generateButton, buttonData);
+                generateButton.setOnAction(event -> {
+                    keystorePane.generateNew();
+                });
+
+                button = generateButton;
+            } else {
+                button = super.createButton(buttonType);
+            }
+
+            return button;
+        }
+    }
+
+    public boolean isGenerated() {
+        return keystorePane.isGenerated();
+    }
+}

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

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

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

@@ -11,10 +11,13 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.*;
 import java.util.Optional;
 
 public class TextAreaDialog extends Dialog<String> {
@@ -22,6 +25,8 @@ public class TextAreaDialog extends Dialog<String> {
 
     private final TextArea textArea;
     private final String defaultValue;
+    private final String fileName;
+    private final byte[] fileBytes;
 
     public TextAreaDialog() {
         this("");
@@ -31,7 +36,11 @@ public class TextAreaDialog extends Dialog<String> {
         this(defaultValue, true);
     }
 
-    public TextAreaDialog(@NamedArg("defaultValue") String defaultValue, @NamedArg("editable") boolean editable) {
+    public TextAreaDialog(String defaultValue, boolean editable) {
+        this(defaultValue, editable, null, null);
+    }
+
+    public TextAreaDialog(@NamedArg("defaultValue") String defaultValue, @NamedArg("editable") boolean editable, @NamedArg("fileName") String fileName, @NamedArg("fileBytes") byte[] fileBytes) {
         final DialogPane dialogPane = new TextAreaDialogPane();
         setDialogPane(dialogPane);
 
@@ -48,6 +57,8 @@ public class TextAreaDialog extends Dialog<String> {
         HBox.setHgrow(this.textArea, Priority.ALWAYS);
 
         this.defaultValue = defaultValue;
+        this.fileName = fileName;
+        this.fileBytes = fileBytes;
 
         dialogPane.setContent(hbox);
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
@@ -60,6 +71,9 @@ public class TextAreaDialog extends Dialog<String> {
 
             final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.LEFT);
             dialogPane.getButtonTypes().add(scanButtonType);
+        } else if(fileBytes != null) {
+            final ButtonType saveButtonType = new javafx.scene.control.ButtonType("Save File...", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(saveButtonType);
         }
 
         Platform.runLater(textArea::requestFocus);
@@ -71,6 +85,7 @@ public class TextAreaDialog extends Dialog<String> {
 
         dialogPane.setPrefWidth(700);
         dialogPane.setPrefHeight(400);
+        setResizable(true);
         AppServices.moveToActiveWindowScreen(this);
     }
 
@@ -86,7 +101,7 @@ public class TextAreaDialog extends Dialog<String> {
         @Override
         protected Node createButton(ButtonType buttonType) {
             Node button;
-            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT && buttonType.getText().equals("Scan QR")) {
                 Button scanButton = new Button(buttonType.getText());
                 scanButton.setGraphicTextGap(5);
                 scanButton.setGraphic(getGlyph(FontAwesome5.Glyph.CAMERA));
@@ -95,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();
@@ -118,6 +134,38 @@ public class TextAreaDialog extends Dialog<String> {
                 });
 
                 button = scanButton;
+            } else if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT && buttonType.getText().equals("Save File...")) {
+                Button saveButton = new Button(buttonType.getText());
+
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(saveButton, buttonData);
+
+                saveButton.setOnAction(event -> {
+                    Stage window = new Stage();
+
+                    FileChooser fileChooser = new FileChooser();
+                    fileChooser.setTitle("Save File");
+
+                    if(fileName != null) {
+                        fileChooser.setInitialFileName(fileName);
+                    }
+
+                    AppServices.moveToActiveWindowScreen(window, 800, 450);
+                    File file = fileChooser.showSaveDialog(window);
+                    if(file != null) {
+                        try {
+                            try(OutputStream outputStream = new FileOutputStream(file)) {
+                                outputStream.write(fileBytes);
+                                outputStream.flush();
+                            }
+                        } catch(IOException e) {
+                            log.error("Error saving file", e);
+                            AppServices.showErrorDialog("Error saving file", "Cannot write to " + file.getAbsolutePath());
+                        }
+                    }
+                });
+
+                button = saveButton;
             } else {
                 button = super.createButton(buttonType);
             }

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

@@ -0,0 +1,73 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.application.Platform;
+import javafx.beans.NamedArg;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TextfieldDialog extends Dialog<String> {
+    private static final Logger log = LoggerFactory.getLogger(TextAreaDialog.class);
+
+    private final TextField textField;
+    private final String defaultValue;
+
+    public TextfieldDialog() {
+        this("");
+    }
+
+    public TextfieldDialog(String defaultValue) {
+        this(defaultValue, true);
+    }
+
+    public TextfieldDialog(@NamedArg("defaultValue") String defaultValue, @NamedArg("editable") boolean editable) {
+        final DialogPane dialogPane = getDialogPane();
+        setDialogPane(dialogPane);
+
+        Image image = new Image("/image/sparrow-small.png");
+        dialogPane.setGraphic(new ImageView(image));
+
+        HBox hbox = new HBox();
+        this.textField = new TextField(defaultValue);
+        this.textField.setMaxWidth(Double.MAX_VALUE);
+        this.textField.setEditable(editable);
+        hbox.getChildren().add(textField);
+        HBox.setHgrow(this.textField, Priority.ALWAYS);
+
+        this.defaultValue = defaultValue;
+
+        dialogPane.setContent(hbox);
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        dialogPane.getStyleClass().add("text-input-dialog");
+        dialogPane.getButtonTypes().add(ButtonType.OK);
+        if(editable) {
+            dialogPane.getButtonTypes().add(ButtonType.CANCEL);
+        }
+
+        Platform.runLater(textField::requestFocus);
+
+        setResultConverter((dialogButton) -> {
+            ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
+            return data == ButtonBar.ButtonData.OK_DONE ? textField.getText() : null;
+        });
+
+        dialogPane.setPrefWidth(600);
+        dialogPane.setPrefHeight(230);
+        AppServices.moveToActiveWindowScreen(this);
+    }
+
+    public final TextField getEditor() {
+        return textField;
+    }
+
+    public final String getDefaultValue() {
+        return defaultValue;
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
@@ -106,13 +108,17 @@ public class TitledDescriptionPane extends TitledPane {
 
     protected void setDescription(String text) {
         descriptionLabel.getStyleClass().remove("description-error");
-        descriptionLabel.getStyleClass().add("description-label");
+        if(!descriptionLabel.getStyleClass().contains("description-label")) {
+            descriptionLabel.getStyleClass().add("description-label");
+        }
         descriptionLabel.setText(text);
     }
 
     protected void setError(String title, String detail) {
         descriptionLabel.getStyleClass().remove("description-label");
-        descriptionLabel.getStyleClass().add("description-error");
+        if(!descriptionLabel.getStyleClass().contains("description-error")) {
+            descriptionLabel.getStyleClass().add("description-error");
+        }
         descriptionLabel.setText(title);
         if(detail != null && !detail.isEmpty()) {
             setContent(getContentBox(detail));
@@ -159,4 +165,17 @@ public class TitledDescriptionPane extends TitledPane {
             }
         });
     }
+
+    protected static int getAccount(Wallet wallet, KeyDerivation requiredDerivation) {
+        if(wallet == null || requiredDerivation == null) {
+            return 0;
+        }
+
+        int account = wallet.getScriptType().getAccount(requiredDerivation.getDerivationPath());
+        if(account < 0) {
+            account = 0;
+        }
+
+        return account;
+    }
 }

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

@@ -6,6 +6,7 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import javafx.geometry.Insets;
 import javafx.scene.Group;
 import javafx.scene.Node;
@@ -33,15 +34,15 @@ public class TorStatusLabel extends Label {
     }
 
     public void update() {
-        boolean proxyInUse = AppServices.isUsingProxy();
-        boolean internal = AppServices.isTorRunning();
-
-        if(!proxyInUse || internal) {
+        if(!Config.get().isUseProxy()) {
             torConnectionTest.cancel();
-            if(internal) {
+            if(AppServices.isTorRunning()) {
                 setTooltip(new Tooltip("Internal Tor proxy enabled"));
             }
         } else if(!torConnectionTest.isRunning()) {
+            if(torConnectionTest.getState() == Worker.State.CANCELLED || torConnectionTest.getState() == Worker.State.FAILED) {
+                torConnectionTest.reset();
+            }
             torConnectionTest.setPeriod(Duration.seconds(20.0));
             torConnectionTest.setBackoffStrategy(null);
             torConnectionTest.setOnSucceeded(workerStateEvent -> {

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

@@ -6,6 +6,7 @@ import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
 import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.Theme;
@@ -13,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;
@@ -20,33 +22,42 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.embed.swing.SwingFXUtils;
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.Node;
 import javafx.scene.Scene;
+import javafx.scene.control.*;
 import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
-import javafx.scene.input.MouseEvent;
+import javafx.scene.control.MenuItem;
+import javafx.scene.image.Image;
+import javafx.scene.input.*;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.CubicCurve;
 import javafx.scene.shape.Line;
+import javafx.stage.FileChooser;
 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;
 
+import javax.imageio.ImageIO;
+import java.awt.image.*;
+import java.io.File;
+import java.io.IOException;
 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;
@@ -63,22 +74,24 @@ 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;
+    private ContextMenu contextMenu;
 
     private final EventHandler<MouseEvent> expandedDiagramHandler = new EventHandler<>() {
         @Override
         public void handle(MouseEvent event) {
-            if(!event.isConsumed()) {
+            if(!event.isConsumed() && event.getButton() != MouseButton.SECONDARY) {
                 Stage stage = new Stage(StageStyle.UNDECORATED);
-                stage.setTitle(walletTx.getPayments().iterator().next().getLabel());
+                stage.setTitle(getDiagramTitle());
                 stage.initOwner(TransactionDiagram.this.getScene().getWindow());
                 stage.initModality(Modality.WINDOW_MODAL);
                 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)));
                 }
 
@@ -95,7 +108,8 @@ public class TransactionDiagram extends GridPane {
                 expandedDiagram = new TransactionDiagram();
                 expandedDiagram.setId("transactionDiagram");
                 expandedDiagram.setExpanded(true);
-                updateExpandedDiagram();
+                expandedDiagram.setFinal(isFinal());
+                updateDerivedDiagram(expandedDiagram);
 
                 HBox buttonBox = new HBox();
                 buttonBox.setAlignment(Pos.CENTER_RIGHT);
@@ -122,6 +136,13 @@ public class TransactionDiagram extends GridPane {
         }
     };
 
+    private final EventHandler<ContextMenuEvent> contextMenuHandler = new EventHandler<>() {
+        @Override
+        public void handle(ContextMenuEvent event) {
+            contextMenu.show(getChildren().iterator().next(), event.getScreenX(), event.getScreenY());
+        }
+    };
+
     public void update(WalletTransaction walletTx) {
         setMinHeight(getDiagramHeight());
         setMaxHeight(getDiagramHeight());
@@ -133,9 +154,13 @@ public class TransactionDiagram extends GridPane {
             update();
             setOnMouseClicked(expandedDiagramHandler);
             if(expandedDiagram != null) {
-                updateExpandedDiagram();
+                updateDerivedDiagram(expandedDiagram);
             }
         }
+
+        if(getLabel() != null) {
+            getLabel().update(this);
+        }
     }
 
     public void update(String message) {
@@ -162,20 +187,22 @@ public class TransactionDiagram extends GridPane {
         getChildren().clear();
     }
 
-    private void updateExpandedDiagram() {
-        expandedDiagram.setFinal(isFinal());
-        expandedDiagram.setOptimizationStrategy(getOptimizationStrategy());
-        expandedDiagram.walletTx = walletTx;
+    private void updateDerivedDiagram(TransactionDiagram diagram) {
+        diagram.setOptimizationStrategy(getOptimizationStrategy());
+        diagram.walletTx = walletTx;
 
-        List<Map<BlockTransactionHashIndex, WalletNode>> utxoSets = expandedDiagram.getDisplayedUtxoSets();
-        int maxSetSize = utxoSets.stream().mapToInt(Map::size).max().orElse(0);
-        int maxRows = Math.max(maxSetSize * utxoSets.size(), walletTx.getPayments().size() + 2);
-        double diagramHeight = Math.max(DIAGRAM_HEIGHT, Math.min(EXPANDED_DIAGRAM_HEIGHT, maxRows * ROW_HEIGHT));
-        expandedDiagram.setMinHeight(diagramHeight);
-        expandedDiagram.setMaxHeight(diagramHeight);
-        expandedDiagram.update();
+        if(diagram.isExpanded()) {
+            List<Map<BlockTransactionHashIndex, WalletNode>> utxoSets = diagram.getDisplayedUtxoSets();
+            int maxSetSize = utxoSets.stream().mapToInt(Map::size).max().orElse(0);
+            int maxRows = Math.max(maxSetSize * utxoSets.size(), walletTx.getPayments().size() + 2);
+            double diagramHeight = Math.max(DIAGRAM_HEIGHT, Math.min(EXPANDED_DIAGRAM_HEIGHT, maxRows * ROW_HEIGHT));
+            diagram.setMinHeight(diagramHeight);
+            diagram.setMaxHeight(diagramHeight);
+        }
 
-        if(expandedDiagram.getScene() != null && expandedDiagram.getScene().getWindow() instanceof Stage stage) {
+        diagram.update();
+
+        if(diagram.getScene() != null && diagram.getScene().getWindow() instanceof Stage stage) {
             stage.sizeToScene();
         }
     }
@@ -205,6 +232,17 @@ public class TransactionDiagram extends GridPane {
 
         getChildren().clear();
         getChildren().addAll(inputsTypePane, inputsPane, inputsLinesPane, txPane, outputsLinesPane, outputsPane);
+
+        if(contextMenu == null) {
+            contextMenu = new ContextMenu();
+            MenuItem menuItem = new MenuItem("Save as Image...");
+            menuItem.setOnAction(event -> {
+                contextMenu.hide();
+                saveAsImage();
+            });
+            contextMenu.getItems().add(menuItem);
+            setOnContextMenuRequested(contextMenuHandler);
+        }
     }
 
     private List<Map<BlockTransactionHashIndex, WalletNode>> getDisplayedUtxoSets() {
@@ -420,6 +458,9 @@ public class TransactionDiagram extends GridPane {
                         label.setGraphic(excludeUtxoButton);
                         label.setContentDisplay(ContentDisplay.LEFT);
                     }
+
+                    ContextMenu contextMenu = new LabelContextMenu(walletNode.getAddress(), inputValue);
+                    label.setContextMenu(contextMenu);
                 } else {
                     if(input instanceof PayjoinBlockTransactionHashIndex) {
                         tooltip.setText("Added once transaction is signed and sent to the payjoin server");
@@ -428,14 +469,14 @@ public class TransactionDiagram extends GridPane {
                         StringJoiner joiner = new StringJoiner("\n");
                         joiner.add("Spending " + getSatsValue(inputValue) + " sats from" + (isExpanded() ? ":" : " (click to expand):"));
                         for(BlockTransactionHashIndex additionalInput : additionalReference.getAdditionalInputs()) {
-                            joiner.add(additionalInput.getHashAsString() + ":" + additionalInput.getIndex());
+                            joiner.add(getInputDescription(additionalInput));
                         }
                         tooltip.setText(joiner.toString());
                     } else if(input instanceof InvisibleBlockTransactionHashIndex) {
                         tooltip.setText("");
                     } else if(input instanceof AddUserBlockTransactionHashIndex) {
                         tooltip.setText("");
-                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
+                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getFeeWarningGlyph());
                         label.setOnMouseClicked(event -> {
                             EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
                             closeExpanded();
@@ -448,6 +489,9 @@ public class TransactionDiagram extends GridPane {
                             Address fromAddress = txOutput.getScript().getToAddress();
                             inputValue = txOutput.getValue();
                             tooltip.setText("Input of " + getSatsValue(inputValue) + " sats\n" + input.getHashAsString() + ":" + input.getIndex() + (fromAddress != null ? "\n" + fromAddress : ""));
+
+                            ContextMenu contextMenu = new LabelContextMenu(fromAddress, inputValue);
+                            label.setContextMenu(contextMenu);
                         } else {
                             tooltip.setText(input.getHashAsString() + ":" + input.getIndex());
                         }
@@ -497,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) {
@@ -599,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++) {
@@ -643,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);
-            WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getWallet().getWalletAddresses().get(payment.getAddress()) : null;
+            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);
@@ -676,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);
@@ -721,20 +767,29 @@ 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) {
             outputsBox.getChildren().add(outputNode.outputLabel);
             outputsBox.getChildren().add(createSpacer());
+
+            ContextMenu contextMenu = new LabelContextMenu(outputNode.address, outputNode.amount);
+            if(!outputNode.outputLabel.getChildren().isEmpty() && outputNode.outputLabel.getChildren().get(0) instanceof Label outputLabelControl) {
+                outputLabelControl.setContextMenu(contextMenu);
+            }
         }
 
         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 + "%)");
@@ -759,6 +814,11 @@ public class TransactionDiagram extends GridPane {
         outputsBox.getChildren().add(feeBox);
         outputsBox.getChildren().add(createSpacer());
 
+        if(walletTx.getFee() >= 0) {
+            ContextMenu contextMenu = new LabelContextMenu(null, walletTx.getFee());
+            feeLabel.setContextMenu(contextMenu);
+        }
+
         return outputsBox;
     }
 
@@ -778,12 +838,51 @@ public class TransactionDiagram extends GridPane {
         tooltip.setShowDuration(Duration.INDEFINITE);
         tooltip.getStyleClass().add("transaction-tooltip");
         txLabel.setTooltip(tooltip);
+
         txPane.getChildren().add(txLabel);
         txPane.getChildren().add(createSpacer());
 
         return txPane;
     }
 
+    private void saveAsImage() {
+        Stage window = new Stage();
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Save Image");
+        fileChooser.setInitialFileName(getDiagramTitle() + ".png");
+        AppServices.moveToActiveWindowScreen(window, 800, 450);
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            TransactionDiagram transactionDiagram = new TransactionDiagram();
+            transactionDiagram.setId("transactionDiagram");
+            transactionDiagram.setFinal(true);
+            transactionDiagram.setExpanded(isExpanded());
+            transactionDiagram.setBackground(new Background(new BackgroundFill(Color.TRANSPARENT, null, null)));
+            transactionDiagram.setStyle("-fx-text-background-color: " + (Config.get().getTheme() == Theme.DARK ? "#ffffff" : "#000000"));
+            updateDerivedDiagram(transactionDiagram);
+            Scene scene = new Scene(transactionDiagram);
+            scene.setFill(Color.TRANSPARENT);
+            scene.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+            scene.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+            scene.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+            Image image = scene.snapshot(null);
+            BufferedImage bufferedImage = SwingFXUtils.fromFXImage(image, null);
+            try {
+                ImageIO.write(bufferedImage, "png", file);
+            } catch(IOException e) {
+                AppServices.showErrorDialog("Error saving image", e.getMessage());
+            }
+        }
+    }
+
+    private String getDiagramTitle() {
+        if(!isFinal() && walletTx.getPayments().size() > 0 && walletTx.getPayments().get(0).getLabel() != null) {
+            return walletTx.getPayments().get(0).getLabel();
+        } else {
+            return "[" + walletTx.getTransaction().getTxId().toString().substring(0, 6) + "]";
+        }
+    }
+
     public double getDiagramHeight() {
         if(isExpanded()) {
             return getMaxHeight();
@@ -830,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) {
@@ -881,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");
@@ -1075,6 +1001,10 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
+    public WalletTransaction getWalletTransaction() {
+        return walletTx;
+    }
+
     public boolean isFinal() {
         return finalProperty.get();
     }
@@ -1087,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();
     }
@@ -1166,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) {
@@ -1174,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();
                 }
@@ -1193,24 +1135,56 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
-    private class OutputNode implements Comparable<OutputNode> {
-        public Node outputLabel;
+    private static class OutputNode {
+        public Pane outputLabel;
         public Address address;
         public long amount;
 
-        public OutputNode(Node outputLabel, Address address, long amount) {
+        public OutputNode(Pane outputLabel, Address address, long amount) {
             this.outputLabel = outputLabel;
             this.address = address;
             this.amount = amount;
         }
+    }
 
-        @Override
-        public int compareTo(TransactionDiagram.OutputNode o) {
-            try {
-                return getOutputIndex(address, amount) - getOutputIndex(o.address, o.amount);
-            } catch(Exception e) {
-                return 0;
+    private class LabelContextMenu extends ContextMenu {
+        public LabelContextMenu(Address address, long value) {
+            if(address != null) {
+                MenuItem copyAddress = new MenuItem("Copy Address");
+                copyAddress.setOnAction(event -> {
+                    hide();
+                    ClipboardContent content = new ClipboardContent();
+                    content.putString(address.toString());
+                    Clipboard.getSystemClipboard().setContent(content);
+                });
+                getItems().add(copyAddress);
+
+                MenuItem showAddress = new MenuItem("Show Address as QR...");
+                showAddress.setOnAction(event -> {
+                    hide();
+                    QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(address.toString());
+                    qrDisplayDialog.initOwner(TransactionDiagram.this.getScene().getWindow());
+                    qrDisplayDialog.showAndWait();
+                });
+                getItems().add(showAddress);
             }
+
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
+            copySatsValue.setOnAction(event -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(Long.toString(value));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+            MenuItem copyBtcValue = new MenuItem("Copy Value in BTC");
+            copyBtcValue.setOnAction(event -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+                content.putString(format.formatBtcValue(value));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+            getItems().addAll(copySatsValue, copyBtcValue);
         }
     }
 }

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

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