v1.7.2

improve legacy core wallet error messages
update categories for linux desktop installation
2026-07-31 03:56:16 +00:00 · 2023-02-09 13:18:30 +02:00 · 2023-02-09 13:14:03 +02:00 · 2023-02-09 10:53:45 +02:00 · 2023-02-09 10:29:19 +02:00 · 2023-02-09 09:06:30 +02:00
710 changed files with 48047 additions and 4040 deletions
@@ -7,33 +7,47 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
    steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
        with:
          submodules: true
-      - name: Set up JDK 15.0.2
-        if: ${{ runner.os == 'Linux' }}
-        uses: joschi/setup-jdk@v2
+      - name: Set up JDK 18.0.1
+        uses: actions/setup-java@v3
        with:
-          java-version: 15
-      - name: Set up JDK 14.0.2
-        if: ${{ runner.os == 'Windows' }}
-        uses: actions/setup-java@v1
-        with:
-          java-version: 14.0.2
+          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' || 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@v3
        with:
          name: Sparrow Build - ${{ runner.os }}
-          path: build/jpackage/*
+          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@v3
+        with:
+          name: Sparrow Build - ${{ runner.os }} Headless
+          path: |
+            build/jpackage/*
+            !build/jpackage/Sparrow/
@@ -1,3 +1,3 @@
 [submodule "drongo"]
 	path = drongo
-	url = git@github.com:sparrowwallet/drongo.git
+	url = ../../sparrowwallet/drongo.git
@@ -0,0 +1,2 @@
+Craig Raw <craigraw@gmail.com> Craig Raw <craig@quirk.biz>
+Craig Raw <craigraw@gmail.com> craigraw <craigraw@gmail.com>
@@ -2,33 +2,49 @@

 Sparrow is a modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability.

-More information (and release binaries) can be found at https://sparrowwallet.com. Release binaries are also available directly from [Github](https://github.com/sparrowwallet/sparrow/releases).
+More information (and release binaries) can be found at https://sparrowwallet.com. Release binaries are also available directly from [GitHub](https://github.com/sparrowwallet/sparrow/releases).

 ![Sparrow Wallet](https://sparrowwallet.com/assets/images/control-your-sends.png)

 ## Building

-To clone this project, use 
+To clone this project, use

 `git clone --recursive git@github.com:sparrowwallet/sparrow.git`

-In order to build, Sparrow requires Java 14 to be installed. The release packages can be built using
+or for those without SSH credentials:
+
+`git clone --recursive https://github.com/sparrowwallet/sparrow.git`
+
+In order to build, Sparrow requires Java 17 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:
+
+`sudo apt install -y rpm fakeroot binutils`
+
+
+The Sparrow binaries can be built from source using

 `./gradlew jpackage`

+Note that to build the Windows installer, you will need to install [WiX](https://github.com/wixtoolset/wix3/releases).
+
 When updating to the latest HEAD

 `git pull --recurse-submodules`

-All jar files created are reproducible builds.
+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.
+
+> 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

-If you prefer to run Sparrow directly from source, it can be launched with
+If you prefer to run Sparrow directly from source, it can be launched from within the project directory with

 `./sparrow`

-Java 14 or higher must be installed.
+Java 17 or higher must be installed. 

 ## Configuration

@@ -43,28 +59,31 @@ Usage: sparrow [options]
      Path to Sparrow home folder
    --help, -h
      Show usage
+    --level, -l
+      Set log level
+      Possible Values: [ERROR, WARN, INFO, DEBUG, TRACE]      
    --network, -n
      Network to use
-      Possible Values: [mainnet, testnet, regtest]
+      Possible Values: [mainnet, testnet, regtest, signet]
 ```

-As a fallback, the network (mainnet, testnet or regtest) can also be set using an environment variable `SPARROW_NETWORK`. For example:
+As a fallback, the network (mainnet, testnet, regtest or signet) can also be set using an environment variable `SPARROW_NETWORK`. For example:

 `export SPARROW_NETWORK=testnet`

 A final fallback which can be useful when running the Sparrow binary is to create a file called ``network-testnet`` in the Sparrow home folder (see below) to configure the testnet network.

-Note that if you are connecting to an Electrum server when using testnet, that server will need to running on testnet configuration as well.
+Note that if you are connecting to an Electrum server when using testnet, that server will need to be running on testnet configuration as well.

 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 and regtest configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
+Testnet, regtest and signet configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.

 ## Reporting Issues

@@ -74,6 +93,12 @@ Please use the [Issues](https://github.com/sparrowwallet/sparrow/issues) tab abo

 Sparrow is licensed under the Apache 2 software licence.

+## GPG Key
+
+The Sparrow release binaries here and on [sparrowwallet.com](https://sparrowwallet.com/download/) are signed using [craigraw's GPG key](https://keybase.io/craigraw):  
+Fingerprint: D4D0D3202FC06849A257B38DE94618334C674B40  
+64-bit: E946 1833 4C67 4B40
+
 ## Credit

 ![Yourkit](https://www.yourkit.com/images/yklogo.png)
@@ -1,16 +1,27 @@
+import java.awt.GraphicsEnvironment
+
 plugins {
    id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.9'
-    id 'org.kordamp.gradle.jdeps' version '0.9.0'
-    id 'org.beryx.jlink' version '2.22.0'
+    id 'org-openjfx-javafxplugin'
+    id 'extra-java-module-info'
+    id 'org.beryx.jlink' version '2.25.0'
 }

-def sparrowVersion = '1.1.0'
+def sparrowVersion = '1.7.2'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
    osName = "osx"
 }
+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"))

 group "com.sparrowwallet"
 version "${sparrowVersion}"
@@ -20,7 +31,7 @@ repositories {
    maven { url 'https://oss.sonatype.org/content/groups/public' }
    maven { url 'https://mymavenrepo.com/repo/29EACwkkGcoOKnbx3bxN/' }
    maven { url 'https://jitpack.io' }
-    maven { url 'http://maven.openimaj.org/' }
+    maven { url 'https://maven.ecs.soton.ac.uk/content/groups/maven.openimaj.org/' }
 }

 tasks.withType(AbstractArchiveTask) {
@@ -29,7 +40,7 @@ tasks.withType(AbstractArchiveTask) {
 }

 javafx {
-    version = "15"
+    version = "18"
    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
 }

@@ -38,29 +49,47 @@ java {
 }

 dependencies {
+    //Any changes to the dependencies must be reflected in the module definitions below!
    implementation(project(':drongo')) {
        exclude group: 'org.hamcrest'
        exclude group: 'junit'
    }
-    implementation('com.google.guava:guava:28.2-jre')
+    implementation('com.google.guava:guava:31.1-jre')
    implementation('com.google.code.gson:gson:2.8.6')
-    implementation('org.fxmisc.richtext:richtextfx:0.10.4')
-    implementation('no.tornado:tornadofx-controls:1.0.4')
-    implementation('com.google.zxing:javase:3.4.0')
-    implementation('com.github.arteam:simple-json-rpc-client:1.0')
-    implementation('com.github.arteam:simple-json-rpc-server:1.0') {
+    implementation('com.h2database:h2:2.1.214')
+    implementation('com.zaxxer:HikariCP:4.0.3')
+    implementation('org.jdbi:jdbi3-core:3.20.0') {
        exclude group: 'org.slf4j'
    }
-    implementation('com.sparrowwallet:hummingbird:1.5.2')
-    implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
+    implementation('org.jdbi:jdbi3-sqlobject:3.20.0')
+    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')
+    implementation('com.google.zxing:javase:3.4.0') {
+        exclude group: 'com.beust', module: 'jcommander'
+    }
+    implementation('com.beust:jcommander:1.81')
+    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.3') {
+        exclude group: 'org.slf4j'
+    }
+    implementation('com.sparrowwallet:hummingbird:1.6.4')
+    implementation('co.nstant.in:cbor:0.9')
+    implementation("com.nativelibs4java:bridj${targetName}:0.7-20140918-3") {
        exclude group: 'com.google.android.tools', module: 'dx'
    }
-    implementation('com.github.sarxos:webcam-capture:0.3.13-SNAPSHOT') {
+    implementation("com.github.sarxos:webcam-capture${targetName}:0.3.13-SNAPSHOT") {
        exclude group: 'com.nativelibs4java', module: 'bridj'
    }
-    implementation("com.sparrowwallet:netlayer-jpms-${osName}:0.6.8")
+    implementation("com.sparrowwallet:netlayer-jpms-${osName}${targetName}:0.6.8") {
+        exclude group: 'org.jetbrains.kotlin'
+    }
+    implementation('org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20')
    implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
-    implementation('org.controlsfx:controlsfx:11.0.2' ) {
+    implementation('org.controlsfx:controlsfx:11.1.0' ) {
        exclude group: 'org.openjfx', module: 'javafx-base'
        exclude group: 'org.openjfx', module: 'javafx-graphics'
        exclude group: 'org.openjfx', module: 'javafx-controls'
@@ -69,11 +98,28 @@ dependencies {
        exclude group: 'org.openjfx', module: 'javafx-web'
        exclude group: 'org.openjfx', module: 'javafx-media'
    }
-    implementation('dev.bwt:bwt-jni:0.1.7')
-    testImplementation('junit:junit:4.12')
+    implementation('dev.bwt:bwt-jni:0.1.8')
+    implementation('net.sourceforge.javacsv:javacsv:2.0')
+    implementation('org.slf4j:jul-to-slf4j:1.7.30') {
+        exclude group: 'org.slf4j'
+    }
+    implementation('com.sparrowwallet.nightjar:nightjar:0.2.34')
+    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('net.sourceforge.streamsupport:streamsupport:1.7.0')
+    implementation('com.github.librepdf:openpdf:1.3.27')
+    implementation('com.googlecode.lanterna:lanterna:3.1.1')
+    implementation('net.coobird:thumbnailator:0.4.18')
+    implementation('com.github.hervegirod:fxsvgimage:1.0b2')
+    implementation('com.sparrowwallet:toucan:0.9.0')
+    testImplementation('junit:junit:4.13.1')
 }

-mainClassName = 'com.sparrowwallet.sparrow/com.sparrowwallet.sparrow.MainApp'
+application {
+    mainModule = 'com.sparrowwallet.sparrow'
+    mainClass = 'com.sparrowwallet.sparrow.SparrowWallet'
+}

 compileJava {
    options.with {
@@ -87,13 +133,18 @@ compileJava {
 processResources {
    doLast {
        delete fileTree("$buildDir/resources/main/native").matching {
-            exclude "${osName}/**"
+            exclude "${osName}/${osArch}/**"
        }
    }
 }

+test {
+    jvmArgs '--add-opens=java.base/java.io=com.google.gson'
+}
+
 run {
-    applicationDefaultJvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
+    applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError",
+                                 "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
                                 "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls",
                                 "--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls",
                                 "--add-opens=javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls",
@@ -101,6 +152,7 @@ run {
                                 "--add-opens=javafx.base/com.sun.javafx.event=org.controlsfx.controls",
                                 "--add-opens=javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow",
                                 "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow",
+                                 "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml",
                                 "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx",
                                 "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx",
                                 "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx",
@@ -108,12 +160,17 @@ 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=java.base/java.net=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"]

    if(os.macOsX) {
-        applicationDefaultJvmArgs += ["-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow.png",
+        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 {
@@ -123,12 +180,17 @@ jlink {
        requires 'java.xml'
        requires 'java.logging'
        requires 'javafx.base'
-        requires 'com.fasterxml.jackson.databind'
        requires 'jdk.crypto.cryptoki'
        requires 'java.management'
+        requires 'io.leangen.geantyref'
+        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']
+    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",
@@ -139,18 +201,34 @@ jlink {
                   "--add-opens=javafx.base/com.sun.javafx.event=org.controlsfx.controls",
                   "--add-opens=javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow",
                   "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow",
-                   "--add-opens=javafx.graphics/com.sun.javafx.tk=com.sparrowwallet.merged.module",
-                   "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=com.sparrowwallet.merged.module",
-                   "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.merged.module",
-                   "--add-opens=javafx.controls/com.sun.javafx.scene.control=com.sparrowwallet.merged.module",
-                   "--add-opens=javafx.graphics/com.sun.javafx.menu=com.sparrowwallet.merged.module",
+                   "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml",
+                   "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx",
+                   "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx",
+                   "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx",
+                   "--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/com.sun.javafx.application=com.sparrowwallet.sparrow",
                   "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
-                   "--add-reads=com.sparrowwallet.merged.module=java.desktop"]
+                   "--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=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"]

+        if(os.windows) {
+            jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
+        }
        if(os.macOsX) {
-            jvmArgs += "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"
+            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")
@@ -158,16 +236,21 @@ jlink {
        imageName = "Sparrow"
        installerName = "Sparrow"
        appVersion = "${sparrowVersion}"
-        skipInstaller = os.macOsX
+        skipInstaller = os.macOsX || properties.skipInstallers
        imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/associations.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/auth47.properties', '--file-associations', 'src/main/deploy/lightning.properties', '--license-file', 'LICENSE']
        if(os.windows) {
-            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut']
+            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-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) {
@@ -177,3 +260,375 @@ jlink {
        }
    }
 }
+
+task removeGroupWritePermission(type: Exec) {
+    commandLine 'chmod', '-R', 'g-w', "$buildDir/jpackage/Sparrow"
+}
+
+task packageZipDistribution(type: Zip) {
+    archiveFileName = "Sparrow-${sparrowVersion}.zip"
+    destinationDirectory = file("$buildDir/jpackage")
+    from("$buildDir/jpackage/") {
+        include "Sparrow/**"
+        include "Sparrow.app/**"
+    }
+}
+
+task packageTarDistribution(type: Tar) {
+    dependsOn removeGroupWritePermission
+    archiveFileName = "sparrow-${sparrowVersion}-${releaseArch}.tar.gz"
+    destinationDirectory = file("$buildDir/jpackage")
+    compression = Compression.GZIP
+    from("$buildDir/jpackage/") {
+        include "Sparrow/**"
+    }
+}
+
+extraJavaModuleInfo {
+    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')
+        exports('com.fasterxml.jackson.core.exc')
+        exports('com.fasterxml.jackson.core.filter')
+        exports('com.fasterxml.jackson.core.format')
+        exports('com.fasterxml.jackson.core.io')
+        exports('com.fasterxml.jackson.core.json')
+        exports('com.fasterxml.jackson.core.json.async')
+        exports('com.fasterxml.jackson.core.sym')
+        exports('com.fasterxml.jackson.core.type')
+        exports('com.fasterxml.jackson.core.util')
+        uses('com.fasterxml.jackson.core.ObjectCodec')
+    }
+    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.13.2.jar', 'com.fasterxml.jackson.databind', '2.13.2') {
+        requires('java.desktop')
+        requires('java.logging')
+        requires('com.fasterxml.jackson.annotation')
+        requires('com.fasterxml.jackson.core')
+        requires('java.sql')
+        requires('java.xml')
+        exports('com.fasterxml.jackson.databind')
+        exports('com.fasterxml.jackson.databind.annotation')
+        exports('com.fasterxml.jackson.databind.cfg')
+        exports('com.fasterxml.jackson.databind.deser')
+        exports('com.fasterxml.jackson.databind.deser.impl')
+        exports('com.fasterxml.jackson.databind.deser.std')
+        exports('com.fasterxml.jackson.databind.exc')
+        exports('com.fasterxml.jackson.databind.ext')
+        exports('com.fasterxml.jackson.databind.introspect')
+        exports('com.fasterxml.jackson.databind.json')
+        exports('com.fasterxml.jackson.databind.jsonFormatVisitors')
+        exports('com.fasterxml.jackson.databind.jsonschema')
+        exports('com.fasterxml.jackson.databind.jsontype')
+        exports('com.fasterxml.jackson.databind.jsontype.impl')
+        exports('com.fasterxml.jackson.databind.module')
+        exports('com.fasterxml.jackson.databind.node')
+        exports('com.fasterxml.jackson.databind.ser')
+        exports('com.fasterxml.jackson.databind.ser.impl')
+        exports('com.fasterxml.jackson.databind.ser.std')
+        exports('com.fasterxml.jackson.databind.type')
+        exports('com.fasterxml.jackson.databind.util')
+        uses('com.fasterxml.jackson.databind.Module')
+    }
+    module('tornadofx-controls-1.0.4.jar', 'tornadofx.controls', '1.0.4') {
+        exports('tornadofx.control')
+        requires('javafx.controls')
+    }
+    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')
+        requires('com.fasterxml.jackson.annotation')
+        requires('com.fasterxml.jackson.databind')
+        requires('org.jetbrains.annotations')
+    }
+    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')
+        requires('com.fasterxml.jackson.core')
+        requires('com.fasterxml.jackson.databind')
+        requires('simple.json.rpc.core')
+    }
+    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')
+        requires('org.slf4j')
+        requires('com.fasterxml.jackson.databind')
+    }
+    module("bridj${targetName}-0.7-20140918-3.jar", 'com.nativelibs4java.bridj', '0.7-20140918-3') {
+        exports('org.bridj')
+        exports('org.bridj.cpp')
+        requires('java.logging')
+    }
+    module("webcam-capture${targetName}-0.3.13-SNAPSHOT.jar", 'com.github.sarxos.webcam.capture', '0.3.13-SNAPSHOT') {
+        exports('com.github.sarxos.webcam')
+        exports('com.github.sarxos.webcam.ds.buildin')
+        exports('com.github.sarxos.webcam.ds.buildin.natives')
+        requires('java.desktop')
+        requires('com.nativelibs4java.bridj')
+        requires('org.slf4j')
+    }
+    module('centerdevice-nsmenufx-2.1.7.jar', 'centerdevice.nsmenufx', '2.1.7') {
+        exports('de.codecentric.centerdevice')
+        requires('javafx.base')
+        requires('javafx.controls')
+        requires('javafx.graphics')
+    }
+    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')
+    }
+    module('listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar', 'com.google.guava.listenablefuture', '9999.0-empty-to-avoid-conflict-with-guava')
+    module('guava-31.1-jre.jar', 'com.google.common', '31.1-jre') {
+        exports('com.google.common.eventbus')
+        exports('com.google.common.net')
+        exports('com.google.common.base')
+        exports('com.google.common.collect')
+        exports('com.google.common.io')
+        exports('com.google.common.primitives')
+        exports('com.google.common.math')
+        requires('failureaccess')
+        requires('java.logging')
+    }
+    module('jsr305-3.0.2.jar', 'com.google.code.findbugs.jsr305', '3.0.2')
+    module('j2objc-annotations-1.3.jar', 'com.google.j2objc.j2objc.annotations', '1.3')
+    module('jdbi3-core-3.20.0.jar', 'org.jdbi.v3.core', '3.20.0') {
+        exports('org.jdbi.v3.core')
+        exports('org.jdbi.v3.core.mapper')
+        exports('org.jdbi.v3.core.statement')
+        exports('org.jdbi.v3.core.result')
+        exports('org.jdbi.v3.core.h2')
+        exports('org.jdbi.v3.core.spi')
+        requires('io.leangen.geantyref')
+        requires('java.sql')
+        requires('org.slf4j')
+    }
+    module('geantyref-1.3.11.jar', 'io.leangen.geantyref', '1.3.11') {
+        exports('io.leangen.geantyref')
+    }
+    module('richtextfx-0.10.4.jar', 'org.fxmisc.richtext', '0.10.4') {
+        exports('org.fxmisc.richtext')
+        exports('org.fxmisc.richtext.event')
+        exports('org.fxmisc.richtext.model')
+        requires('javafx.base')
+        requires('javafx.controls')
+        requires('javafx.graphics')
+        requires('org.fxmisc.flowless')
+        requires('org.reactfx.reactfx')
+        requires('org.fxmisc.undo.undofx')
+        requires('org.fxmisc.wellbehaved')
+    }
+    module('undofx-2.1.0.jar', 'org.fxmisc.undo.undofx', '2.1.0') {
+        requires('javafx.base')
+        requires('javafx.controls')
+        requires('javafx.graphics')
+        requires('org.reactfx.reactfx')
+    }
+    module('flowless-0.6.1.jar', 'org.fxmisc.flowless', '0.6.1') {
+        exports('org.fxmisc.flowless')
+        requires('javafx.base')
+        requires('javafx.controls')
+        requires('javafx.graphics')
+        requires('org.reactfx.reactfx')
+    }
+    module('reactfx-2.0-M5.jar', 'org.reactfx.reactfx', '2.0-M5') {
+        exports('org.reactfx')
+        exports('org.reactfx.value')
+        exports('org.reactfx.collection')
+        exports('org.reactfx.util')
+        requires('javafx.base')
+        requires('javafx.graphics')
+        requires('javafx.controls')
+    }
+    module('rxjavafx-2.2.2.jar', 'io.reactivex.rxjava2fx', '2.2.2') {
+        exports('io.reactivex.rxjavafx.schedulers')
+        requires('io.reactivex.rxjava2')
+        requires('javafx.graphics')
+    }
+    module('wellbehavedfx-0.3.3.jar', 'org.fxmisc.wellbehaved', '0.3.3') {
+        requires('javafx.base')
+        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')
+        exports('kotlin.jvm')
+        exports('kotlin.collections')
+    }
+    module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') {
+        exports('com.sparrowwallet.hummingbird')
+        exports('com.sparrowwallet.hummingbird.registry')
+        requires('co.nstant.in.cbor')
+    }
+    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.34.jar', 'com.sparrowwallet.nightjar', '0.2.34') {
+        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('throwing-supplier-1.0.3.jar', 'zeroleak.throwingsupplier', '1.0.3') {
+        exports('com.zeroleak.throwingsupplier')
+    }
+    module('okhttp-2.7.5.jar', 'com.squareup.okhttp', '2.7.5') {
+        exports('com.squareup.okhttp')
+    }
+    module('okio-1.6.0.jar', 'com.squareup.okio', '1.6.0') {
+        exports('okio')
+    }
+    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('thumbnailator-0.4.18.jar', 'net.coobird.thumbnailator', '0.4.18') {
+        exports('net.coobird.thumbnailator')
+        requires('java.desktop')
+    }
+    module('fxsvgimage-1.0b2.jar', 'com.github.hervegirod', '1.0b2') {
+        exports('org.girod.javafx.svgimage')
+        requires('javafx.graphics')
+        requires('java.xml')
+    }
+    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('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') {
+        requires('java.xml')
+    }
+    module('jcommander-1.81.jar', 'com.beust.jcommander', '1.81') {
+        exports('com.beust.jcommander')
+    }
+    module('junit-4.12.jar', 'junit', '4.12') {
+        exports('org.junit')
+        requires('org.hamcrest.core')
+    }
+    module('hamcrest-core-1.3.jar', 'org.hamcrest.core', '1.3')
+}
@@ -0,0 +1,30 @@
+plugins {
+    id 'java-gradle-plugin' // so we can assign and ID to our plugin
+}
+
+dependencies {
+    implementation 'org.ow2.asm:asm:8.0.1'
+    implementation 'com.google.gradle:osdetector-gradle-plugin:1.7.0'
+    implementation 'org.javamodularity:moduleplugin:1.8.12'
+}
+
+repositories {
+    mavenCentral()
+    maven {
+        url "https://plugins.gradle.org/m2/"
+    }
+}
+
+gradlePlugin {
+    plugins {
+        // here we register our plugin with an ID
+        register("extra-java-module-info") {
+            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"
+        }
+    }
+}
@@ -0,0 +1,54 @@
+package org.gradle.sample.transform.javamodules;
+
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.attributes.Attribute;
+import org.gradle.api.plugins.JavaPlugin;
+
+/**
+ * Entry point of our plugin that should be applied in the root project.
+ */
+public class ExtraModuleInfoPlugin implements Plugin<Project> {
+
+    @Override
+    public void apply(Project project) {
+        // register the plugin extension as 'extraJavaModuleInfo {}' configuration block
+        ExtraModuleInfoPluginExtension extension = project.getObjects().newInstance(ExtraModuleInfoPluginExtension.class);
+        project.getExtensions().add(ExtraModuleInfoPluginExtension.class, "extraJavaModuleInfo", extension);
+
+        // setup the transform for all projects in the build
+        project.getPlugins().withType(JavaPlugin.class).configureEach(javaPlugin -> configureTransform(project, extension));
+    }
+
+    private void configureTransform(Project project, ExtraModuleInfoPluginExtension extension) {
+        Attribute<String> artifactType = Attribute.of("artifactType", String.class);
+        Attribute<Boolean> javaModule = Attribute.of("javaModule", Boolean.class);
+
+        // compile and runtime classpath express that they only accept modules by requesting the javaModule=true attribute
+        project.getConfigurations().matching(this::isResolvingJavaPluginConfiguration).all(
+                c -> c.getAttributes().attribute(javaModule, true));
+
+        // all Jars have a javaModule=false attribute by default; the transform also recognizes modules and returns them without modification
+        project.getDependencies().getArtifactTypes().getByName("jar").getAttributes().attribute(javaModule, false);
+
+        // register the transform for Jars and "javaModule=false -> javaModule=true"; the plugin extension object fills the input parameter
+        project.getDependencies().registerTransform(ExtraModuleInfoTransform.class, t -> {
+            t.parameters(p -> {
+                p.setModuleInfo(extension.getModuleInfo());
+                p.setAutomaticModules(extension.getAutomaticModules());
+            });
+            t.getFrom().attribute(artifactType, "jar").attribute(javaModule, false);
+            t.getTo().attribute(artifactType, "jar").attribute(javaModule, true);
+        });
+    }
+
+    private boolean isResolvingJavaPluginConfiguration(Configuration configuration) {
+        if (!configuration.isCanBeResolved()) {
+            return false;
+        }
+        return configuration.getName().endsWith(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME.substring(1))
+                || configuration.getName().endsWith(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME.substring(1))
+                || configuration.getName().endsWith(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME.substring(1));
+    }
+}
@@ -0,0 +1,52 @@
+package org.gradle.sample.transform.javamodules;
+
+
+import org.gradle.api.Action;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A data class to collect all the module information we want to add.
+ * Here the class is used as extension that can be configured in the build script
+ * and as input to the ExtraModuleInfoTransform that add the information to Jars.
+ */
+public class ExtraModuleInfoPluginExtension {
+
+    private final Map<String, ModuleInfo> moduleInfo = new HashMap<>();
+    private final Map<String, String> automaticModules = new HashMap<>();
+
+    /**
+     * Add full module information for a given Jar file.
+     */
+    public void module(String jarName, String moduleName, String moduleVersion) {
+        module(jarName, moduleName, moduleVersion, null);
+    }
+
+    /**
+     * Add full module information, including exported packages and dependencies, for a given Jar file.
+     */
+    public void module(String jarName, String moduleName, String moduleVersion, @Nullable Action<? super ModuleInfo> conf) {
+        ModuleInfo moduleInfo = new ModuleInfo(moduleName, moduleVersion);
+        if (conf != null) {
+            conf.execute(moduleInfo);
+        }
+        this.moduleInfo.put(jarName, moduleInfo);
+    }
+
+    /**
+     * Add only an automatic module name to a given jar file.
+     */
+    public void automaticModule(String jarName, String moduleName) {
+        automaticModules.put(jarName, moduleName);
+    }
+
+    protected Map<String, ModuleInfo> getModuleInfo() {
+        return moduleInfo;
+    }
+
+    protected Map<String, String> getAutomaticModules() {
+        return automaticModules;
+    }
+}
@@ -0,0 +1,176 @@
+package org.gradle.sample.transform.javamodules;
+
+import org.gradle.api.artifacts.transform.InputArtifact;
+import org.gradle.api.artifacts.transform.TransformAction;
+import org.gradle.api.artifacts.transform.TransformOutputs;
+import org.gradle.api.artifacts.transform.TransformParameters;
+import org.gradle.api.file.FileSystemLocation;
+import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.Input;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.ModuleVisitor;
+import org.objectweb.asm.Opcodes;
+
+import java.io.*;
+import java.util.Collections;
+import java.util.Map;
+import java.util.jar.*;
+import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+
+/**
+ * An artifact transform that applies additional information to Jars without module information.
+ * The transformation fails the build if a Jar does not contain information and no extra information
+ * was defined for it. This way we make sure that all Jars are turned into modules.
+ */
+abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraModuleInfoTransform.Parameter> {
+
+    public static class Parameter implements TransformParameters, Serializable {
+        private Map<String, ModuleInfo> moduleInfo = Collections.emptyMap();
+        private Map<String, String> automaticModules = Collections.emptyMap();
+
+        @Input
+        public Map<String, ModuleInfo> getModuleInfo() {
+            return moduleInfo;
+        }
+
+        @Input
+        public Map<String, String> getAutomaticModules() {
+            return automaticModules;
+        }
+
+        public void setModuleInfo(Map<String, ModuleInfo> moduleInfo) {
+            this.moduleInfo = moduleInfo;
+        }
+
+        public void setAutomaticModules(Map<String, String> automaticModules) {
+            this.automaticModules = automaticModules;
+        }
+    }
+
+    @InputArtifact
+    protected abstract Provider<FileSystemLocation> getInputArtifact();
+
+    @Override
+    public void transform(TransformOutputs outputs) {
+        Map<String, ModuleInfo> moduleInfo = getParameters().moduleInfo;
+        Map<String, String> automaticModules = getParameters().automaticModules;
+        File originalJar = getInputArtifact().get().getAsFile();
+        String originalJarName = originalJar.getName();
+
+        //Recreate jackson jars as open, non-synthetic modules
+        if ((isModule(originalJar) && !originalJarName.contains("jackson")) || originalJarName.startsWith("javafx-")) {
+            outputs.file(originalJar);
+        } else if (moduleInfo.containsKey(originalJarName)) {
+            addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), moduleInfo.get(originalJarName));
+        } else if (isAutoModule(originalJar)) {
+            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);
+        }
+    }
+
+    private boolean isModule(File jar) {
+        Pattern moduleInfoClassMrjarPath = Pattern.compile("META-INF/versions/\\d+/module-info.class");
+        try (JarInputStream inputStream =  new JarInputStream(new FileInputStream(jar))) {
+            boolean isMultiReleaseJar = containsMultiReleaseJarEntry(inputStream);
+            ZipEntry next = inputStream.getNextEntry();
+            while (next != null) {
+                if ("module-info.class".equals(next.getName())) {
+                    return true;
+                }
+                if (isMultiReleaseJar && moduleInfoClassMrjarPath.matcher(next.getName()).matches()) {
+                    return true;
+                }
+                next = inputStream.getNextEntry();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return false;
+    }
+
+    private boolean containsMultiReleaseJarEntry(JarInputStream jarStream) {
+        Manifest manifest = jarStream.getManifest();
+        return manifest != null && Boolean.parseBoolean(manifest.getMainAttributes().getValue("Multi-Release"));
+    }
+
+    private boolean isAutoModule(File jar) {
+        try (JarInputStream inputStream = new JarInputStream(new FileInputStream(jar))) {
+            return inputStream.getManifest().getMainAttributes().getValue("Automatic-Module-Name") != null;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private File getModuleJar(TransformOutputs outputs, File originalJar) {
+        return outputs.file(originalJar.getName().substring(0, originalJar.getName().lastIndexOf('.')) + "-module.jar");
+    }
+
+    private static void addAutomaticModuleName(File originalJar, File moduleJar, String moduleName) {
+        try (JarInputStream inputStream = new JarInputStream(new FileInputStream(originalJar))) {
+            Manifest manifest = inputStream.getManifest();
+            manifest.getMainAttributes().put(new Attributes.Name("Automatic-Module-Name"), moduleName);
+            try (JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(moduleJar), inputStream.getManifest())) {
+                copyEntries(inputStream, outputStream);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void addModuleDescriptor(File originalJar, File moduleJar, ModuleInfo moduleInfo) {
+        try (JarInputStream inputStream = new JarInputStream(new FileInputStream(originalJar))) {
+            Manifest manifest = inputStream.getManifest();
+            if(manifest == null) {
+                manifest = new Manifest();
+            }
+            try (JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(moduleJar), manifest)) {
+                copyEntries(inputStream, outputStream);
+                outputStream.putNextEntry(new JarEntry("module-info.class"));
+                outputStream.write(addModuleInfo(moduleInfo));
+                outputStream.closeEntry();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static void copyEntries(JarInputStream inputStream, JarOutputStream outputStream) throws IOException {
+        JarEntry jarEntry = inputStream.getNextJarEntry();
+        while (jarEntry != null) {
+            if(!jarEntry.getName().equals("module-info.class")) {
+                outputStream.putNextEntry(jarEntry);
+                outputStream.write(inputStream.readAllBytes());
+                outputStream.closeEntry();
+            }
+            jarEntry = inputStream.getNextJarEntry();
+        }
+    }
+
+    private static byte[] addModuleInfo(ModuleInfo moduleInfo) {
+        ClassWriter classWriter = new ClassWriter(0);
+        classWriter.visit(Opcodes.V9, Opcodes.ACC_MODULE, "module-info", null, null, null);
+        ModuleVisitor moduleVisitor = classWriter.visitModule(moduleInfo.getModuleName(), Opcodes.ACC_OPEN, moduleInfo.getModuleVersion());
+        for (String packageName : moduleInfo.getExports()) {
+            moduleVisitor.visitExport(packageName.replace('.', '/'), 0);
+        }
+        moduleVisitor.visitRequire("java.base", 0, null);
+        for (String requireName : moduleInfo.getRequires()) {
+            moduleVisitor.visitRequire(requireName, 0, null);
+        }
+        for (String requireName : moduleInfo.getRequiresTransitive()) {
+            moduleVisitor.visitRequire(requireName, Opcodes.ACC_TRANSITIVE, null);
+        }
+        for (String usesName : moduleInfo.getUses()) {
+            moduleVisitor.visitUse(usesName.replace('.', '/'));
+        }
+        moduleVisitor.visitEnd();
+        classWriter.visitEnd();
+        return classWriter.toByteArray();
+    }
+}
@@ -0,0 +1,62 @@
+package org.gradle.sample.transform.javamodules;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Data class to hold the information that should be added as module-info.class to an existing Jar file.
+ */
+public class ModuleInfo implements Serializable {
+    private String moduleName;
+    private String moduleVersion;
+    private List<String> exports = new ArrayList<>();
+    private List<String> requires = new ArrayList<>();
+    private List<String> requiresTransitive = new ArrayList<>();
+    private List<String> uses = new ArrayList<>();
+
+    ModuleInfo(String moduleName, String moduleVersion) {
+        this.moduleName = moduleName;
+        this.moduleVersion = moduleVersion;
+    }
+
+    public void exports(String exports) {
+        this.exports.add(exports);
+    }
+
+    public void requires(String requires) {
+        this.requires.add(requires);
+    }
+
+    public void requiresTransitive(String requiresTransitive) {
+        this.requiresTransitive.add(requiresTransitive);
+    }
+
+    public void uses(String uses) {
+        this.uses.add(uses);
+    }
+
+    public String getModuleName() {
+        return moduleName;
+    }
+
+    protected String getModuleVersion() {
+        return moduleVersion;
+    }
+
+    protected List<String> getExports() {
+        return exports;
+    }
+
+    protected List<String> getRequires() {
+        return requires;
+    }
+
+    protected List<String> getRequiresTransitive() {
+        return requiresTransitive;
+    }
+
+    protected List<String> getUses() {
+        return uses;
+    }
+}
@@ -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;
+    }
+}
@@ -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()));
+        }
+    }
+}
@@ -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 )
+        );
+
+    }
+}
@@ -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);
+    }
+}
@@ -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()));
+    }
+}
@@ -0,0 +1,11 @@
+## Sparrow Wallet Repository Docs
+
+Note that most documentation for the project can be found at https://sparrowwallet.com/docs/. 
+The documentation here is mainly developer-related resources.
+
+### [Reproducible builds](reproducible.md)
+
+Documentation to create and verify a build of the project against the released binaries.
+
+
+
@@ -0,0 +1,134 @@
+# Reproducible builds
+
+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.
+Work on resolving both of these issues is ongoing.
+
+## Reproducing a release
+
+### 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.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/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:
+
+- 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 procede.
+
+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 18.0.1-tem
+```
+
+### 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
+
+First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
+
+```shell
+GIT_TAG="1.7.2"
+```
+
+The project can then be initially cloned as follows:
+
+```shell
+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
+
+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`).
+Then compare all of the folders and files recursively:
+
+```shell
+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.
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
@@ -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,78 +17,113 @@
 #

 ##############################################################################
-##
-##  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
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null

-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+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
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

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

+
 # Determine the Java command to use to start the JVM.
 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
@@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
    fi
 else
-    JAVACMD="java"
+    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.

 Please set the JAVA_HOME variable in your environment to match the
@@ -105,79 +140,105 @@ location of your Java installation."
 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=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=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
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+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" "$@"
@@ -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 init
+if %ERRORLEVEL% equ 0 goto execute

 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute

 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,38 +65,26 @@ echo location of your Java installation.

 goto fail

-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
@rem Setup the command line

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 :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
@@ -1,5 +1,6 @@
 #!/usr/bin/env sh

+cd `dirname $0`
 args="$*"
 args="${args%"${args##*[![:space:]]}"}"

@@ -1,3 +0,0 @@
-extension=psbt
-mime-type=application/octet-stream
-description=Partially Signed Bitcoin Transaction
@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/auth47
+description=Auth47 Authentication URI
@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/bitcoin
+description=Bitcoin Scheme URI
@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/lightning
+description=LNURL URI
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Sparrow
+Comment=Sparrow
+Exec=/opt/sparrow/bin/Sparrow %U
+Icon=/opt/sparrow/lib/Sparrow.png
+Terminal=false
+Type=Application
+Categories=Finance;Network;
+MimeType=application/psbt;application/bitcoin-transaction;x-scheme-handler/bitcoin;x-scheme-handler/auth47;x-scheme-handler/lightning
@@ -21,7 +21,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
-  <string>1.1.0</string>
+  <string>1.7.2</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -35,5 +35,96 @@
  <string>true</string>
  <key>NSCameraUsageDescription</key>
  <string>Sparrow requires access to the camera in order to scan QR codes</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+      <dict>
+          <key>CFBundleURLName</key>
+          <string>com.sparrowwallet.sparrow.bitcoin</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <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>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>org.bitcoin.psbt</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>psbt</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>Partially Signed Bitcoin Transaction</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>org.bitcoin.txn</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>txn</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>Bitcoin Transaction</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
+  </array>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+     <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeIconFile</key>
+        <string>sparrow.icns</string>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+            <string>psbt</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>Partially Signed Bitcoin Transaction</string>
+        <key>LSHandlerRank</key>
+        <string>Default</string>
+     </dict>
+     <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeIconFile</key>
+        <string>sparrow.icns</string>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+            <string>txn</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>Bitcoin Transaction</string>
+        <key>LSHandlerRank</key>
+        <string>Default</string>
+     </dict>
+ </array>
 </dict>
 </plist>
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?ifdef JpIsSystemWide ?>
+    <?define JpInstallScope="perMachine"?>
+  <?else?>
+    <?define JpInstallScope="perUser"?>
+  <?endif?>
+
+  <?define JpProductLanguage=1033 ?>
+  <?define JpInstallerVersion=200 ?>
+  <?define JpCompressedMsi=yes ?>
+
+  <?include $(var.JpConfigDir)/overrides.wxi ?>
+
+  <Product
+    Id="$(var.JpProductCode)"
+    Name="$(var.JpAppName)"
+    Language="$(var.JpProductLanguage)"
+    Version="$(var.JpAppVersion)"
+    Manufacturer="$(var.JpAppVendor)"
+    UpgradeCode="$(var.JpProductUpgradeCode)">
+
+    <Package
+      Description="$(var.JpAppDescription)"
+      Manufacturer="$(var.JpAppVendor)"
+      InstallerVersion="$(var.JpInstallerVersion)"
+      Compressed="$(var.JpCompressedMsi)"
+      InstallScope="$(var.JpInstallScope)" Platform="x64"
+    />
+
+    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
+
+    <?ifdef JpAllowDowngrades ?>
+    <?ifdef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="yes"
+      Disallow="no"
+    />
+    <?endif?>
+    <?endif?>
+
+    <?ifdef JpAllowDowngrades ?>
+    <?ifndef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="yes"
+      Disallow="yes"
+      DisallowUpgradeErrorMessage="!(loc.DisallowUpgradeErrorMessage)"
+    />
+    <?endif?>
+    <?endif?>
+
+    <?ifndef JpAllowDowngrades ?>
+    <?ifdef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="no"
+      Disallow="no"
+      DowngradeErrorMessage="!(loc.DowngradeErrorMessage)"
+    />
+    <?endif?>
+    <?endif?>
+
+    <?ifndef JpAllowDowngrades ?>
+    <?ifndef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="no"
+      Disallow="yes"
+      DowngradeErrorMessage="!(loc.DowngradeErrorMessage)"
+      DisallowUpgradeErrorMessage="!(loc.DisallowUpgradeErrorMessage)"
+    />
+    <?endif?>
+    <?endif?>
+
+    <!-- Standard required root -->
+    <Directory Id="TARGETDIR" Name="SourceDir"/>
+
+    <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"/>
+                <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="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>
+
+    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
+      <ComponentGroupRef Id="Shortcuts"/>
+      <ComponentGroupRef Id="Files"/>
+      <ComponentGroupRef Id="FileAssociations"/>
+      <ComponentRef Id="RegistryEntries"/>
+    </Feature>
+
+    <?ifdef JpInstallDirChooser ?>
+    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
+    <CustomAction Id="JpCheckInstallDir" BinaryKey="JpCaDll" DllEntry="CheckInstallDir" />
+    <?endif?>
+
+    <UI>
+      <?ifdef JpInstallDirChooser ?>
+      <Dialog Id="JpInvalidInstallDir" Width="300" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
+        <Control Id="JpInvalidInstallDirYes" Type="PushButton" X="100" Y="55" Width="50" Height="15" Default="no" Cancel="no" Text="Yes">
+          <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+        </Control>
+        <Control Id="JpInvalidInstallDirNo" Type="PushButton" X="150" Y="55" Width="50" Height="15" Default="yes" Cancel="yes" Text="No">
+          <Publish Event="NewDialog" Value="InstallDirDlg">1</Publish>
+        </Control>
+        <Control Id="Text" Type="Text" X="25" Y="15" Width="250" Height="30" TabSkip="no">
+          <Text>!(loc.message.install.dir.exist)</Text>
+        </Control>
+      </Dialog>
+
+      <!--
+        Run WixUI_InstallDir dialog in the default install directory.
+      -->
+      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+      <UIRef Id="WixUI_InstallDir" />
+
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="JpCheckInstallDir" Order="3">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="JpInvalidInstallDir" Order="5">INSTALLDIR_VALID="0"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="5">INSTALLDIR_VALID="1"</Publish>
+
+      <?ifndef JpLicenseRtf ?>
+      <!--
+        No license file provided.
+        Override the dialog sequence in built-in dialog set "WixUI_InstallDir"
+        to exclude license dialog.
+      -->
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
+      <?endif?>
+
+      <?else?>
+
+      <?ifdef JpLicenseRtf ?>
+      <UIRef Id="WixUI_Minimal" />
+      <?endif?>
+
+      <?endif?>
+    </UI>
+
+    <?ifdef JpLicenseRtf ?>
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.JpLicenseRtf)"/>
+    <?endif?>
+
+  </Product>
+</Wix>
@@ -0,0 +1,3 @@
+mime-type=application/psbt
+extension=psbt
+description=Partially Signed Bitcoin Transaction
@@ -0,0 +1,3 @@
+mime-type=application/bitcoin-transaction
+extension=txn
+description=Bitcoin Transaction
@@ -12,7 +12,7 @@ public class AboutController {
    private Label title;

    public void initializeView() {
-        title.setText(MainApp.APP_NAME + " " + MainApp.APP_VERSION);
+        title.setText(SparrowWallet.APP_NAME + " " + SparrowWallet.APP_VERSION + SparrowWallet.APP_VERSION_SUFFIX);
    }

    public void setStage(Stage stage) {
@@ -2,6 +2,10 @@ package com.sparrowwallet.sparrow;

 import com.beust.jcommander.Parameter;
 import com.sparrowwallet.drongo.Network;
+import org.slf4j.event.Level;
+
+import java.util.ArrayList;
+import java.util.List;

 public class Args {
    @Parameter(names = { "--dir", "-d" }, description = "Path to Sparrow home folder")
@@ -10,6 +14,34 @@ public class Args {
    @Parameter(names = { "--network", "-n" }, description = "Network to use")
    public Network network;

+    @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;
+
+    public List<String> toParams() {
+        List<String> params = new ArrayList<>();
+
+        if(dir != null) {
+            params.add("-d");
+            params.add(dir);
+        }
+        if(network != null) {
+            params.add("-n");
+            params.add(network.toString());
+        }
+        if(level != null) {
+            params.add("-l");
+            params.add(level.toString());
+        }
+
+        return params;
+    }
 }
@@ -0,0 +1,65 @@
+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.moveToActiveWindowScreen;
+import static com.sparrowwallet.sparrow.AppServices.setStageIcon;
+
+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);
+        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);
+        }
+
+        moveToActiveWindowScreen(alert);
+        return alert.showAndWait();
+    }
+
+    @Override
+    public Optional<String> requestPassphrase(String walletName, Keystore keystore) {
+        KeystorePassphraseDialog passphraseDialog = new KeystorePassphraseDialog(walletName, keystore);
+        return passphraseDialog.showAndWait();
+    }
+}
@@ -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);
+}
@@ -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;
+    }
+}
@@ -1,15 +1,13 @@
 package com.sparrowwallet.sparrow;

-import com.beust.jcommander.JCommander;
 import com.sparrowwallet.drongo.Network;
-import com.sparrowwallet.sparrow.control.WelcomeDialog;
+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;
-import com.sparrowwallet.sparrow.io.FileType;
-import com.sparrowwallet.sparrow.io.IOUtils;
 import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.net.Bwt;
+import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
@@ -17,24 +15,26 @@ import javafx.application.Application;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import org.controlsfx.glyphfont.GlyphFontRegistry;
-import org.slf4j.Logger;
+import org.controlsfx.tools.Platform;
 import org.slf4j.LoggerFactory;

 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_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.1.0";
-    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;

    @Override
    public void init() throws Exception {
-        Thread.setDefaultUncaughtExceptionHandler((t, e) -> LoggerFactory.getLogger(MainApp.class).error("Exception in thread \"" + t.getName() + "\"", e));
+        Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
+            if(e instanceof IndexOutOfBoundsException && Arrays.stream(e.getStackTrace()).anyMatch(element -> element.getClassName().equals("javafx.scene.chart.BarChart"))) {
+                LoggerFactory.getLogger(SparrowWallet.class).debug("Exception in thread \"" + t.getName() + "\"", e);;
+            } else {
+                LoggerFactory.getLogger(SparrowWallet.class).error("Exception in thread \"" + t.getName() + "\"", e);
+            }
+        });
        super.init();
    }

@@ -45,32 +45,44 @@ public class MainApp extends Application {
        GlyphFontRegistry.register(new FontAwesome5());
        GlyphFontRegistry.register(new FontAwesome5Brands());
        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
+        URL.setURLStreamHandlerFactory(protocol -> WalletIcon.PROTOCOL.equals(protocol) ? new WalletIcon.WalletIconStreamHandler() : null);

        AppServices.initialize(this);

        boolean createNewWallet = false;
        Mode mode = Config.get().getMode();
        if(mode == null) {
-            WelcomeDialog welcomeDialog = new WelcomeDialog(getHostServices());
+            WelcomeDialog welcomeDialog = new WelcomeDialog();
            Optional<Mode> optionalMode = welcomeDialog.showAndWait();
            if(optionalMode.isPresent()) {
                mode = optionalMode.get();
                Config.get().setMode(mode);
-                Config.get().setCoreWallet(Bwt.DEFAULT_CORE_WALLET);

                if(mode.equals(Mode.ONLINE)) {
                    PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER, true);
                    Optional<Boolean> optNewWallet = preferencesDialog.showAndWait();
                    createNewWallet = optNewWallet.isPresent() && optNewWallet.get();
+                } 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())).getServer());
                }
            }
        }

        if(Config.get().getServerType() == null && Config.get().getCoreServer() == null && Config.get().getElectrumServer() != null) {
            Config.get().setServerType(ServerType.ELECTRUM_SERVER);
-        } else if(Config.get().getServerType() == ServerType.BITCOIN_CORE && Config.get().getCoreWallet() == null) {
-            Config.get().setCoreMultiWallet(Boolean.TRUE);
-            Config.get().setCoreWallet("");
+        }
+
+        if(Config.get().getHdCapture() == null && Platform.getCurrent() == Platform.OSX) {
+            Config.get().setHdCapture(Boolean.TRUE);
+        }
+
+        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
+
+        if(Config.get().getAppHeight() != null && Config.get().getAppWidth() != null) {
+            mainStage.setWidth(Config.get().getAppWidth());
+            mainStage.setHeight(Config.get().getAppHeight());
        }

        AppController appController = AppServices.newAppWindow(stage);
@@ -81,9 +93,8 @@ public class MainApp extends Application {

        List<File> recentWalletFiles = Config.get().getRecentWalletFiles();
        if(recentWalletFiles != null) {
-            //Re-sort to preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
-            List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(file -> FileType.BINARY.equals(IOUtils.getFileType(file))).collect(Collectors.toList());
-            Collections.reverse(encryptedWalletFiles);
+            //Preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
+            List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(Storage::isEncrypted).collect(Collectors.toList());
            List<File> sortedWalletFiles = new ArrayList<>(recentWalletFiles);
            sortedWalletFiles.removeAll(encryptedWalletFiles);
            sortedWalletFiles.addAll(encryptedWalletFiles);
@@ -95,55 +106,20 @@ public class MainApp extends Application {
            }
        }

+        AppServices.openFileUriArguments(stage);
+
        AppServices.get().start();
    }

    @Override
    public void stop() throws Exception {
        AppServices.get().stop();
+        Config.get().setAppWidth(mainStage.getWidth());
+        Config.get().setAppHeight(mainStage.getHeight());
        mainStage.close();
-    }
-
-    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);
+        SparrowWallet.Instance instance = SparrowWallet.getSparrowInstance();
+        if(instance != null) {
+            instance.freeLock();
        }
-
-        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);
-        }
-
-        if(Network.get() != Network.MAINNET) {
-            getLogger().info("Using " + Network.get() + " configuration");
-        }
-
-        com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, argv);
-    }
-
-    private static Logger getLogger() {
-        return LoggerFactory.getLogger(MainApp.class);
    }
 }
@@ -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 = "com.sparrowwallet.sparrow";
+    public static final String APP_NAME = "Sparrow";
+    public static final String APP_VERSION = "1.7.2";
+    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(); //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 + "." + 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...");
+        }
+    }
+}
@@ -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");
@@ -0,0 +1,17 @@
+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));
+    }
+}
@@ -0,0 +1,104 @@
+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());
+
+        public DecimalFormat getBtcFormat() {
+            btcFormat.setMaximumFractionDigits(8);
+            return btcFormat;
+        }
+
+        public DecimalFormat getSatsFormat() {
+            return satsFormat;
+        }
+
+        public DecimalFormat getTableBtcFormat() {
+            return tableBtcFormat;
+        }
+
+        public DecimalFormat getCurrencyFormat() {
+            return currencyFormat;
+        }
+
+        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());
+
+        public DecimalFormat getBtcFormat() {
+            btcFormat.setMaximumFractionDigits(8);
+            return btcFormat;
+        }
+
+        public DecimalFormat getSatsFormat() {
+            return satsFormat;
+        }
+
+        public DecimalFormat getTableBtcFormat() {
+            return tableBtcFormat;
+        }
+
+        public DecimalFormat getCurrencyFormat() {
+            return currencyFormat;
+        }
+
+        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 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 getGroupingSeparator() {
+        return Character.toString(getDecimalFormatSymbols().getGroupingSeparator());
+    }
+
+    public String getDecimalSeparator() {
+        return Character.toString(getDecimalFormatSymbols().getDecimalSeparator());
+    }
+}
@@ -0,0 +1,137 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
+import javafx.animation.PauseTransition;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
+import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
+import javafx.fxml.FXML;
+import javafx.scene.control.Tooltip;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+import org.controlsfx.control.StatusBar;
+
+public class WelcomeController {
+    @FXML
+    private VBox welcomeBox;
+
+    @FXML
+    private VBox step1;
+
+    @FXML
+    private VBox step2;
+
+    @FXML
+    private VBox step3;
+
+    @FXML
+    private VBox step4;
+
+    @FXML
+    private StatusBar serverStatus;
+
+    @FXML
+    private UnlabeledToggleSwitch serverToggle;
+
+    public void initializeView() {
+        step1.managedProperty().bind(step1.visibleProperty());
+        step2.managedProperty().bind(step2.visibleProperty());
+        step3.managedProperty().bind(step3.visibleProperty());
+        step4.managedProperty().bind(step4.visibleProperty());
+
+        step2.setVisible(false);
+        step3.setVisible(false);
+        step4.setVisible(false);
+
+        welcomeBox.getStyleClass().add("offline");
+        serverStatus.setText("Offline");
+        serverToggle.addEventFilter(MouseEvent.MOUSE_RELEASED, Event::consume);
+        Tooltip tooltip = new Tooltip("Demonstration only - you are not connected!");
+        tooltip.setShowDelay(Duration.ZERO);
+        serverToggle.setTooltip(tooltip);
+        serverToggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            serverStatus.setText(newValue ? "Connected (demonstration only)" : "Offline");
+        });
+    }
+
+    public boolean next() {
+        if(step1.isVisible()) {
+            step1.setVisible(false);
+            step2.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("public-electrum");
+            PauseTransition wait = new PauseTransition(Duration.millis(200));
+            wait.setOnFinished((e) -> {
+                serverToggle.setSelected(true);
+                serverStatus.setText("Connected to a Public Server (demonstration only)");
+            });
+            wait.play();
+            return true;
+        }
+
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step3.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("bitcoin-core");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to Bitcoin Core (demonstration only)");
+            return true;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step4.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("private-electrum");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to a Private Electrum Server (demonstration only)");
+        }
+
+        return false;
+    }
+
+    public boolean back() {
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step1.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("offline");
+            PauseTransition wait = new PauseTransition(Duration.millis(200));
+            wait.setOnFinished((e) -> {
+                serverToggle.setSelected(false);
+                serverStatus.setText("Offline");
+            });
+            wait.play();
+            return false;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step2.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("public-electrum");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to a Public Server (demonstration only)");
+            return true;
+        }
+
+        if(step4.isVisible()) {
+            step4.setVisible(false);
+            step3.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("bitcoin-core");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to Bitcoin Core (demonstration only)");
+            return true;
+        }
+
+        return false;
+    }
+}
@@ -0,0 +1,71 @@
+package com.sparrowwallet.sparrow;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+import java.io.IOException;
+
+public class WelcomeDialog extends Dialog<Mode> {
+    public WelcomeDialog() {
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.onEscapePressed(dialogPane.getScene(), this::close);
+
+        try {
+            FXMLLoader welcomeLoader = new FXMLLoader(AppServices.class.getResource("welcome.fxml"));
+            dialogPane.setContent(welcomeLoader.load());
+            WelcomeController welcomeController = welcomeLoader.getController();
+            welcomeController.initializeView();
+
+            dialogPane.setPrefWidth(600);
+            dialogPane.setPrefHeight(520);
+            AppServices.moveToActiveWindowScreen(this);
+
+            dialogPane.getStylesheets().add(AppServices.class.getResource("welcome.css").toExternalForm());
+
+            final ButtonType nextButtonType = new javafx.scene.control.ButtonType("Next", ButtonBar.ButtonData.OK_DONE);
+            final ButtonType backButtonType = new javafx.scene.control.ButtonType("Back", ButtonBar.ButtonData.LEFT);
+            final ButtonType onlineButtonType = new javafx.scene.control.ButtonType("Configure Server", ButtonBar.ButtonData.APPLY);
+            final ButtonType offlineButtonType = new javafx.scene.control.ButtonType(AppServices.isConnected() ? "Done" : "Later or Offline Mode", ButtonBar.ButtonData.CANCEL_CLOSE);
+            dialogPane.getButtonTypes().addAll(nextButtonType, backButtonType, onlineButtonType, offlineButtonType);
+
+            Button nextButton = (Button)dialogPane.lookupButton(nextButtonType);
+            Button backButton = (Button)dialogPane.lookupButton(backButtonType);
+            Button onlineButton = (Button)dialogPane.lookupButton(onlineButtonType);
+            Button offlineButton = (Button)dialogPane.lookupButton(offlineButtonType);
+
+            nextButton.managedProperty().bind(nextButton.visibleProperty());
+            backButton.managedProperty().bind(backButton.visibleProperty());
+            onlineButton.managedProperty().bind(onlineButton.visibleProperty());
+            offlineButton.managedProperty().bind(offlineButton.visibleProperty());
+
+            backButton.setDisable(true);
+            onlineButton.visibleProperty().bind(nextButton.visibleProperty().not());
+            offlineButton.visibleProperty().bind(nextButton.visibleProperty().not());
+
+            nextButton.addEventFilter(ActionEvent.ACTION, event -> {
+                if(!welcomeController.next()) {
+                    nextButton.setVisible(false);
+                    onlineButton.setDefaultButton(true);
+                }
+                backButton.setDisable(false);
+                event.consume();
+            });
+
+            backButton.addEventFilter(ActionEvent.ACTION, event -> {
+                nextButton.setVisible(true);
+                if(!welcomeController.back()) {
+                    backButton.setDisable(true);
+                }
+                event.consume();
+            });
+
+            setResultConverter(dialogButton -> dialogButton == onlineButtonType ? Mode.ONLINE : Mode.OFFLINE);
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
@@ -0,0 +1,113 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.KeystoreSource;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.net.ServerType;
+import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
+import javafx.collections.FXCollections;
+import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
+import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AddAccountDialog extends Dialog<List<StandardAccount>> {
+    private final ComboBox<StandardAccount> standardAccountCombo;
+    private boolean discoverAccounts = false;
+
+    public AddAccountDialog(Wallet wallet) {
+        final DialogPane dialogPane = getDialogPane();
+        setTitle("Add Account");
+        dialogPane.setHeaderText("Choose an account to add:");
+        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.SORT_NUMERIC_DOWN);
+        key.setFontSize(50);
+        dialogPane.setGraphic(key);
+
+        final VBox content = new VBox(10);
+        content.setPrefHeight(50);
+
+        standardAccountCombo = new ComboBox<>();
+        standardAccountCombo.setMaxWidth(Double.MAX_VALUE);
+
+        List<Integer> existingIndexes = new ArrayList<>();
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        existingIndexes.add(masterWallet.getAccountIndex());
+        for(Wallet childWallet : masterWallet.getChildWallets()) {
+            if(!childWallet.isNested()) {
+                existingIndexes.add(childWallet.getAccountIndex());
+            }
+        }
+
+        List<StandardAccount> availableAccounts = new ArrayList<>();
+        for(StandardAccount standardAccount : StandardAccount.values()) {
+            if(!existingIndexes.contains(standardAccount.getAccountNumber()) && !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(standardAccount)) {
+                availableAccounts.add(standardAccount);
+            }
+        }
+
+        if(WhirlpoolServices.canWalletMix(masterWallet) && !masterWallet.isWhirlpoolMasterWallet()) {
+            availableAccounts.add(StandardAccount.WHIRLPOOL_PREMIX);
+        }
+
+        final ButtonType discoverButtonType = new javafx.scene.control.ButtonType("Discover", ButtonBar.ButtonData.LEFT);
+        if(!availableAccounts.isEmpty() && Config.get().getServerType() != ServerType.BITCOIN_CORE &&
+                (masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.SW_SEED)
+                        || (masterWallet.getKeystores().size() == 1 && masterWallet.getKeystores().stream().allMatch(ks -> ks.getSource() == KeystoreSource.HW_USB)))) {
+            dialogPane.getButtonTypes().add(discoverButtonType);
+            Button discoverButton = (Button)dialogPane.lookupButton(discoverButtonType);
+            discoverButton.disableProperty().bind(AppServices.onlineProperty().not());
+            discoverButton.setOnAction(event -> {
+                discoverAccounts = true;
+            });
+        }
+
+        standardAccountCombo.setItems(FXCollections.observableList(availableAccounts));
+        standardAccountCombo.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(StandardAccount account) {
+                if(account == null) {
+                    return "None Available";
+                }
+
+                if(StandardAccount.WHIRLPOOL_ACCOUNTS.contains(account)) {
+                    return "Whirlpool Accounts";
+                }
+
+                return account.getName();
+            }
+
+            @Override
+            public StandardAccount fromString(String string) {
+                return null;
+            }
+        });
+
+        if(standardAccountCombo.getItems().isEmpty()) {
+            Button okButton = (Button) dialogPane.lookupButton(ButtonType.OK);
+            okButton.setDisable(true);
+        } else {
+            standardAccountCombo.getSelectionModel().select(0);
+        }
+        content.getChildren().add(standardAccountCombo);
+
+        dialogPane.setContent(content);
+        setResultConverter(dialogButton -> dialogButton == ButtonType.OK ? List.of(standardAccountCombo.getValue()) : (dialogButton == discoverButtonType ? availableAccounts : null));
+    }
+
+    public boolean isDiscoverAccounts() {
+        return discoverAccounts;
+    }
+}
@@ -1,64 +1,65 @@
 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;

-public class AddressCell extends TreeTableCell<Entry, Entry> {
+import java.util.Collections;
+
+public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
    public AddressCell() {
        super();
        setAlignment(Pos.CENTER_LEFT);
        setContentDisplay(ContentDisplay.RIGHT);
+        getStyleClass().add("address-cell");
    }

    @Override
-    protected void updateItem(Entry entry, boolean empty) {
-        super.updateItem(entry, empty);
+    protected void updateItem(UtxoEntry.AddressStatus addressStatus, boolean empty) {
+        super.updateItem(addressStatus, empty);

-        EntryCell.applyRowStyles(this, entry);
-        getStyleClass().add("address-cell");
+        UtxoEntry utxoEntry = addressStatus == null ? null : addressStatus.getUtxoEntry();
+        EntryCell.applyRowStyles(this, utxoEntry);

        if (empty) {
            setText(null);
            setGraphic(null);
        } else {
-            if(entry instanceof UtxoEntry) {
-                UtxoEntry utxoEntry = (UtxoEntry)entry;
-                Address address = utxoEntry.getAddress();
+            if(utxoEntry != null) {
+                Address address = addressStatus.getAddress();
                setText(address.toString());
-                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), null));
+                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode()), false));
                Tooltip tooltip = new Tooltip();
-                tooltip.setText(getTooltipText(utxoEntry));
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate(), addressStatus.isDustAttack()));
                setTooltip(tooltip);

-                if(utxoEntry.isDuplicateAddress()) {
+                if(addressStatus.isDustAttack()) {
+                    setGraphic(getDustAttackHyperlink(utxoEntry));
+                } else if(addressStatus.isDuplicate()) {
                    setGraphic(getDuplicateGlyph());
                } else {
                    setGraphic(null);
                }
-
-                utxoEntry.duplicateAddressProperty().addListener((observable, oldValue, newValue) -> {
-                    if(newValue) {
-                        setGraphic(getDuplicateGlyph());
-                        Tooltip tt = new Tooltip();
-                        tt.setText(getTooltipText(utxoEntry));
-                        setTooltip(tt);
-                    } else {
-                        setGraphic(null);
-                    }
-                });
            }
        }
    }

-    private String getTooltipText(UtxoEntry utxoEntry) {
-        return utxoEntry.getNode().getDerivationPath().replace("m", "..") + (utxoEntry.isDuplicateAddress() ? " (Duplicate address)" : "");
+    private String getTooltipText(UtxoEntry utxoEntry, boolean duplicate, boolean dustAttack) {
+        return (utxoEntry.getNode().getWallet().isNested() ? utxoEntry.getNode().getWallet().getDisplayName() + " " : "" ) +
+                utxoEntry.getNode().toString() + (duplicate ? " (Duplicate address)" : (dustAttack ? " (Possible dust attack)" : ""));
    }

    public static Glyph getDuplicateGlyph() {
@@ -67,4 +68,22 @@ public class AddressCell extends TreeTableCell<Entry, Entry> {
        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;
+    }
 }
@@ -0,0 +1,37 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.InvalidAddressException;
+import javafx.util.StringConverter;
+
+public class AddressStringConverter extends StringConverter<Address> {
+    @Override
+    public Address fromString(String value) {
+        // If the specified value is null or zero-length, return null
+        if(value == null) {
+            return null;
+        }
+
+        value = value.trim();
+
+        if (value.length() < 1) {
+            return null;
+        }
+
+        try {
+            return Address.fromString(value);
+        } catch(InvalidAddressException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    @Override
+    public String toString(Address value) {
+        // If the specified value is null, return a zero-length String
+        if(value == null) {
+            return "";
+        }
+
+        return value.toString();
+    }
+}
@@ -5,21 +5,22 @@ 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;
 import javafx.beans.property.ReadOnlyObjectWrapper;
+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);
@@ -33,7 +34,7 @@ public class AddressTreeTable extends CoinTreeTable {
        addressCol.setSortable(false);
        getColumns().add(addressCol);

-        if(address != null) {
+        if(address != null && !rootEntry.getWallet().isWhirlpoolChildWallet()) {
            addressCol.setMinWidth(TextUtils.computeTextWidth(AppServices.getMonospaceFont(), address, 0.0));
        }

@@ -45,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());
@@ -53,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);

@@ -67,25 +90,31 @@ public class AddressTreeTable extends CoinTreeTable {
            }
        }

-        setOnMouseClicked(mouseEvent -> {
-            if(mouseEvent.getButton().equals(MouseButton.PRIMARY)){
-                if(mouseEvent.getClickCount() == 2) {
-                    TreeItem<Entry> treeItem = getSelectionModel().getSelectedItem();
-                    if(treeItem != null && treeItem.getChildren().isEmpty()) {
-                        Entry entry = getSelectionModel().getSelectedItem().getValue();
-                        if(entry instanceof NodeEntry) {
-                            NodeEntry nodeEntry = (NodeEntry)entry;
-                            EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                            Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+        if(!rootEntry.getWallet().isWhirlpoolChildWallet()) {
+            setOnMouseClicked(mouseEvent -> {
+                if(mouseEvent.getButton().equals(MouseButton.PRIMARY)){
+                    if(mouseEvent.getClickCount() == 2) {
+                        TreeItem<Entry> treeItem = getSelectionModel().getSelectedItem();
+                        if(treeItem != null && treeItem.getChildren().isEmpty()) {
+                            Entry entry = getSelectionModel().getSelectedItem().getValue();
+                            if(entry instanceof NodeEntry) {
+                                NodeEntry nodeEntry = (NodeEntry)entry;
+                                EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                                Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                            }
                        }
                    }
                }
-            }
+            });
+        }
+
+        rootEntry.getChildren().addListener((ListChangeListener<Entry>) c -> {
+            this.refresh();
        });
    }

    public void updateAll(NodeEntry rootEntry) {
-        setBitcoinUnit(rootEntry.getWallet());
+        setUnitFormat(rootEntry.getWallet());

        RecursiveTreeItem<Entry> rootItem = new RecursiveTreeItem<>(rootEntry, Entry::getChildren);
        setRoot(rootItem);
@@ -99,26 +128,50 @@ public class AddressTreeTable extends CoinTreeTable {
    }

    public void updateHistory(List<WalletNode> updatedNodes) {
-        //We only ever add or replace 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();

-        for(WalletNode updatedNode : updatedNodes) {
-            NodeEntry nodeEntry = new NodeEntry(rootEntry.getWallet(), updatedNode);
+        Map<WalletNode, NodeEntry> childNodes = new HashMap<>();
+        for(Entry childEntry : rootEntry.getChildren()) {
+            NodeEntry nodeEntry = (NodeEntry)childEntry;
+            childNodes.put(nodeEntry.getNode(), nodeEntry);
+        }

-            Optional<Entry> optEntry = rootEntry.getChildren().stream().filter(childEntry -> ((NodeEntry)childEntry).getNode().equals(updatedNode)).findFirst();
-            if(optEntry.isPresent()) {
-                int index = rootEntry.getChildren().indexOf(optEntry.get());
-                rootEntry.getChildren().set(index, nodeEntry);
+        for(WalletNode updatedNode : updatedNodes) {
+            NodeEntry existingEntry = childNodes.get(updatedNode);
+            if(existingEntry != null) {
+                existingEntry.refreshChildren();
+
+                if(Config.get().isHideEmptyUsedAddresses() && existingEntry.getValue() == 0L) {
+                    rootEntry.getChildren().remove(existingEntry);
+                }
            } else {
-                rootEntry.getChildren().add(nodeEntry);
+                NodeEntry nodeEntry = new NodeEntry(rootEntry.getWallet(), updatedNode);
+
+                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);
+                }
            }
        }

-        sort();
+        refresh();
    }

    public void updateLabel(Entry entry) {
        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));
+    }
 }
@@ -0,0 +1,44 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.scene.Node;
+import javafx.util.Duration;
+
+public class AnimationUtil {
+    public static Timeline getSlowFadeOut(Node node, Duration duration, double fromValue, int numIncrements) {
+        Timeline fadeTimeline = new Timeline();
+        Duration incrementDuration = duration.divide(numIncrements);
+        for(int i = 0; i < numIncrements; i++) {
+            double percent = ((double)numIncrements - i - 1) / numIncrements;
+            double opacity = percent * fromValue;
+            fadeTimeline.getKeyFrames().add(new KeyFrame(incrementDuration.multiply(i+1), event -> node.setOpacity(opacity)));
+        }
+
+        return fadeTimeline;
+    }
+
+    public static Timeline getPulse(Node node, Duration duration, double fromValue, double toValue, int numIncrements) {
+        Timeline pulseTimeline = getFade(node, duration, fromValue, toValue, numIncrements);
+
+        pulseTimeline.setCycleCount(Animation.INDEFINITE);
+        pulseTimeline.setAutoReverse(true);
+
+        return pulseTimeline;
+    }
+
+    public static Timeline getFade(Node node, Duration duration, double fromValue, double toValue, int numIncrements) {
+        Timeline fadeTimeline = new Timeline();
+        Duration incrementDuration = duration.divide(numIncrements);
+        for(int i = 0; i < numIncrements; i++) {
+            double percent = ((double) numIncrements - i - 1) / numIncrements; //From 99% to 0%
+            double opacity = (percent * (fromValue - toValue)) + toValue;
+            fadeTimeline.getKeyFrames().add(new KeyFrame(incrementDuration.multiply(i+1), event -> node.setOpacity(opacity)));
+        }
+
+        return fadeTimeline;
+    }
+
+    public record AnimatedNode (Node node, Timeline timeline) {}
+}
@@ -1,20 +1,27 @@
 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;
 import com.sparrowwallet.sparrow.wallet.WalletTransactionsEntry;
 import javafx.beans.NamedArg;
 import javafx.scene.Node;
 import javafx.scene.chart.*;

+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;

 public class BalanceChart extends LineChart<Number, Number> {
+    private static final int MAX_VALUES = 500;
+
    private XYChart.Series<Number, Number> balanceSeries;

    private TransactionEntry selectedEntry;
@@ -29,15 +36,14 @@ 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) {
        setVisible(!walletTransactionsEntry.getChildren().isEmpty());
        balanceSeries.getData().clear();

-        List<Data<Number, Number>> balanceDataList = walletTransactionsEntry.getChildren().stream()
+        List<Data<Number, Number>> balanceDataList = getTransactionEntries(walletTransactionsEntry)
                .map(entry -> (TransactionEntry)entry)
                .filter(txEntry -> txEntry.getBlockTransaction().getHeight() > 0)
                .map(txEntry -> new XYChart.Data<>((Number)txEntry.getBlockTransaction().getDate().getTime(), (Number)txEntry.getBalance(), txEntry))
@@ -74,6 +80,24 @@ public class BalanceChart extends LineChart<Number, Number> {
        }
    }

+    private Stream<Entry> getTransactionEntries(WalletTransactionsEntry walletTransactionsEntry) {
+        int total = walletTransactionsEntry.getChildren().size();
+        if(walletTransactionsEntry.getChildren().size() <= MAX_VALUES) {
+            return walletTransactionsEntry.getChildren().stream();
+        }
+
+        int bucketSize = total / MAX_VALUES;
+        List<List<Entry>> buckets = Lists.partition(walletTransactionsEntry.getChildren(), bucketSize);
+        List<Entry> reducedEntries = new ArrayList<>(MAX_VALUES);
+        for(List<Entry> bucket : buckets) {
+            long max = bucket.stream().mapToLong(entry -> Math.abs(entry.getValue())).max().orElse(0);
+            Entry bucketEntry = bucket.stream().filter(entry -> entry.getValue() == max || entry.getValue() == -max).findFirst().orElseThrow();
+            reducedEntries.add(bucketEntry);
+        }
+
+        return reducedEntries.stream();
+    }
+
    public void select(TransactionEntry transactionEntry) {
        Set<Node> selectedSymbols = lookupAll(".chart-line-symbol.selected");
        for(Node selectedSymbol : selectedSymbols) {
@@ -92,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));
    }
 }
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.sparrow.AppServices;
 import javafx.beans.NamedArg;
 import javafx.scene.Node;
 import javafx.scene.chart.Axis;
@@ -27,9 +28,11 @@ public class BlockTargetFeeRatesChart extends LineChart<String, Number> {

        for(Iterator<Integer> targetBlocksIter = targetBlocksFeeRates.keySet().iterator(); targetBlocksIter.hasNext(); ) {
            Integer targetBlocks = targetBlocksIter.next();
-            String category = targetBlocks + (targetBlocksIter.hasNext() ? "" : "+");
-            XYChart.Data<String, Number> data = new XYChart.Data<>(category, targetBlocksFeeRates.get(targetBlocks));
-            feeRateSeries.getData().add(data);
+            if(AppServices.TARGET_BLOCKS_RANGE.contains(targetBlocks)) {
+                String category = targetBlocks + (targetBlocksIter.hasNext() ? "" : "+");
+                XYChart.Data<String, Number> data = new XYChart.Data<>(category, targetBlocksFeeRates.get(targetBlocks));
+                feeRateSeries.getData().add(data);
+            }
        }

        if(selectedTargetBlocks != null) {
@@ -0,0 +1,234 @@
+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.Keystore;
+import com.sparrowwallet.drongo.wallet.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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.smartcardio.CardException;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+public class CardImportPane extends TitledDescriptionPane {
+    private static final Logger log = LoggerFactory.getLogger(CardImportPane.class);
+
+    private final KeystoreCardImport importer;
+    private final 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(pin.get().length() < 6) {
+            setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
+            setContent(getPinEntry());
+            showHideLink.setVisible(false);
+            setExpanded(true);
+            importButton.setDisable(false);
+            return;
+        }
+
+        StringProperty messageProperty = new SimpleStringProperty();
+        messageProperty.addListener((observable, oldValue, newValue) -> {
+            Platform.runLater(() -> setDescription(newValue));
+        });
+
+        try {
+            if(!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(getPinEntry());
+            } 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) {
+        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 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, 10, 30));
+        contentBox.setPrefHeight(50);
+
+        vBox.getChildren().add(contentBox);
+
+        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);
+                }
+            };
+        }
+    }
+}
@@ -0,0 +1,93 @@
+package com.sparrowwallet.sparrow.control;
+
+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() {
+        this.existingPin = new ViewPasswordField();
+        this.newPin = new ViewPasswordField();
+        this.newPinConfirm = new ViewPasswordField();
+        this.backupFirst = new CheckBox();
+
+        final DialogPane dialogPane = getDialogPane();
+        setTitle("Change Card PIN");
+        dialogPane.setHeaderText("Enter the current PIN, and then the new PIN twice. PIN must be between 6 and 32 digits.");
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
+        dialogPane.setPrefWidth(380);
+        dialogPane.setPrefHeight(260);
+        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);
+
+        fieldset.getChildren().addAll(currentField, newField, confirmField, backupField);
+        form.getChildren().add(fieldset);
+        dialogPane.setContent(form);
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        Platform.runLater( () -> {
+            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+            validationSupport.registerValidator(existingPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", existingPin.getText().length() < 6 || existingPin.getText().length() > 32));
+            validationSupport.registerValidator(newPin, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Incorrect PIN length", newPin.getText().length() < 6 || newPin.getText().length() > 32));
+            validationSupport.registerValidator(newPinConfirm, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "PIN confirmation does not match", !newPinConfirm.getText().equals(newPin.getText())));
+        });
+
+        okButtonType = new javafx.scene.control.ButtonType("Change", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(okButtonType);
+        Button okButton = (Button) dialogPane.lookupButton(okButtonType);
+        okButton.setPrefWidth(130);
+        BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> existingPin.getText().length() < 6 || existingPin.getText().length() > 32
+                        || newPin.getText().length() < 6 || newPin.getText().length() > 32
+                        || !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) { }
+}
@@ -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);
@@ -2,24 +2,36 @@ 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.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.layout.Region;
+import javafx.util.Duration;
+import org.controlsfx.tools.Platform;

-import java.util.Locale;
+import java.text.DecimalFormat;

-class CoinCell extends TreeTableCell<Entry, Number> {
-    private final Tooltip tooltip;
+class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsListener {
+    private final CoinTooltip tooltip;
+
+    private IntegerProperty confirmationsProperty;

    public CoinCell() {
        super();
-        tooltip = new Tooltip();
+        tooltip = new CoinTooltip();
+        tooltip.setShowDelay(Duration.millis(500));
        getStyleClass().add("coin-cell");
+        if(Platform.getCurrent() == Platform.OSX) {
+            getStyleClass().add("number-field");
+        }
    }

    @Override
@@ -35,28 +47,24 @@ class CoinCell extends TreeTableCell<Entry, Number> {
            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());
-            final String btcValue = CoinLabel.getBTCFormat().format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);
+            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();

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

                if(transactionEntry.isConfirming()) {
                    ConfirmationProgressIndicator arc = new ConfirmationProgressIndicator(transactionEntry.getConfirmations());
@@ -66,6 +74,10 @@ class CoinCell extends TreeTableCell<Entry, Number> {
                } else {
                    setGraphic(null);
                }
+
+                if(amount.longValue() < 0) {
+                    getStyleClass().add("negative-amount");
+                }
            } else if(entry instanceof UtxoEntry) {
                setGraphic(null);
            } else if(entry instanceof HashIndexEntry) {
@@ -82,4 +94,65 @@ 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 String value;
+
+        public void setValue(String value) {
+            this.value = value;
+            setTooltipText();
+        }
+
+        public void showConfirmations(IntegerProperty txEntryConfirmationsProperty) {
+            showConfirmations = true;
+
+            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");
+            } else {
+                return BlockTransactionHash.BLOCKS_TO_FULLY_CONFIRM + "+ confirmations";
+            }
+        }
+    }
 }
@@ -1,23 +1,18 @@
 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;
 import javafx.scene.control.ContextMenu;
+import javafx.scene.control.Label;
 import javafx.scene.control.MenuItem;
 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 CopyableLabel {
-    public static final DecimalFormat BTC_FORMAT = new DecimalFormat("0", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
-
+public class CoinLabel extends Label {
    private final LongProperty valueProperty = new SimpleLongProperty(-1);
    private final Tooltip tooltip;
    private final CoinContextMenu contextMenu;
@@ -28,7 +23,6 @@ public class CoinLabel extends CopyableLabel {

    public CoinLabel(String text) {
        super(text);
-        BTC_FORMAT.setMaximumFractionDigits(8);
        valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getBitcoinUnit()));
        tooltip = new Tooltip();
        contextMenu = new CoinContextMenu();
@@ -58,8 +52,9 @@ public class CoinLabel extends CopyableLabel {
        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)) {
@@ -77,7 +72,7 @@ public class CoinLabel extends CopyableLabel {

    private class CoinContextMenu extends ContextMenu {
        public CoinContextMenu() {
-            MenuItem copySatsValue = new MenuItem("Copy Value in Satoshis");
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
            copySatsValue.setOnAction(AE -> {
                hide();
                ClipboardContent content = new ClipboardContent();
@@ -89,16 +84,12 @@ public class CoinLabel extends CopyableLabel {
            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;
-    }
 }
@@ -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));
+    }

-    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 == null ? UnitFormat.DOT : 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);
                    }
@@ -2,11 +2,12 @@ package com.sparrowwallet.sparrow.control;

 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletDataChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
-import com.sparrowwallet.sparrow.event.WalletSettingsChangedEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.ServerType;
@@ -26,25 +27,36 @@ import java.util.Optional;

 public class CoinTreeTable extends TreeTableView<Entry> {
    private BitcoinUnit bitcoinUnit;
+    private UnitFormat unitFormat;

    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()) {
@@ -81,19 +93,17 @@ 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);
                Optional<Date> optDate = dlg.showAndWait();
                if(optDate.isPresent()) {
+                    Storage storage = AppServices.get().getOpenWallets().get(wallet);
                    Wallet pastWallet = wallet.copy();
                    wallet.setBirthDate(optDate.get());
-                    Storage storage = AppServices.get().getOpenWallets().get(wallet);
-                    if(storage != null) {
-                        //Trigger background save of birthdate
-                        EventManager.get().post(new WalletDataChangedEvent(wallet));
-                        //Trigger full wallet rescan
-                        wallet.clearHistory();
-                        EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, storage.getWalletFile()));
-                    }
+                    //Trigger background save of birthdate
+                    EventManager.get().post(new WalletDataChangedEvent(wallet));
+                    //Trigger full wallet rescan
+                    wallet.clearHistory();
+                    EventManager.get().post(new WalletAddressesChangedEvent(wallet, pastWallet, storage.getWalletId(wallet)));
                }
            });
            if(wallet.getBirthDate() == null) {
@@ -0,0 +1,71 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.control.ComboBox;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
+import org.controlsfx.control.textfield.CustomTextField;
+
+public class ComboBoxTextField extends CustomTextField {
+    private final ObjectProperty<ComboBox<?>> comboProperty = new SimpleObjectProperty<>();
+
+    private boolean initialized;
+    private boolean comboShowing;
+
+    public ComboBoxTextField() {
+        super();
+        getStyleClass().add("combo-text-field");
+        setupComboButtonField(super.rightProperty());
+
+        disabledProperty().addListener((observable, oldValue, newValue) -> {
+            if(comboProperty.isNotNull().get()) {
+                comboProperty.get().setVisible(!newValue);
+            }
+        });
+    }
+
+    private void setupComboButtonField(ObjectProperty<Node> rightProperty) {
+        Region showComboButton = new Region();
+        showComboButton.getStyleClass().addAll("graphic"); //$NON-NLS-1$
+        StackPane showComboButtonPane = new StackPane(showComboButton);
+        showComboButtonPane.getStyleClass().addAll("combo-button"); //$NON-NLS-1$
+        showComboButtonPane.setCursor(Cursor.DEFAULT);
+        showComboButtonPane.setOnMouseReleased(e -> {
+            if(comboProperty.isNotNull().get()) {
+                if(comboShowing) {
+                    comboProperty.get().hide();
+                } else {
+                    comboProperty.get().show();
+                }
+
+                comboShowing = !comboShowing;
+
+                if(!initialized) {
+                    comboProperty.get().valueProperty().addListener((observable, oldValue, newValue) -> {
+                        comboShowing = false;
+                        Platform.runLater(() -> comboProperty.get().getSelectionModel().clearSelection());
+                    });
+                    initialized = true;
+                }
+            }
+        });
+
+        rightProperty.set(showComboButtonPane);
+    }
+
+    public ComboBox<?> getComboProperty() {
+        return comboProperty.get();
+    }
+
+    public ObjectProperty<ComboBox<?>> walletComboProperty() {
+        return comboProperty;
+    }
+
+    public void setComboProperty(ComboBox<?> comboProperty) {
+        this.comboProperty.set(comboProperty);
+    }
+}
@@ -86,10 +86,10 @@ public class ConfirmationProgressIndicator extends StackPane {
                    upTickLineTimeline.getKeyFrames().add(upTickLineFrame);
                    sequence.getChildren().add(upTickLineTimeline);

-                    FadeTransition groupFadeOut = new FadeTransition(Duration.minutes(10), confirmationGroup);
-                    groupFadeOut.setFromValue(1);
-                    groupFadeOut.setToValue(0);
+                    Timeline groupFadeOut = AnimationUtil.getSlowFadeOut(confirmationGroup, Duration.minutes(10), 1.0, 10);
                    sequence.getChildren().add(groupFadeOut);
+
+                    confirmationsProperty().unbind();
                }

                sequence.play();
@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.beans.property.IntegerProperty;
+
+public interface ConfirmationsListener {
+    IntegerProperty getConfirmationsProperty();
+}
@@ -0,0 +1,97 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.sparrow.UnitFormat;
+import com.sparrowwallet.sparrow.io.Config;
+import javafx.beans.property.LongProperty;
+import javafx.beans.property.SimpleLongProperty;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.MenuItem;
+import javafx.scene.control.Tooltip;
+import javafx.scene.input.Clipboard;
+import javafx.scene.input.ClipboardContent;
+
+public class CopyableCoinLabel extends CopyableLabel {
+    private final LongProperty valueProperty = new SimpleLongProperty(-1);
+    private final Tooltip tooltip;
+    private final CoinContextMenu contextMenu;
+
+    public CopyableCoinLabel() {
+        this("Unknown");
+    }
+
+    public CopyableCoinLabel(String text) {
+        super(text);
+        valueProperty().addListener((observable, oldValue, newValue) -> setValueAsText((Long)newValue, Config.get().getUnitFormat(), Config.get().getBitcoinUnit()));
+        tooltip = new Tooltip();
+        contextMenu = new CoinContextMenu();
+    }
+
+    public final LongProperty valueProperty() {
+        return valueProperty;
+    }
+
+    public final long getValue() {
+        return valueProperty.get();
+    }
+
+    public final void setValue(long value) {
+        this.valueProperty.set(value);
+    }
+
+    public void refresh() {
+        refresh(Config.get().getUnitFormat(), Config.get().getBitcoinUnit());
+    }
+
+    public void refresh(UnitFormat unitFormat, BitcoinUnit bitcoinUnit) {
+        setValueAsText(getValue(), unitFormat, bitcoinUnit);
+    }
+
+    private void setValueAsText(Long value, UnitFormat unitFormat, BitcoinUnit bitcoinUnit) {
+        setTooltip(tooltip);
+        setContextMenu(contextMenu);
+
+        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);
+        }
+
+        if(unit.equals(BitcoinUnit.BTC)) {
+            tooltip.setText(satsValue);
+            setText(btcValue);
+        } else {
+            tooltip.setText(btcValue);
+            setText(satsValue);
+        }
+    }
+
+    private class CoinContextMenu extends ContextMenu {
+        public CoinContextMenu() {
+            MenuItem copySatsValue = new MenuItem("Copy Value in sats");
+            copySatsValue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(Long.toString(getValue()));
+                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(getValue()));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+
+            getItems().addAll(copySatsValue, copyBtcValue);
+        }
+    }
+}
@@ -1,13 +1,19 @@
 package com.sparrowwallet.sparrow.control;

 import javafx.animation.FadeTransition;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.event.EventHandler;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.util.Duration;
@@ -16,10 +22,36 @@ import org.controlsfx.control.textfield.CustomTextField;
 public class CopyableTextField extends CustomTextField {
    private static final Duration FADE_DURATION = Duration.millis(350);

+    private final ChangeListener<String> selectionListener = (textObservable, textOldValue, textNewValue) -> {
+        if(!textNewValue.isEmpty()) {
+            deselect();
+        }
+    };
+
+    private final EventHandler<MouseEvent> copyHandler = event -> {
+        ClipboardContent content = new ClipboardContent();
+        content.putString(getCopyText());
+        Clipboard.getSystemClipboard().setContent(content);
+
+        Tooltip tooltip = new Tooltip("Copied!");
+        tooltip.show(this, event.getScreenX(), event.getScreenY());
+        Timeline timeline = new Timeline(new KeyFrame(Duration.seconds(1), e -> tooltip.hide()));
+        timeline.play();
+    };
+
    public CopyableTextField() {
        super();
        getStyleClass().add("copyable-text-field");
        setupCopyButtonField(super.rightProperty());
+        editableProperty().addListener((observable, oldValue, editable) -> {
+            if(!editable) {
+                setOnMouseClicked(copyHandler);
+                selectedTextProperty().addListener(selectionListener);
+            } else {
+                setOnMouseClicked(null);
+                selectedTextProperty().removeListener(selectionListener);
+            }
+        });
    }

    private void setupCopyButtonField(ObjectProperty<Node> rightProperty) {
@@ -31,7 +63,7 @@ public class CopyableTextField extends CustomTextField {
        copyButtonPane.setCursor(Cursor.DEFAULT);
        copyButtonPane.setOnMouseReleased(e -> {
            ClipboardContent content = new ClipboardContent();
-            content.putString(getText());
+            content.putString(getCopyText());
            Clipboard.getSystemClipboard().setContent(content);
        });

@@ -61,4 +93,8 @@ public class CopyableTextField extends CustomTextField {
            }
        });
    }
+
+    protected String getCopyText() {
+        return getText();
+    }
 }
@@ -7,6 +7,7 @@ import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.util.Duration;

 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -34,14 +35,19 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
            if(entry instanceof UtxoEntry) {
                UtxoEntry utxoEntry = (UtxoEntry)entry;
                if(utxoEntry.getHashIndex().getHeight() <= 0) {
-                    setText("Unconfirmed " + (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)"));
-                } else {
+                    setText("Unconfirmed " + (utxoEntry.getHashIndex().getHeight() < 0 ? "Parent " : "") + (utxoEntry.getWallet().isWhirlpoolMixWallet() ? "(Not yet mixable)" : (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)")));
+                    setContextMenu(null);
+                } else if(utxoEntry.getHashIndex().getDate() != null) {
                    String date = DATE_FORMAT.format(utxoEntry.getHashIndex().getDate());
                    setText(date);
                    setContextMenu(new DateContextMenu(date, utxoEntry.getHashIndex()));
+                } else {
+                    setText("Unknown");
+                    setContextMenu(null);
                }

                Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                int height = utxoEntry.getHashIndex().getHeight();
                tooltip.setText(height > 0 ? Integer.toString(height) : "Mempool");
                setTooltip(tooltip);
@@ -17,6 +17,10 @@ public class DateLabel extends CopyableLabel {
    }

    public static String getShortDateFormat(Date date) {
+        if(date == null) {
+            return "Unknown";
+        }
+
        Date now = new Date();
        long elapsed = (now.getTime() - date.getTime()) / 1000;

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
@@ -79,7 +80,7 @@ public class DescriptorArea extends CodeArea {
            copyOutputDescriptor.setOnAction(AE -> {
                hide();
                ClipboardContent content = new ClipboardContent();
-                content.putString(OutputDescriptor.getOutputDescriptor(wallet).toString(true));
+                content.putString(OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.DEFAULT_PURPOSES, null).toString(true));
                Clipboard.getSystemClipboard().setContent(content);
            });
            getItems().add(copyOutputDescriptor);
@@ -0,0 +1,26 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.hummingbird.UR;
+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;
+
+public class DescriptorQRDisplayDialog extends QRDisplayDialog {
+    public DescriptorQRDisplayDialog(String walletName, String outputDescriptor, UR ur) {
+        super(ur);
+
+        DialogPane dialogPane = getDialogPane();
+        final ButtonType pdfButtonType = new javafx.scene.control.ButtonType("Save PDF...", ButtonBar.ButtonData.HELP_2);
+        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 -> {
+            PdfUtils.saveOutputDescriptor(walletName, outputDescriptor, ur);
+            event.consume();
+        });
+    }
+}
@@ -1,36 +0,0 @@
-package com.sparrowwallet.sparrow.control;
-
-import com.google.common.eventbus.Subscribe;
-import com.sparrowwallet.drongo.KeyDerivation;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.event.AddressDisplayedEvent;
-import com.sparrowwallet.sparrow.io.Device;
-
-import java.util.List;
-
-public class DeviceAddressDialog extends DeviceDialog<String> {
-    private final Wallet wallet;
-    private final KeyDerivation keyDerivation;
-
-    public DeviceAddressDialog(List<String> operationFingerprints, Wallet wallet, KeyDerivation keyDerivation) {
-        super(operationFingerprints);
-        this.wallet = wallet;
-        this.keyDerivation = keyDerivation;
-
-        EventManager.get().register(this);
-        setOnCloseRequest(event -> {
-            EventManager.get().unregister(this);
-        });
-    }
-
-    @Override
-    protected DevicePane getDevicePane(Device device) {
-        return new DevicePane(wallet, keyDerivation, device);
-    }
-
-    @Subscribe
-    public void addressDisplayed(AddressDisplayedEvent event) {
-        setResult(event.getAddress());
-    }
-}
@@ -22,6 +22,7 @@ import java.util.Objects;
 public abstract class DeviceDialog<R> extends Dialog<R> {
    private final List<String> operationFingerprints;
    private final Accordion deviceAccordion;
+    private final Button scanButton;
    private final VBox scanBox;
    private final Label scanLabel;

@@ -57,18 +58,19 @@ public abstract class DeviceDialog<R> extends Dialog<R> {
        Glyph usb = new Glyph(FontAwesome5Brands.FONT_NAME, FontAwesome5Brands.Glyph.USB);
        usb.setFontSize(50);
        scanLabel = new Label("Connect Hardware Wallet");
-        Button button = new Button("Scan...");
-        button.setPrefSize(120, 60);
-        button.setOnAction(event -> {
+        scanButton = new Button("Scan...");
+        scanButton.setPrefSize(120, 60);
+        scanButton.setOnAction(event -> {
            scan();
        });
-        scanBox.getChildren().addAll(usb, scanLabel, button);
+        scanBox.getChildren().addAll(usb, scanLabel, scanButton);
        scanBox.managedProperty().bind(scanBox.visibleProperty());

        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);
        } else {
            Platform.runLater(() -> setDevices(devices));
@@ -89,21 +91,33 @@ public abstract class DeviceDialog<R> extends Dialog<R> {

        dialogPane.setPrefWidth(500);
        dialogPane.setPrefHeight(360);
+        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 -> {
+            scanButton.setText("Scan...");
            List<Device> devices = enumerateService.getValue();
            setDevices(devices);
            Platform.runLater(() -> EventManager.get().post(new UsbDeviceEvent(devices)));
        });
        enumerateService.setOnFailed(workerStateEvent -> {
+            scanButton.setText("Scan...");
+            deviceAccordion.getPanes().clear();
+            scanButton.setDefaultButton(true);
            scanBox.setVisible(true);
            scanLabel.setText(workerStateEvent.getSource().getException().getMessage());
        });
+        enumerateService.setOnRunning(workerStateEvent -> {
+            scanButton.setText("Scanning...");
+        });
        enumerateService.start();
    }

@@ -113,23 +127,24 @@ public abstract class DeviceDialog<R> extends Dialog<R> {

        if(operationFingerprints != null) {
            dialogDevices.removeIf(device -> {
-                return device.getFingerprint() != null && !operationFingerprints.contains(device.getFingerprint()) && !(device.getNeedsPinSent() || device.getNeedsPassphraseSent());
+                return device.getFingerprint() != null && !operationFingerprints.contains(device.getFingerprint()) && !(device.isNeedsPinSent() || device.isNeedsPassphraseSent());
            });
        }

        deviceAccordion.getPanes().clear();

        if(dialogDevices.isEmpty()) {
+            scanButton.setDefaultButton(true);
            scanBox.setVisible(true);
            scanLabel.setText("No matching devices found");
        } else {
            scanBox.setVisible(false);
            for(Device device : dialogDevices) {
-                DevicePane devicePane = getDevicePane(device);
+                DevicePane devicePane = getDevicePane(device, dialogDevices.size() == 1);
                deviceAccordion.getPanes().add(devicePane);
            }
        }
    }

-    protected abstract DevicePane getDevicePane(Device device);
+    protected abstract DevicePane getDevicePane(Device device, boolean defaultDevice);
 }
@@ -0,0 +1,36 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.AddressDisplayedEvent;
+import com.sparrowwallet.sparrow.io.Device;
+
+import java.util.stream.Collectors;
+
+public class DeviceDisplayAddressDialog extends DeviceDialog<String> {
+    private final Wallet wallet;
+    private final 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;
+
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+    }
+
+    @Override
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(wallet, outputDescriptor, device, defaultDevice);
+    }
+
+    @Subscribe
+    public void addressDisplayed(AddressDisplayedEvent event) {
+        setResult(event.getAddress());
+    }
+}
@@ -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());
+    }
+}
@@ -0,0 +1,39 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.KeystoresDiscoveredEvent;
+import com.sparrowwallet.sparrow.io.Device;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class DeviceKeystoreDiscoverDialog extends DeviceDialog<Map<StandardAccount, Keystore>> {
+    private final Wallet masterWallet;
+    private final List<StandardAccount> availableAccounts;
+
+    public DeviceKeystoreDiscoverDialog(List<String> operationFingerprints, Wallet masterWallet, List<StandardAccount> availableAccounts) {
+        super(operationFingerprints);
+        this.masterWallet = masterWallet;
+        this.availableAccounts = availableAccounts;
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+        setResultConverter(dialogButton -> dialogButton.getButtonData().isCancelButton() ? null : Collections.emptyMap());
+    }
+
+    @Override
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(masterWallet, availableAccounts, device, defaultDevice);
+    }
+
+    @Subscribe
+    public void keystoresDiscovered(KeystoresDiscoveredEvent event) {
+        setResult(event.getDiscoveredKeystores());
+    }
+}
@@ -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 -> {
@@ -22,8 +29,8 @@ public class DeviceSignDialog extends DeviceDialog<PSBT> {
    }

    @Override
-    protected DevicePane getDevicePane(Device device) {
-        return new DevicePane(psbt, device);
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(wallet, psbt, device, defaultDevice);
    }

    @Subscribe
@@ -26,8 +26,8 @@ public class DeviceSignMessageDialog extends DeviceDialog<String> {
    }

    @Override
-    protected DevicePane getDevicePane(Device device) {
-        return new DevicePane(wallet, message, keyDerivation, device);
+    protected DevicePane getDevicePane(Device device, boolean defaultDevice) {
+        return new DevicePane(wallet, message, keyDerivation, device, defaultDevice);
    }

    @Subscribe
@@ -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) {}
+}
@@ -3,30 +3,44 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
-import com.sparrowwallet.drongo.protocol.Transaction;
-import com.sparrowwallet.drongo.protocol.TransactionOutput;
+import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.wallet.*;
 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.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;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.HBox;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 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;

-class EntryCell extends TreeTableCell<Entry, Entry> {
-    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+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+)?\\).*");
+
+    private static EntryCell lastCell;
+
+    private IntegerProperty confirmationsProperty;

    public EntryCell() {
        super();
@@ -39,6 +53,12 @@ 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) {
@@ -60,81 +80,100 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                }

                Tooltip tooltip = new Tooltip();
-                tooltip.setText(transactionEntry.getBlockTransaction().getHash().toString());
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(getTooltip(transactionEntry));
                setTooltip(tooltip);

+                if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
+                    tooltip.setOnShowing(event -> {
+                        tooltip.setText(getTooltip(transactionEntry));
+                    });
+                }
+
                HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                Button viewTransactionButton = new Button("");
-                Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
-                searchGlyph.setFontSize(12);
-                viewTransactionButton.setGraphic(searchGlyph);
+                viewTransactionButton.setGraphic(getViewTransactionGlyph());
                viewTransactionButton.setOnAction(event -> {
                    EventManager.get().post(new ViewTransactionEvent(this.getScene().getWindow(), transactionEntry.getBlockTransaction()));
                });
                actionBox.getChildren().add(viewTransactionButton);

                BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
-                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() &&
+                        Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                    Button increaseFeeButton = new Button("");
-                    Glyph increaseFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_MEDICAL);
-                    increaseFeeGlyph.setFontSize(12);
-                    increaseFeeButton.setGraphic(increaseFeeGlyph);
+                    increaseFeeButton.setGraphic(getIncreaseFeeRBFGlyph());
                    increaseFeeButton.setOnAction(event -> {
-                        increaseFee(transactionEntry);
+                        increaseFee(transactionEntry, false);
                    });
                    actionBox.getChildren().add(increaseFeeButton);
                }

+                if(blockTransaction.getHeight() <= 0 && containsWalletOutputs(transactionEntry)) {
+                    Button cpfpButton = new Button("");
+                    cpfpButton.setGraphic(getIncreaseFeeCPFPGlyph());
+                    cpfpButton.setOnAction(event -> {
+                        createCpfp(transactionEntry);
+                    });
+                    actionBox.getChildren().add(cpfpButton);
+                }
+
                setGraphic(actionBox);
            } else if(entry instanceof NodeEntry) {
                NodeEntry nodeEntry = (NodeEntry)entry;
                Address address = nodeEntry.getAddress();
                setText(address.toString());
-                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), null));
+                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry, true));
                Tooltip tooltip = new Tooltip();
-                tooltip.setText(nodeEntry.getNode().getDerivationPath().replace("m", ".."));
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(nodeEntry.getNode().toString());
                setTooltip(tooltip);
                getStyleClass().add("address-cell");

                HBox actionBox = new HBox();
-                Button receiveButton = new Button("");
-                Glyph receiveGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_DOWN);
-                receiveGlyph.setFontSize(12);
-                receiveButton.setGraphic(receiveGlyph);
-                receiveButton.setOnAction(event -> {
-                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-                });
-                actionBox.getChildren().add(receiveButton);
+                actionBox.getStyleClass().add("cell-actions");

-                if(nodeEntry.getWallet().getKeystores().size() == 1 &&
-                        (nodeEntry.getWallet().getKeystores().get(0).hasSeed() || nodeEntry.getWallet().getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
+                if(!nodeEntry.getNode().getWallet().isBip47()) {
+                    Button receiveButton = new Button("");
+                    receiveButton.setGraphic(getReceiveGlyph());
+                    receiveButton.setOnAction(event -> {
+                        EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                        Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                    });
+                    actionBox.getChildren().add(receiveButton);
+                }
+
+                if(canSignMessage(nodeEntry.getNode())) {
                    Button signMessageButton = new Button("");
-                    Glyph signMessageGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
-                    signMessageGlyph.setFontSize(12);
-                    signMessageButton.setGraphic(signMessageGlyph);
+                    signMessageButton.setGraphic(getSignMessageGlyph());
                    signMessageButton.setOnAction(event -> {
                        MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
                        messageSignDialog.showAndWait();
                    });
                    actionBox.getChildren().add(signMessageButton);
-                    setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry));
                }

                setGraphic(actionBox);
+
+                if(nodeEntry.getWallet().isWhirlpoolChildWallet()) {
+                    setText(address.toString().substring(0, 20) + "...");
+                    setContextMenu(null);
+                    setGraphic(new HBox());
+                }
            } else if(entry instanceof HashIndexEntry) {
                HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
                setText(hashIndexEntry.getDescription());
-                setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
+                setContextMenu(getTreeTableView().getStyleClass().contains("bip47") ? null : new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
                Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                tooltip.setText(hashIndexEntry.getHashIndex().toString());
                setTooltip(tooltip);

                HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                Button viewTransactionButton = new Button("");
-                Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
-                searchGlyph.setFontSize(12);
-                viewTransactionButton.setGraphic(searchGlyph);
+                viewTransactionButton.setGraphic(getViewTransactionGlyph());
                viewTransactionButton.setOnAction(event -> {
                    EventManager.get().post(new ViewTransactionEvent(this.getScene().getWindow(), hashIndexEntry.getBlockTransaction(), hashIndexEntry));
                });
@@ -142,21 +181,34 @@ class EntryCell extends TreeTableCell<Entry, Entry> {

                if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable() && !hashIndexEntry.getHashIndex().isSpent()) {
                    Button spendUtxoButton = new Button("");
-                    Glyph sendGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
-                    sendGlyph.setFontSize(12);
-                    spendUtxoButton.setGraphic(sendGlyph);
+                    spendUtxoButton.setGraphic(getSendGlyph());
                    spendUtxoButton.setOnAction(event -> {
                        sendSelectedUtxos(getTreeTableView(), hashIndexEntry);
                    });
                    actionBox.getChildren().add(spendUtxoButton);
                }

-                setGraphic(actionBox);
+                setGraphic(getTreeTableView().getStyleClass().contains("bip47") ? null : actionBox);
            }
        }
    }

-    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()
@@ -164,9 +216,16 @@ 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)
                .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)
@@ -181,14 +240,16 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
                .collect(Collectors.toList());

-        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
+        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum() - consolidationOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
        Transaction tx = blockTransaction.getTransaction();
-        int vSize = tx.getVirtualSize();
+        double vSize = tx.getVirtualSize();
        int inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
        List<BlockTransactionHashIndex> walletUtxos = new ArrayList<>(transactionEntry.getWallet().getWalletUtxos().keySet());
+        //Remove any UTXOs created by the transaction that is to be replaced
+        walletUtxos.removeIf(utxo -> ourOutputs.stream().anyMatch(output -> output.getHash().equals(utxo.getHash()) && output.getIndex() == utxo.getIndex()));
        Collections.shuffle(walletUtxos);
-        while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty()) {
-            //If there is insufficent change output, include another random UTXO so the fee can be increased
+        while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty() && !cancelTransaction) {
+            //If there is insufficient change output, include another random UTXO so the fee can be increased
            BlockTransactionHashIndex utxo = walletUtxos.remove(0);
            utxos.add(utxo);
            changeTotal += utxo.getValue();
@@ -198,26 +259,111 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
        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 {
-                return new Payment(txOutput.getScript().getToAddresses()[0], transactionEntry.getLabel(), txOutput.getValue(), false);
+                String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
+                Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(label);
+                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 + ")";
+                    } else {
+                        label = base + "(Replaced By Fee #2)";
+                    }
+                } else {
+                    label += (label.isEmpty() ? "" : " ") + "(Replaced By Fee)";
+                }
+
+                if(txOutput.getScript().getToAddress() != null) {
+                    //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;
            } catch(Exception e) {
+                log.error("Error creating RBF payment", e);
                return null;
            }
        }).filter(Objects::nonNull).collect(Collectors.toList());

+        List<byte[]> opReturns = externalOutputs.stream().map(txOutput -> {
+            List<ScriptChunk> scriptChunks = txOutput.getScript().getChunks();
+            if(scriptChunks.size() != 2 || scriptChunks.get(0).getOpcode() != ScriptOpCodes.OP_RETURN) {
+                return null;
+            }
+            if(scriptChunks.get(1).getData() != null) {
+                return scriptChunks.get(1).getData();
+            }
+
+            return null;
+        }).filter(Objects::nonNull).collect(Collectors.toList());
+
+        if(payments.isEmpty()) {
+            AppServices.showErrorDialog("Replace By Fee Error", "Error creating RBF transaction, check log for details");
+            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, blockTransaction.getFee(), true)));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, opReturns.isEmpty() ? null : opReturns, blockTransaction.getFee(), true)));
    }

    private static Double getMaxFeeRate() {
-        if(AppServices.getTargetBlockFeeRates().isEmpty()) {
+        if(AppServices.getTargetBlockFeeRates() == null || AppServices.getTargetBlockFeeRates().isEmpty()) {
            return 100.0;
        }

        return AppServices.getTargetBlockFeeRates().values().iterator().next();
    }

+    private static void createCpfp(TransactionEntry transactionEntry) {
+        BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
+        List<BlockTransactionHashIndex> ourOutputs = transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT))
+                .map(HashIndexEntry::getHashIndex)
+                .collect(Collectors.toList());
+
+        if(ourOutputs.isEmpty()) {
+            throw new IllegalStateException("Cannot create CPFP without any wallet outputs to spend");
+        }
+
+        BlockTransactionHashIndex utxo = ourOutputs.get(0);
+
+        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);
+
+        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)));
+    }
+
+    private static boolean canSignMessage(WalletNode walletNode) {
+        Wallet wallet = walletNode.getWallet();
+        return wallet.getKeystores().size() == 1 && wallet.getScriptType() != ScriptType.P2TR &&
+                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB || wallet.getKeystores().get(0).getWalletModel().isCard()) &&
+                (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
+    }
+
+    private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
+        return transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .anyMatch(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT));
+    }
+
    private static void sendSelectedUtxos(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
        List<HashIndexEntry> utxoEntries = treeTableView.getSelectionModel().getSelectedCells().stream()
                .map(tp -> tp.getTreeItem().getValue())
@@ -235,19 +381,162 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(hashIndexEntry.getWallet(), spendingUtxos)));
    }

-    private static void freezeUtxo(HashIndexEntry hashIndexEntry) {
-        hashIndexEntry.getHashIndex().setStatus(Status.FROZEN);
-        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), hashIndexEntry.getHashIndex()));
+    private static void freezeUtxo(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
+        List<BlockTransactionHashIndex> utxos = treeTableView.getSelectionModel().getSelectedCells().stream()
+                .map(tp -> tp.getTreeItem().getValue())
+                .filter(e -> e instanceof HashIndexEntry && ((HashIndexEntry)e).getType().equals(HashIndexEntry.Type.OUTPUT))
+                .map(e -> ((HashIndexEntry)e).getHashIndex())
+                .filter(ref -> ref.getStatus() != Status.FROZEN)
+                .collect(Collectors.toList());
+
+        utxos.forEach(ref -> ref.setStatus(Status.FROZEN));
+        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), utxos));
    }

-    private static void unfreezeUtxo(HashIndexEntry hashIndexEntry) {
-        hashIndexEntry.getHashIndex().setStatus(null);
-        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), hashIndexEntry.getHashIndex()));
+    private static void unfreezeUtxo(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
+        List<BlockTransactionHashIndex> utxos = treeTableView.getSelectionModel().getSelectedCells().stream()
+                .map(tp -> tp.getTreeItem().getValue())
+                .filter(e -> e instanceof HashIndexEntry && ((HashIndexEntry)e).getType().equals(HashIndexEntry.Type.OUTPUT))
+                .map(e -> ((HashIndexEntry)e).getHashIndex())
+                .filter(ref -> ref.getStatus() == Status.FROZEN)
+                .collect(Collectors.toList());
+
+        utxos.forEach(ref -> ref.setStatus(null));
+        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), utxos));
+    }
+
+    private String getTooltip(TransactionEntry transactionEntry) {
+        String tooltip = transactionEntry.getBlockTransaction().getHash().toString();
+        if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
+            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";
+                } else if(vSizefromTip > 1000) {
+                    amount = String.format("%.2f", (double)vSizefromTip / 1000) + " kvB";
+                }
+
+                tooltip += "\nConfirms in: " + (blocksFromTip > 1 ? blocksFromTip + "+ blocks" : "1 block") + " (" + amount + " from tip)";
+            }
+
+            if(feeRate != null) {
+                tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB";
+            }
+
+            tooltip += "\nRBF: " + (transactionEntry.getBlockTransaction().getTransaction().isReplaceByFee() ? "Enabled" : "Disabled");
+        }
+
+        return tooltip;
+    }
+
+    private static Glyph getViewTransactionGlyph() {
+        Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
+        searchGlyph.setFontSize(12);
+        return searchGlyph;
+    }
+
+    private static Glyph getIncreaseFeeRBFGlyph() {
+        Glyph increaseFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_MEDICAL);
+        increaseFeeGlyph.setFontSize(12);
+        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);
+        return cpfpGlyph;
+    }
+
+    private static Glyph getReceiveGlyph() {
+        Glyph receiveGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_DOWN);
+        receiveGlyph.setFontSize(12);
+        return receiveGlyph;
+    }
+
+    private static Glyph getSignMessageGlyph() {
+        Glyph signMessageGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
+        signMessageGlyph.setFontSize(12);
+        return signMessageGlyph;
+    }
+
+    private static Glyph getSendGlyph() {
+        Glyph sendGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
+        sendGlyph.setFontSize(12);
+        return sendGlyph;
+    }
+
+    private static Glyph getCopyGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COPY);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
+    private static Glyph getFreezeGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SNOWFLAKE);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
+    private static Glyph getUnfreezeGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SUN);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
    }

    private static class UnconfirmedTransactionContextMenu extends ContextMenu {
        public UnconfirmedTransactionContextMenu(TransactionEntry transactionEntry) {
            BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
+            MenuItem viewTransaction = new MenuItem("View Transaction");
+            viewTransaction.setGraphic(getViewTransactionGlyph());
+            viewTransaction.setOnAction(AE -> {
+                hide();
+                EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
+            });
+            getItems().add(viewTransaction);
+
+            if(blockTransaction.getTransaction().isReplaceByFee() && Config.get().isIncludeMempoolOutputs() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                MenuItem increaseFee = new MenuItem("Increase Fee (RBF)");
+                increaseFee.setGraphic(getIncreaseFeeRBFGlyph());
+                increaseFee.setOnAction(AE -> {
+                    hide();
+                    increaseFee(transactionEntry, false);
+                });
+
+                getItems().add(increaseFee);
+            }
+
+            if(blockTransaction.getTransaction().isReplaceByFee() && 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());
+                createCpfp.setOnAction(AE -> {
+                    hide();
+                    createCpfp(transactionEntry);
+                });
+
+                getItems().add(createCpfp);
+            }
+
            MenuItem copyTxid = new MenuItem("Copy Transaction ID");
            copyTxid.setOnAction(AE -> {
                hide();
@@ -257,21 +546,18 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
            });

            getItems().add(copyTxid);
-
-            if(blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
-                MenuItem increaseFee = new MenuItem("Increase Fee");
-                increaseFee.setOnAction(AE -> {
-                    hide();
-                    increaseFee(transactionEntry);
-                });
-
-                getItems().add(increaseFee);
-            }
        }
    }

    private static class TransactionContextMenu extends ContextMenu {
        public TransactionContextMenu(String date, BlockTransaction blockTransaction) {
+            MenuItem viewTransaction = new MenuItem("View Transaction");
+            viewTransaction.setGraphic(getViewTransactionGlyph());
+            viewTransaction.setOnAction(AE -> {
+                hide();
+                EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
+            });
+
            MenuItem copyDate = new MenuItem("Copy Date");
            copyDate.setOnAction(AE -> {
                hide();
@@ -296,12 +582,70 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                Clipboard.getSystemClipboard().setContent(content);
            });

-            getItems().addAll(copyDate, copyTxid, copyHeight);
+            getItems().addAll(viewTransaction, copyDate, copyTxid, 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) {
+            if(nodeEntry == null || !nodeEntry.getWallet().isBip47()) {
+                MenuItem receiveToAddress = new MenuItem("Receive To");
+                receiveToAddress.setGraphic(getReceiveGlyph());
+                receiveToAddress.setOnAction(event -> {
+                    hide();
+                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                });
+                getItems().add(receiveToAddress);
+            }
+
+            if(nodeEntry != null && canSignMessage(nodeEntry.getNode())) {
+                MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
+                signVerifyMessage.setGraphic(getSignMessageGlyph());
+                signVerifyMessage.setOnAction(AE -> {
+                    hide();
+                    MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                    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();
@@ -310,14 +654,6 @@ 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();
@@ -326,35 +662,35 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                Clipboard.getSystemClipboard().setContent(content);
            });

-            getItems().addAll(copyAddress, copyHex, copyOutputDescriptor);
+            getItems().addAll(copyAddress, copyOutputDescriptor);

            if(nodeEntry != null) {
-                MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
-                signVerifyMessage.setOnAction(AE -> {
+                MenuItem copyHex = new MenuItem("Copy Script Output Bytes");
+                copyHex.setOnAction(AE -> {
                    hide();
-                    MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
-                    messageSignDialog.showAndWait();
+                    Script outputScript = nodeEntry.getWallet().getOutputScript(nodeEntry.getNode());
+                    ClipboardContent content = new ClipboardContent();
+                    content.putString(Utils.bytesToHex(outputScript.getProgram()));
+                    Clipboard.getSystemClipboard().setContent(content);
                });
-
-                getItems().add(signVerifyMessage);
+                getItems().add(copyHex);
            }
        }
    }

    private static class HashIndexEntryContextMenu extends ContextMenu {
        public HashIndexEntryContextMenu(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
-            String label = "Copy " + (hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) ? "Transaction Output" : "Transaction Input");
-            MenuItem copyHashIndex = new MenuItem(label);
-            copyHashIndex.setOnAction(AE -> {
+            MenuItem viewTransaction = new MenuItem("View Transaction");
+            viewTransaction.setGraphic(getViewTransactionGlyph());
+            viewTransaction.setOnAction(AE -> {
                hide();
-                ClipboardContent content = new ClipboardContent();
-                content.putString(hashIndexEntry.getHashIndex().toString());
-                Clipboard.getSystemClipboard().setContent(content);
+                EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), hashIndexEntry.getBlockTransaction()));
            });
-            getItems().add(copyHashIndex);
+            getItems().add(viewTransaction);

            if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable() && !hashIndexEntry.getHashIndex().isSpent()) {
                MenuItem sendSelected = new MenuItem("Send Selected");
+                sendSelected.setGraphic(getSendGlyph());
                sendSelected.setOnAction(AE -> {
                    hide();
                    sendSelectedUtxos(treeTableView, hashIndexEntry);
@@ -365,20 +701,32 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
            if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && !hashIndexEntry.getHashIndex().isSpent()) {
                if(hashIndexEntry.getHashIndex().getStatus() == null || hashIndexEntry.getHashIndex().getStatus() != Status.FROZEN) {
                    MenuItem freezeUtxo = new MenuItem("Freeze UTXO");
+                    freezeUtxo.setGraphic(getFreezeGlyph());
                    freezeUtxo.setOnAction(AE -> {
                        hide();
-                        freezeUtxo(hashIndexEntry);
+                        freezeUtxo(treeTableView, hashIndexEntry);
                    });
                    getItems().add(freezeUtxo);
                } else {
                    MenuItem unfreezeUtxo = new MenuItem("Unfreeze UTXO");
+                    unfreezeUtxo.setGraphic(getUnfreezeGlyph());
                    unfreezeUtxo.setOnAction(AE -> {
                        hide();
-                        unfreezeUtxo(hashIndexEntry);
+                        unfreezeUtxo(treeTableView, hashIndexEntry);
                    });
                    getItems().add(unfreezeUtxo);
                }
            }
+
+            String label = "Copy " + (hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) ? "Transaction Output" : "Transaction Input");
+            MenuItem copyHashIndex = new MenuItem(label);
+            copyHashIndex.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(hashIndexEntry.getHashIndex().toString());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+            getItems().add(copyHashIndex);
        }
    }

@@ -389,6 +737,7 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
        cell.getStyleClass().remove("address-cell");
        cell.getStyleClass().remove("hashindex-row");
        cell.getStyleClass().remove("confirming");
+        cell.getStyleClass().remove("negative-amount");
        cell.getStyleClass().remove("spent");
        cell.getStyleClass().remove("unspendable");

@@ -396,13 +745,14 @@ 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");
@@ -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);
@@ -4,7 +4,9 @@ import com.google.gson.JsonParseException;
 import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
 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.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.FileImport;
 import com.sparrowwallet.sparrow.io.ImportException;
@@ -40,12 +42,14 @@ public abstract class FileImportPane extends TitledDescriptionPane {
    protected ButtonBase importButton;
    private final SimpleStringProperty password = new SimpleStringProperty("");
    private final boolean scannable;
+    private final boolean fileFormatAvailable;
    protected List<Wallet> wallets;

-    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable) {
+    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable, boolean fileFormatAvailable) {
        super(title, description, content, imageUrl);
        this.importer = importer;
        this.scannable = scannable;
+        this.fileFormatAvailable = fileFormatAvailable;

        buttonBox.getChildren().clear();
        buttonBox.getChildren().add(createButton());
@@ -53,7 +57,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {

    @Override
    protected Control createButton() {
-        if(scannable) {
+        if(scannable && fileFormatAvailable) {
            ToggleButton scanButton = new ToggleButton("Scan...");
            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
            cameraGlyph.setFontSize(12);
@@ -74,6 +78,16 @@ public abstract class FileImportPane extends TitledDescriptionPane {
            SegmentedButton segmentedButton = new SegmentedButton();
            segmentedButton.getButtons().addAll(scanButton, fileButton);
            return segmentedButton;
+        } else if(scannable) {
+            importButton = new Button("Scan...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            importButton.setGraphic(cameraGlyph);
+            importButton.setAlignment(Pos.CENTER_RIGHT);
+            importButton.setOnAction(event -> {
+                importQR();
+            });
+            return importButton;
        } else {
            importButton = new Button("Import File...");
            importButton.setAlignment(Pos.CENTER_RIGHT);
@@ -95,6 +109,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                new FileChooser.ExtensionFilter("TXT", "*.txt")
        );

+        AppServices.moveToActiveWindowScreen(window, 800, 450);
        File file = fileChooser.showOpenDialog(window);
        if(file != null) {
            importFile(file, null);
@@ -111,8 +126,9 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                    importButton.setDisable(true);
                    setExpanded(true);
                } else {
-                    InputStream inputStream = new BufferedInputStream(new FileInputStream(file));
-                    importFile(file.getName(), inputStream, password);
+                    try(InputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
+                        importFile(file.getName(), inputStream, password);
+                    };
                }
            } catch (Exception e) {
                log.error("Error importing file", e);
@@ -142,6 +158,15 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                try {
                    importFile(importer.getName(), null, null);
                } catch(ImportException e) {
+                    log.error("Error importing QR", e);
+                    setError("Import Error", e.getMessage());
+                }
+            } else if(result.outputDescriptor != null) {
+                wallets = List.of(result.outputDescriptor.toKeystoreWallet(null));
+                try {
+                    importFile(importer.getName(), null, null);
+                } catch(ImportException e) {
+                    log.error("Error importing QR", e);
                    setError("Import Error", e.getMessage());
                }
            } else if(result.payload != null) {
@@ -161,6 +186,9 @@ public abstract class FileImportPane extends TitledDescriptionPane {
            } else if(result.exception != null) {
                log.error("Error importing QR", result.exception);
                setError("Import Error", result.exception.getMessage());
+            } else {
+                setError("Import Error", null);
+                setExpanded(true);
            }
        }
    }
@@ -169,11 +197,15 @@ public abstract class FileImportPane extends TitledDescriptionPane {
        if(wallets != null) {
            for(Wallet wallet : wallets) {
                if(scriptType.equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) {
-                    return wallet.getKeystores().get(0);
+                    Keystore keystore = wallet.getKeystores().get(0);
+                    keystore.setLabel(importer.getName().replace(" Multisig", ""));
+                    keystore.setSource(KeystoreSource.HW_AIRGAPPED);
+                    keystore.setWalletModel(importer.getWalletModel());
+                    return keystore;
                }
            }

-            throw new ImportException("Script type " + scriptType + " is not supported");
+            throw new ImportException("Script type " + scriptType.getDescription() + " is not supported in this QR. Check you are displaying the correct QR code.");
        }

        return null;
@@ -182,7 +214,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
    protected abstract void importFile(String fileName, InputStream inputStream, String password) throws ImportException;

    private Node getPasswordEntry(File file) {
-        CustomPasswordField passwordField = (CustomPasswordField) TextFields.createClearablePasswordField();
+        CustomPasswordField passwordField = new ViewPasswordField();
        passwordField.setPromptText("Wallet password");
        password.bind(passwordField.textProperty());
        HBox.setHgrow(passwordField, Priority.ALWAYS);
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
@@ -12,11 +13,13 @@ import java.io.*;
 public class FileKeystoreImportPane extends FileImportPane {
    protected final Wallet wallet;
    private final KeystoreFileImport importer;
+    private final KeyDerivation requiredDerivation;

-    public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+    public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer, KeyDerivation requiredDerivation) {
+        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(getAccount(wallet, requiredDerivation)), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
        this.wallet = wallet;
        this.importer = importer;
+        this.requiredDerivation = requiredDerivation;
    }

    protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
@@ -25,6 +28,10 @@ public class FileKeystoreImportPane extends FileImportPane {
            keystore = importer.getKeystore(wallet.getScriptType(), inputStream, password);
        }

-        EventManager.get().post(new KeystoreImportEvent(keystore));
+        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() + ".");
+        } else {
+            EventManager.get().post(new KeystoreImportEvent(keystore));
+        }
    }
 }
@@ -9,9 +9,7 @@ import com.sparrowwallet.sparrow.event.StorageEvent;
 import com.sparrowwallet.sparrow.event.TimedEvent;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.io.CoboVaultMultisig;
-import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.io.WalletExport;
+import com.sparrowwallet.sparrow.io.*;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Control;
@@ -23,18 +21,21 @@ import org.controlsfx.glyphfont.Glyph;

 import java.io.*;
 import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 import java.util.Optional;

 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());
@@ -42,7 +43,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);
@@ -62,6 +63,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);
@@ -81,8 +91,14 @@ public class FileWalletExportPane extends TitledDescriptionPane {

        FileChooser fileChooser = new FileChooser();
        fileChooser.setTitle("Export " + exporter.getWalletModel().toDisplayString() + " File");
-        fileChooser.setInitialFileName(wallet.getName() + "-" + exporter.getWalletModel().toDisplayString().toLowerCase() + "." + exporter.getExportFileExtension());
+        String extension = exporter.getExportFileExtension(wallet);
+        String fileName = wallet.getFullName() + "-" + exporter.getWalletModel().toDisplayString().toLowerCase(Locale.ROOT).replace(" ", "");
+        if(exporter.exportsAllWallets()) {
+            fileName = wallet.getMasterName();
+        }
+        fileChooser.setInitialFileName(fileName + (extension == null || extension.isEmpty() ? "" : "." + extension));

+        AppServices.moveToActiveWindowScreen(window, 800, 450);
        File file = fileChooser.showSaveDialog(window);
        if(file != null) {
            exportWallet(file);
@@ -90,43 +106,50 @@ public class FileWalletExportPane extends TitledDescriptionPane {
    }

    private void exportWallet(File file) {
-        Wallet copy = wallet.copy();
-
-        if(copy.isEncrypted()) {
-            WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+        if(wallet.isEncrypted() && exporter.walletExportRequiresDecryption()) {
+            Wallet copy = wallet.copy();
+            WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
            Optional<SecureString> password = dlg.showAndWait();
            if(password.isPresent()) {
-                final File walletFile = AppServices.get().getOpenWallets().get(wallet).getWalletFile();
+                final String walletId = AppServices.get().getOpenWallets().get(wallet).getWalletId(wallet);
                Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(copy, password.get());
                decryptWalletService.setOnSucceeded(workerStateEvent -> {
-                    EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.END, "Done"));
+                    EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Done"));
                    Wallet decryptedWallet = decryptWalletService.getValue();
-                    exportWallet(file, decryptedWallet);
+
+                    try {
+                        exportWallet(file, decryptedWallet);
+                    } finally {
+                        decryptedWallet.clearPrivate();
+                    }
                });
                decryptWalletService.setOnFailed(workerStateEvent -> {
-                    EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.END, "Failed"));
+                    EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Failed"));
                    setError("Export Error", decryptWalletService.getException().getMessage());
                });
-                EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.START, "Decrypting wallet..."));
+                EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.START, "Decrypting wallet..."));
                decryptWalletService.start();
            }
        } else {
-            exportWallet(file, copy);
+            exportWallet(file, wallet);
        }
    }

-    private void exportWallet(File file, Wallet decryptedWallet) {
+    private void exportWallet(File file, Wallet exportWallet) {
        try {
            if(file != null) {
-                OutputStream outputStream = new FileOutputStream(file);
-                exporter.exportWallet(decryptedWallet, outputStream);
-                EventManager.get().post(new WalletExportEvent(decryptedWallet));
+                try(OutputStream outputStream = new FileOutputStream(file)) {
+                    exporter.exportWallet(exportWallet, outputStream);
+                    EventManager.get().post(new WalletExportEvent(exportWallet));
+                }
            } else {
                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                exporter.exportWallet(decryptedWallet, outputStream);
+                exporter.exportWallet(exportWallet, outputStream);
                QRDisplayDialog qrDisplayDialog;
                if(exporter instanceof CoboVaultMultisig) {
                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
+                } else if(exporter instanceof PassportMultisig || exporter instanceof KeystoneMultisig || exporter instanceof JadeMultisig) {
+                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), false);
                } else {
                    qrDisplayDialog = new QRDisplayDialog(outputStream.toString(StandardCharsets.UTF_8));
                }
@@ -138,8 +161,6 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                errorMessage = e.getCause().getMessage();
            }
            setError("Export Error", errorMessage);
-        } finally {
-            decryptedWallet.clearPrivate();
        }
    }
 }
@@ -12,7 +12,7 @@ public class FileWalletImportPane extends FileImportPane {
    private final WalletImport importer;

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.control;

 import com.google.common.io.ByteStreams;
+import com.google.common.io.Files;
 import com.google.gson.JsonParseException;
 import com.sparrowwallet.drongo.policy.Policy;
 import com.sparrowwallet.drongo.policy.PolicyType;
@@ -21,12 +22,15 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
+import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
+import java.util.stream.Collectors;

 public class FileWalletKeystoreImportPane extends FileImportPane {
    private static final Logger log = LoggerFactory.getLogger(FileWalletKeystoreImportPane.class);
@@ -36,44 +40,87 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
    private byte[] fileBytes;

    public FileWalletKeystoreImportPane(KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
        this.importer = importer;
    }

    protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
        this.fileName = fileName;
-        try {
-            fileBytes = ByteStreams.toByteArray(inputStream);
-        } catch(IOException e) {
-            throw new ImportException("Could not read file", e);
+
+        List<ScriptType> scriptTypes = ScriptType.getAddressableScriptTypes(PolicyType.SINGLE);
+        if(wallets != null && !wallets.isEmpty()) {
+            if(wallets.size() == 1 && scriptTypes.contains(wallets.get(0).getScriptType())) {
+                Wallet wallet = wallets.get(0);
+                wallet.setPolicyType(PolicyType.SINGLE);
+                wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, wallet.getScriptType(), wallet.getKeystores(), null));
+                wallet.setName(importer.getName());
+                EventManager.get().post(new WalletImportEvent(wallets.get(0)));
+            } else {
+                scriptTypes.retainAll(wallets.stream().map(Wallet::getScriptType).collect(Collectors.toList()));
+                if(scriptTypes.isEmpty()) {
+                    throw new ImportException("No singlesig script types present in QR code");
+                }
+            }
+        } else {
+            try {
+                fileBytes = ByteStreams.toByteArray(inputStream);
+            } catch(IOException e) {
+                throw new ImportException("Could not read file", e);
+            }
        }

-        setContent(getScriptTypeEntry());
+        setContent(getScriptTypeEntry(scriptTypes));
        setExpanded(true);
        importButton.setDisable(true);
    }

    private void importWallet(ScriptType scriptType) throws ImportException {
-        ByteArrayInputStream bais = new ByteArrayInputStream(fileBytes);
-        Keystore keystore = importer.getKeystore(scriptType, bais, "");
+        if(wallets != null && !wallets.isEmpty()) {
+            Wallet wallet = wallets.stream().filter(wallet1 -> wallet1.getScriptType() == scriptType).findFirst().orElseThrow(ImportException::new);
+            wallet.setName(importer.getName());
+            wallet.setPolicyType(PolicyType.SINGLE);
+            wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, wallet.getScriptType(), wallet.getKeystores(), null));
+            EventManager.get().post(new WalletImportEvent(wallet));
+        } else {
+            ByteArrayInputStream bais = new ByteArrayInputStream(fileBytes);
+            Keystore keystore = importer.getKeystore(scriptType, bais, "");

-        Wallet wallet = new Wallet();
-        wallet.setName(fileName);
-        wallet.setPolicyType(PolicyType.SINGLE);
-        wallet.setScriptType(scriptType);
-        wallet.getKeystores().add(keystore);
-        wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, scriptType, wallet.getKeystores(), null));
+            Wallet wallet = new Wallet();
+            wallet.setName(Files.getNameWithoutExtension(fileName));
+            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));
+            EventManager.get().post(new WalletImportEvent(wallet));
+        }
    }

-    private Node getScriptTypeEntry() {
+    private Node getScriptTypeEntry(List<ScriptType> scriptTypes) {
        Label label = new Label("Script Type:");
-        ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE)));
-        scriptTypeComboBox.setValue(ScriptType.P2WPKH);
+
+        HBox fieldBox = new HBox(5);
+        fieldBox.setAlignment(Pos.CENTER_RIGHT);
+        ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(scriptTypes));
+        if(scriptTypes.contains(ScriptType.P2WPKH)) {
+            scriptTypeComboBox.setValue(ScriptType.P2WPKH);
+        }
+        scriptTypeComboBox.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return null;
+            }
+        });
+        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.");
+        fieldBox.getChildren().addAll(scriptTypeComboBox, helpLabel);

        Region region = new Region();
        HBox.setHgrow(region, Priority.SOMETIMES);
@@ -100,7 +147,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
        HBox contentBox = new HBox();
        contentBox.setAlignment(Pos.CENTER_RIGHT);
        contentBox.setSpacing(20);
-        contentBox.getChildren().addAll(label, scriptTypeComboBox, helpLabel, region, importFileButton);
+        contentBox.getChildren().addAll(label, fieldBox, region, importFileButton);
        contentBox.setPadding(new Insets(10, 30, 10, 30));
        contentBox.setPrefHeight(60);

@@ -1,8 +1,12 @@
 package com.sparrowwallet.sparrow.control;

 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.util.Duration;
@@ -15,16 +19,19 @@ public class HelpLabel extends Label {
        super("", getHelpGlyph());
        tooltip = new Tooltip();
        tooltip.textProperty().bind(helpTextProperty());
+        tooltip.graphicProperty().bind(helpGraphicProperty());
        tooltip.setShowDuration(Duration.seconds(15));
-        setTooltip(tooltip);
+        tooltip.setShowDelay(Duration.millis(500));
        getStyleClass().add("help-label");
+
+        Platform.runLater(() -> setTooltip(tooltip));
    }

    private static Glyph getHelpGlyph() {
-        Glyph lockGlyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.QUESTION_CIRCLE);
-        lockGlyph.getStyleClass().add("help-icon");
-        lockGlyph.setFontSize(12);
-        return lockGlyph;
+        Glyph glyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.QUESTION_CIRCLE);
+        glyph.getStyleClass().add("help-icon");
+        glyph.setFontSize(11);
+        return glyph;
    }

    public final StringProperty helpTextProperty() {
@@ -44,4 +51,18 @@ public class HelpLabel extends Label {
    public final String getHelpText() {
        return helpText == null ? "" : helpText.getValue();
    }
+
+    public ObjectProperty<Node> helpGraphicProperty() {
+        if(helpGraphicProperty == null) {
+            helpGraphicProperty = new SimpleObjectProperty<Node>(this, "helpGraphic", null);
+        }
+
+        return helpGraphicProperty;
+    }
+
+    private ObjectProperty<Node> helpGraphicProperty;
+
+    public final void setHelpGraphic(Node graphic) {
+        helpGraphicProperty().setValue(graphic);
+    }
 }
@@ -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);
+                }
+            });
+        }
+    }
+}
@@ -1,35 +1,44 @@
 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.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);
    }

    public KeystorePassphraseDialog(String walletName, Keystore keystore) {
-        this.passphrase = (CustomPasswordField) TextFields.createClearablePasswordField();
+        this(walletName, keystore, false);
+    }
+
+    public KeystorePassphraseDialog(String walletName, Keystore keystore, boolean confirm) {
+        this.passphrase = new ViewPasswordField();

        final DialogPane dialogPane = getDialogPane();
-        setTitle("Keystore Passphrase" + (walletName != null ? " - " + walletName : ""));
-        dialogPane.setHeaderText("Please enter the passphrase for keystore: \n" + keystore.getLabel());
+        setTitle("Keystore Passphrase" + (walletName != null ? " for " + walletName : ""));
+        dialogPane.setHeaderText((confirm ? "Re-enter" : "Enter") + " the BIP39 passphrase\n" + (confirm ? "to confirm:" : "for keystore: " + keystore.getLabel()));
        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);
@@ -39,9 +48,54 @@ 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((confirm ? "Note" : "Check") + " the master fingerprint before proceeding!", warnGlyph);
+        warnLabel.setGraphicTextGap(5);
+        content.getChildren().add(warnLabel);
+
        dialogPane.setContent(content);
        Platform.runLater(passphrase::requestFocus);

        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);
+        }
+    }
 }
@@ -1,20 +1,27 @@
 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;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DataFormat;
 import javafx.util.converter.DefaultStringConverter;
 import org.slf4j.Logger;
 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");
@@ -28,10 +35,11 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
            setText(null);
            setGraphic(null);
        } else {
-            EntryCell.applyRowStyles(this, getTreeTableView().getTreeItem(getIndex()).getValue());
+            Entry entry = getTreeTableView().getTreeItem(getIndex()).getValue();
+            EntryCell.applyRowStyles(this, entry);

            setText(label);
-            setContextMenu(new LabelContextMenu(label));
+            setContextMenu(new LabelContextMenu(entry, label));
        }
    }

@@ -58,6 +66,7 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
        }

        super.commitEdit(label);
+        Platform.runLater(() -> getTreeTableView().requestFocus());
    }

    @Override
@@ -79,8 +88,23 @@ 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(String label) {
+        public LabelContextMenu(Entry entry, String label) {
            MenuItem copyLabel = new MenuItem("Copy Label");
            copyLabel.setOnAction(AE -> {
                hide();
@@ -88,8 +112,17 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
                content.putString(label);
                Clipboard.getSystemClipboard().setContent(content);
            });
-
            getItems().add(copyLabel);
+
+            MenuItem pasteLabel = new MenuItem("Paste Label");
+            pasteLabel.setOnAction(AE -> {
+                hide();
+                Object currentContent = Clipboard.getSystemClipboard().getContent(DataFormat.PLAIN_TEXT);
+                if(currentContent instanceof String) {
+                    entry.labelProperty().set((String)currentContent);
+                }
+            });
+            getItems().add(pasteLabel);
        }
    }
 }
@@ -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));
+    }
+}
@@ -0,0 +1,49 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.application.Platform;
+import javafx.scene.control.*;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.StackPane;
+
+public class MasterKeyDisplayDialog  extends Dialog<Void> {
+    public MasterKeyDisplayDialog(Keystore decryptedKeystore) {
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        StackPane stackPane = new StackPane();
+        dialogPane.setContent(stackPane);
+
+        AnchorPane anchorPane = new AnchorPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.getStyleClass().add("edge-to-edge");
+        scrollPane.setPrefHeight(200);
+        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);
+
+        XprvKeystoreImportPane keystorePane = new XprvKeystoreImportPane(decryptedKeystore);
+        keystorePane.setAnimated(false);
+        keystoreAccordion.getPanes().add(keystorePane);
+
+        stackPane.getChildren().addAll(anchorPane);
+
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialogPane.getButtonTypes().addAll(cancelButtonType);
+
+        dialogPane.setPrefWidth(500);
+        dialogPane.setPrefHeight(260);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
+    }
+}
+
@@ -1,8 +1,8 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.net.MempoolRateSize;
-import com.sparrowwallet.sparrow.wallet.SendController;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
@@ -28,6 +28,7 @@ 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;
+    private static final double Y_VALUE_BREAK_MVB = 3.0;

    private Tooltip tooltip;

@@ -68,19 +69,6 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
        categoryAxis.setTickLabelRotation(0);

        NumberAxis numberAxis = (NumberAxis)getYAxis();
-        numberAxis.setTickLabelFormatter(new StringConverter<Number>() {
-            @Override
-            public String toString(Number object) {
-                long vSizeBytes = object.longValue();
-                return (vSizeBytes / (1000 * 1000)) + " MvB";
-            }
-
-            @Override
-            public Number fromString(String string) {
-                return null;
-            }
-        });
-
        this.setOnMouseMoved(mouseEvent -> {
            Point2D sceneCoords = this.localToScene(mouseEvent.getX(), mouseEvent.getY());
            String category = categoryAxis.getValueForDisplay(categoryAxis.sceneToLocal(sceneCoords).getX());
@@ -91,9 +79,9 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
        });

        long previousFeeRate = 0;
-        for(Long feeRate : SendController.FEE_RATES_RANGE) {
+        for(Long feeRate : AppServices.FEE_RATES_RANGE) {
            XYChart.Series<String, Number> series = new XYChart.Series<>();
-            series.setName(feeRate + "+ vB");
+            series.setName(feeRate + "+ sats/vB");
            long seriesTotalVSize = 0;

            for(Date date : periodRateSizes.keySet()) {
@@ -116,6 +104,24 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
            previousFeeRate = feeRate;
        }

+        final double maxMvB = getMaxMvB(getData());
+        numberAxis.setTickLabelFormatter(new StringConverter<Number>() {
+            @Override
+            public String toString(Number object) {
+                long vSizeBytes = object.longValue();
+                if(maxMvB > Y_VALUE_BREAK_MVB) {
+                    return (vSizeBytes / (1000 * 1000)) + " MvB";
+                } else {
+                    return (vSizeBytes / (1000)) + " kvB";
+                }
+            }
+
+            @Override
+            public Number fromString(String string) {
+                return null;
+            }
+        });
+
        if(categories.keySet().iterator().hasNext()) {
            String time = categories.values().iterator().next();
            tooltip.setGraphic(new ChartTooltip(time, time, getData()));
@@ -159,20 +165,42 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
        return categories;
    }

+    private static double getMaxMvB(List<Series<String, Number>> seriesList) {
+        double maxTotal = 0d;
+        for(Series<String, Number> series : seriesList) {
+            maxTotal = Math.max(maxTotal, getMaxMvB(series));
+        }
+
+        return maxTotal;
+    }
+
+    private static double getMaxMvB(Series<String, Number> series) {
+        double total = 0d;
+        for(XYChart.Data<String, Number> data : series.getData()) {
+            double mvb = data.getYValue().doubleValue() / (1000 * 1000);
+            total += mvb;
+        }
+
+        return total;
+    }
+
    private static class ChartTooltip extends VBox {
        public ChartTooltip(String category, String time, List<Series<String, Number>> seriesList) {
            Label title = new Label("At " + time);
            HBox titleBox = new HBox(title);
            title.setStyle("-fx-alignment: center; -fx-font-size: 12px; -fx-padding: 0 0 5 0;");
            getChildren().add(titleBox);
+            double maxMvB = getMaxMvB(seriesList);

            for(int i = seriesList.size() - 1; i >= 0; i--) {
                Series<String, Number> series = seriesList.get(i);
                for(XYChart.Data<String, Number> data : series.getData()) {
                    if(data.getXValue().equals(category)) {
-                        double mvb = data.getYValue().doubleValue() / (1000 * 1000);
-                        if(mvb >= 0.01) {
-                            Label label = new Label(series.getName() + ": " + String.format("%.2f", mvb) + " MvB");
+                        double kvb = data.getYValue().doubleValue() / 1000;
+                        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);
                            Glyph circle = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CIRCLE);
                            if(i < 8) {
                                circle.setStyle("-fx-text-fill: CHART_COLOR_" + (i+1));
@@ -8,10 +8,7 @@ import com.sparrowwallet.drongo.address.InvalidAddressException;
 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;
@@ -24,6 +21,7 @@ import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
+import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
@@ -34,7 +32,9 @@ import tornadofx.control.Fieldset;
 import tornadofx.control.Form;

 import java.security.SignatureException;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;

 public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
@@ -43,8 +43,13 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
    private final TextField address;
    private final TextArea message;
    private final TextArea signature;
+    private final ToggleGroup formatGroup;
+    private final ToggleButton formatTrezor;
+    private final ToggleButton formatElectrum;
    private final Wallet wallet;
    private WalletNode walletNode;
+    private boolean electrumSignatureFormat;
+    private boolean closed;

    /**
     * Verification only constructor
@@ -69,13 +74,25 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     * @param walletNode Wallet node to derive address from
     */
    public MessageSignDialog(Wallet wallet, WalletNode walletNode) {
+        this(wallet, walletNode, null, null);
+    }
+
+    /**
+     * Sign and verify with preset address, and supplied title, message and dialog buttons
+     *
+     * @param wallet Wallet to sign with
+     * @param walletNode Wallet node to derive address from
+     * @param title Header text of dialog
+     * @param msg Message to sign (all fields will be made uneditable)
+     * @param buttons The dialog buttons to display. If one contains the text "sign" it will trigger the signing process
+     */
+    public MessageSignDialog(Wallet wallet, WalletNode walletNode, String title, String msg, ButtonType... buttons) {
+        if(walletNode != null) {
+            checkWalletSigning(walletNode.getWallet());
+        }
+
        if(wallet != null) {
-            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).hasSeed() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB) {
-                throw new IllegalArgumentException("Cannot sign messages using a wallet without a seed or USB keystore");
-            }
+            checkWalletSigning(wallet);
        }

        this.wallet = wallet;
@@ -83,8 +100,9 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {

        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.setHeaderText(wallet == null ? "Verify Message" : "Sign/Verify Message");
+        dialogPane.setHeaderText(title == null ? (wallet == null ? "Verify Message" : "Sign/Verify Message") : title);

        Image image = new Image("image/seed.png", 50, 50, false, false);
        if (!image.isError()) {
@@ -100,16 +118,18 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        Form form = new Form();
        Fieldset fieldset = new Fieldset();
        fieldset.setText("");
+        fieldset.setSpacing(10);

        Field addressField = new Field();
        addressField.setText("Address:");
        address = new TextField();
        address.getStyleClass().add("id");
        address.setEditable(walletNode == null);
+        address.setTooltip(new Tooltip("Only Legacy (P2PKH), Nested Segwit (P2SH-P2WPKH) and Native Segwit (P2WPKH) singlesig addresses can sign"));
        addressField.getInputs().add(address);

        if(walletNode != null) {
-            address.setText(wallet.getAddress(walletNode).toString());
+            address.setText(walletNode.getAddress().toString());
        }

        Field messageField = new Field();
@@ -129,51 +149,90 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        signature.setWrapText(true);
        signatureField.getInputs().add(signature);

-        fieldset.getChildren().addAll(addressField, messageField, signatureField);
+        Field formatField = new Field();
+        formatField.setText("Format:");
+        formatGroup = new ToggleGroup();
+        formatElectrum = new ToggleButton("Standard (Electrum)");
+        formatTrezor = new ToggleButton("BIP137 (Trezor)");
+        SegmentedButton formatButtons = new SegmentedButton(formatElectrum, formatTrezor);
+        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);

+        if(msg != null) {
+            message.setText(msg);
+            address.setEditable(false);
+            message.setEditable(false);
+            signature.setEditable(false);
+            formatButtons.setDisable(true);
+        }
+
        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.OK_DONE);
-        dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);
+        ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.CANCEL_CLOSE);

-        Button signButton = (Button)dialogPane.lookupButton(signButtonType);
-        signButton.setDisable(wallet == null);
-        signButton.setOnAction(event -> {
-            signMessage();
-        });
+        if(buttons.length > 0) {
+            dialogPane.getButtonTypes().addAll(buttons);

-        Button verifyButton = (Button)dialogPane.lookupButton(verifyButtonType);
-        verifyButton.setDefaultButton(false);
-        verifyButton.setOnAction(event -> {
-            verifyMessage();
-        });
-
-        boolean validAddress = isValidAddress();
-        signButton.setDisable(!validAddress || (wallet == null));
-        verifyButton.setDisable(!validAddress);
-
-        ValidationSupport validationSupport = new ValidationSupport();
-        Platform.runLater(() -> {
-            validationSupport.registerValidator(address, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid address", !isValidAddress()));
-            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
-        });
-
-        address.textProperty().addListener((observable, oldValue, newValue) -> {
-            boolean valid = isValidAddress();
-            signButton.setDisable(!valid || (wallet == null));
-            verifyButton.setDisable(!valid);
-
-            if(valid && wallet != null) {
-                try {
-                    Address address = getAddress();
-                    setWalletNodeFromAddress(wallet, address);
-                } catch(InvalidAddressException e) {
-                    //can't happen
-                }
+            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);
+                customSignButton.setOnAction(event -> {
+                    customSignButton.setDisable(true);
+                    signMessage();
+                    setResult(ButtonBar.ButtonData.OK_DONE);
+                });
            }
-        });
+        } else {
+            dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);
+
+            Button signButton = (Button) dialogPane.lookupButton(signButtonType);
+            signButton.setDisable(wallet == null);
+            signButton.setOnAction(event -> {
+                signMessage();
+            });
+
+            Button verifyButton = (Button) dialogPane.lookupButton(verifyButtonType);
+            verifyButton.setDefaultButton(false);
+            verifyButton.setOnAction(event -> {
+                verifyMessage();
+            });
+
+            boolean validAddress = isValidAddress();
+            signButton.setDisable(!validAddress || (wallet == null));
+            verifyButton.setDisable(!validAddress);
+
+            ValidationSupport validationSupport = new ValidationSupport();
+            Platform.runLater(() -> {
+                validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+                validationSupport.registerValidator(address, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid address", !isValidAddress()));
+            });
+
+            address.textProperty().addListener((observable, oldValue, newValue) -> {
+                boolean valid = isValidAddress();
+                signButton.setDisable(!valid || (wallet == null));
+                verifyButton.setDisable(!valid);
+
+                if(valid && wallet != null) {
+                    try {
+                        Address address = getAddress();
+                        setWalletNodeFromAddress(wallet, address);
+                    } catch(InvalidAddressException e) {
+                        //can't happen
+                    }
+                }
+            });
+        }

        EventManager.get().register(this);
        setOnCloseRequest(event -> {
@@ -182,20 +241,58 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                return;
            }

-            EventManager.get().unregister(this);
+            if(!closed) {
+                EventManager.get().unregister(this);
+                closed = true;
+            }
        });

-        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : ButtonBar.ButtonData.OK_DONE);
+        AppServices.onEscapePressed(dialogPane.getScene(), () -> setResult(ButtonBar.ButtonData.CANCEL_CLOSE));
+        AppServices.moveToActiveWindowScreen(this);
+        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
+
+        Platform.runLater(() -> {
+            if(address.getText().isEmpty()) {
+                address.requestFocus();
+            } else if(message.getText().isEmpty()) {
+                message.requestFocus();
+            }
+
+            formatGroup.selectToggle(formatElectrum);
+        });
+    }
+
+    private void checkWalletSigning(Wallet wallet) {
+        if(wallet.getKeystores().size() != 1) {
+            throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
+        }
+        if(!wallet.getKeystores().get(0).hasPrivateKey() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB && !wallet.getKeystores().get(0).getWalletModel().isCard()) {
+            throw new IllegalArgumentException("Cannot sign messages using a wallet without private keys or a connected keystore");
+        }
    }

    private Address getAddress()throws InvalidAddressException {
        return Address.fromString(address.getText());
    }

+    public String getSignature() {
+        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 {
-            getAddress();
-            return true;
+            Address address = getAddress();
+            return address.getScriptType() != ScriptType.P2TR && (address.getScriptType().isAllowed(PolicyType.SINGLE) || address.getScriptType() == ScriptType.P2SH);
        } catch (InvalidAddressException e) {
            return false;
        }
@@ -211,35 +308,38 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            return;
        }

-        if(wallet.containsSeeds()) {
-            if(wallet.isEncrypted()) {
+        //Note we can expect a single keystore due to the check in the constructor
+        Wallet signingWallet = walletNode.getWallet();
+        if(signingWallet.getKeystores().get(0).hasPrivateKey()) {
+            if(signingWallet.isEncrypted()) {
                EventManager.get().post(new RequestOpenWalletsEvent());
            } else {
-                signUnencryptedKeystore(wallet);
+                signUnencryptedKeystore(signingWallet);
            }
-        } else if(wallet.containsSource(KeystoreSource.HW_USB)) {
-            signUsbKeystore(wallet);
+        } else if(signingWallet.containsSource(KeystoreSource.HW_USB) || wallet.getKeystores().get(0).getWalletModel().isCard()) {
+            signDeviceKeystore(signingWallet);
        }
    }

    private void signUnencryptedKeystore(Wallet decryptedWallet) {
        try {
-            //Note we can expect a single keystore due to the check above
            Keystore keystore = decryptedWallet.getKeystores().get(0);
            ECKey privKey = keystore.getKey(walletNode);
-            String signatureText = privKey.signMessage(message.getText().trim(), decryptedWallet.getScriptType(), null);
+            ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType();
+            String signatureText = privKey.signMessage(message.getText().trim(), scriptType);
            signature.clear();
            signature.appendText(signatureText);
+            privKey.clear();
        } catch(Exception e) {
            log.error("Could not sign message", e);
            AppServices.showErrorDialog("Could not sign message", e.getMessage());
        }
    }

-    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);
        Optional<String> optSignature = deviceSignMessageDialog.showAndWait();
        if(optSignature.isPresent()) {
            signature.clear();
@@ -269,14 +369,9 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            }

            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.");
-                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());
@@ -308,20 +403,21 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            return;
        }

-        WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+        WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
        Optional<SecureString> password = dlg.showAndWait();
        if(password.isPresent()) {
-            Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(wallet.copy(), password.get());
+            Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(walletNode.getWallet().copy(), password.get());
            decryptWalletService.setOnSucceeded(workerStateEvent -> {
-                EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Done"));
+                EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Done"));
                Wallet decryptedWallet = decryptWalletService.getValue();
                signUnencryptedKeystore(decryptedWallet);
+                decryptedWallet.clearPrivate();
            });
            decryptWalletService.setOnFailed(workerStateEvent -> {
-                EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Failed"));
+                EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Failed"));
                AppServices.showErrorDialog("Incorrect Password", decryptWalletService.getException().getMessage());
            });
-            EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.START, "Decrypting wallet..."));
+            EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.START, "Decrypting wallet..."));
            decryptWalletService.start();
        }
    }
@@ -0,0 +1,214 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.samourai.whirlpool.client.mix.listener.MixFailReason;
+import com.samourai.whirlpool.client.mix.listener.MixStep;
+import com.samourai.whirlpool.client.wallet.beans.MixProgress;
+import com.samourai.whirlpool.protocol.beans.Utxo;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import com.sparrowwallet.sparrow.wallet.UtxoEntry;
+import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
+import com.sparrowwallet.sparrow.whirlpool.WhirlpoolException;
+import javafx.animation.Timeline;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.util.Duration;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.tools.Platform;
+
+import java.util.Locale;
+
+public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
+    private static final int ERROR_DISPLAY_MILLIS = 5 * 60 * 1000;
+
+    public MixStatusCell() {
+        super();
+        setAlignment(Pos.CENTER_RIGHT);
+        setContentDisplay(ContentDisplay.LEFT);
+        setGraphicTextGap(8);
+        getStyleClass().add("mixstatus-cell");
+    }
+
+    @Override
+    protected void updateItem(UtxoEntry.MixStatus mixStatus, boolean empty) {
+        super.updateItem(mixStatus, empty);
+
+        EntryCell.applyRowStyles(this, mixStatus == null ? null : mixStatus.getUtxoEntry());
+
+        if(empty || mixStatus == null) {
+            setText(null);
+            setGraphic(null);
+        } else {
+            setText(Integer.toString(mixStatus.getMixesDone()));
+            if(mixStatus.getNextMixUtxo() == null) {
+                setContextMenu(new MixStatusContextMenu(mixStatus.getUtxoEntry(), mixStatus.getMixProgress() != null && mixStatus.getMixProgress().getMixStep() != MixStep.FAIL));
+            } else {
+                setContextMenu(null);
+            }
+
+            if(mixStatus.getNextMixUtxo() != null) {
+                setMixSuccess(mixStatus.getNextMixUtxo());
+            } else if(mixStatus.getMixFailReason() != null) {
+                setMixFail(mixStatus.getMixFailReason(), mixStatus.getMixError(), mixStatus.getMixErrorTimestamp());
+            } else if(mixStatus.getMixProgress() != null) {
+                setMixProgress(mixStatus.getUtxoEntry(), mixStatus.getMixProgress());
+            } else {
+                setGraphic(null);
+                setTooltip(null);
+            }
+        }
+    }
+
+    private void setMixSuccess(Utxo nextMixUtxo) {
+        ProgressIndicator progressIndicator = getProgressIndicator();
+        progressIndicator.setProgress(-1);
+        setGraphic(progressIndicator);
+        Tooltip tt = new Tooltip();
+        tt.setText("Waiting for broadcast of " + nextMixUtxo.getHash().substring(0, 8) + "..." + ":" + nextMixUtxo.getIndex() );
+        setTooltip(tt);
+    }
+
+    private void setMixFail(MixFailReason mixFailReason, String mixError, Long mixErrorTimestamp) {
+        if(mixFailReason != MixFailReason.CANCEL) {
+            long elapsed = mixErrorTimestamp == null ? 0L : System.currentTimeMillis() - mixErrorTimestamp;
+            if(elapsed >= ERROR_DISPLAY_MILLIS) {
+                //Old error, don't set again.
+                return;
+            }
+
+            Glyph failGlyph = getFailGlyph();
+            setGraphic(failGlyph);
+            Tooltip tt = new Tooltip();
+            tt.setText(mixFailReason.getMessage() + (mixError == null ? "" : ": " + mixError) +
+                    "\nMix failures are generally caused by peers disconnecting during a mix." +
+                    "\nMake sure your internet connection is stable and the computer is configured to prevent sleeping." +
+                    "\nTo prevent sleeping, use the " + getPlatformSleepConfig() + " or enable the function in the Tools menu.");
+            setTooltip(tt);
+
+            Duration fadeDuration = Duration.millis(ERROR_DISPLAY_MILLIS - elapsed);
+            double fadeFromValue = 1.0 - ((double)elapsed / ERROR_DISPLAY_MILLIS);
+            Timeline timeline = AnimationUtil.getSlowFadeOut(failGlyph, fadeDuration, fadeFromValue, 10);
+            timeline.setOnFinished(event -> {
+                setTooltip(null);
+            });
+            timeline.play();
+        } else {
+            setGraphic(null);
+            setTooltip(null);
+        }
+    }
+
+    private String getPlatformSleepConfig() {
+        Platform platform = Platform.getCurrent();
+        if(platform == Platform.OSX) {
+            return "OSX System Preferences";
+        } else if(platform == Platform.WINDOWS) {
+            return "Windows Control Panel";
+        }
+
+        return "system power settings";
+    }
+
+    private void setMixProgress(UtxoEntry utxoEntry, MixProgress mixProgress) {
+        if(mixProgress.getMixStep() != MixStep.FAIL) {
+            ProgressIndicator progressIndicator = getProgressIndicator();
+            progressIndicator.setProgress(mixProgress.getMixStep().getProgressPercent() == 100 ? -1 : mixProgress.getMixStep().getProgressPercent() / 100.0);
+            setGraphic(progressIndicator);
+            Tooltip tt = new Tooltip();
+            String status = mixProgress.getMixStep().getMessage().substring(0, 1).toUpperCase(Locale.ROOT) + mixProgress.getMixStep().getMessage().substring(1);
+            tt.setText(status);
+            setTooltip(tt);
+
+            if(mixProgress.getMixStep() == MixStep.REGISTERED_INPUT) {
+                tt.setOnShowing(event -> {
+                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
+                    Whirlpool.RegisteredInputsService registeredInputsService = new Whirlpool.RegisteredInputsService(whirlpool, mixProgress.getPoolId());
+                    registeredInputsService.setOnSucceeded(eventStateHandler -> {
+                        if(registeredInputsService.getValue() != null) {
+                            tt.setText(status + " (1 of " + registeredInputsService.getValue() + ")");
+                        }
+                    });
+                    registeredInputsService.start();
+                });
+            }
+        } else {
+            setGraphic(null);
+            setTooltip(null);
+        }
+    }
+
+    private ProgressIndicator getProgressIndicator() {
+        ProgressIndicator progressIndicator;
+        if(getGraphic() instanceof ProgressIndicator) {
+            progressIndicator = (ProgressIndicator)getGraphic();
+        } else {
+            progressIndicator = new ProgressBar();
+        }
+
+        return progressIndicator;
+    }
+
+    private static Glyph getMixGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
+    private static Glyph getStopGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.STOP_CIRCLE);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
+    public static Glyph getFailGlyph() {
+        Glyph failGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+        failGlyph.getStyleClass().add("fail-warning");
+        failGlyph.setFontSize(12);
+        return failGlyph;
+    }
+
+    private static class MixStatusContextMenu extends ContextMenu {
+        public MixStatusContextMenu(UtxoEntry utxoEntry, boolean isMixing) {
+            Whirlpool pool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
+            if(isMixing) {
+                MenuItem mixStop = new MenuItem("Stop Mixing");
+                if(pool != null) {
+                    mixStop.disableProperty().bind(pool.mixingProperty().not());
+                }
+                mixStop.setGraphic(getStopGlyph());
+                mixStop.setOnAction(event -> {
+                    hide();
+                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
+                    if(whirlpool != null) {
+                        try {
+                            whirlpool.mixStop(utxoEntry.getHashIndex());
+                        } catch(WhirlpoolException e) {
+                            AppServices.showErrorDialog("Error stopping mixing UTXO", e.getMessage());
+                        }
+                    }
+                });
+                getItems().add(mixStop);
+            } else {
+                MenuItem mixNow = new MenuItem("Mix Now");
+                if(pool != null) {
+                    mixNow.disableProperty().bind(pool.mixingProperty().not());
+                }
+
+                mixNow.setGraphic(getMixGlyph());
+                mixNow.setOnAction(event -> {
+                    hide();
+                    Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(utxoEntry.getWallet());
+                    if(whirlpool != null) {
+                        try {
+                            whirlpool.mix(utxoEntry.getHashIndex());
+                        } catch(WhirlpoolException e) {
+                            AppServices.showErrorDialog("Error mixing UTXO", e.getMessage());
+                        }
+                    }
+                });
+                getItems().add(mixNow);
+            }
+        }
+    }
+}
@@ -0,0 +1,60 @@
+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;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.TilePane;
+import javafx.scene.layout.VBox;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
+    public MnemonicKeystoreDisplayPane(Keystore keystore) {
+        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());
+    }
+
+    protected Node getMnemonicWordsEntry(int numWords) {
+        VBox vBox = new VBox();
+        vBox.setSpacing(10);
+
+        wordsPane = new TilePane();
+        wordsPane.setPrefRows(numWords / 3);
+        wordsPane.setHgap(10);
+        wordsPane.setVgap(10);
+        wordsPane.setOrientation(Orientation.VERTICAL);
+
+        List<String> words = new ArrayList<>();
+        for(int i = 0; i < numWords; i++) {
+            words.add("");
+        }
+
+        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
+        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
+        List<WordEntry> wordEntries = new ArrayList<>(numWords);
+        for(int i = 0; i < numWords; i++) {
+            wordEntries.add(new WordEntry(i, wordEntryList));
+        }
+        for(int i = 0; i < numWords - 1; i++) {
+            wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
+            wordEntries.get(i).setNextField(wordEntries.get(i + 1).getEditor());
+        }
+        wordsPane.getChildren().addAll(wordEntries);
+
+        vBox.getChildren().add(wordsPane);
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(vBox);
+        return stackPane;
+    }
+}
@@ -3,61 +3,48 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
 import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
-import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
-import com.sparrowwallet.sparrow.io.*;
-import javafx.beans.property.SimpleListProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
+import com.sparrowwallet.sparrow.io.ImportException;
+import com.sparrowwallet.sparrow.io.KeystoreMnemonicImport;
 import javafx.geometry.Insets;
-import javafx.geometry.Orientation;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.layout.*;
-import javafx.util.Callback;
-import org.controlsfx.control.textfield.AutoCompletionBinding;
-import org.controlsfx.control.textfield.CustomTextField;
-import org.controlsfx.control.textfield.TextFields;
-import org.controlsfx.glyphfont.Glyph;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import javafx.scene.layout.Region;
+import javafx.scene.layout.StackPane;
 import org.controlsfx.tools.Borders;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.Validator;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;

+import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.Optional;

-public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
+public class MnemonicKeystoreImportPane extends MnemonicKeystorePane {
    protected final Wallet wallet;
    private final KeystoreMnemonicImport importer;

-    private SplitMenuButton enterMnemonicButton;
    private SplitMenuButton importButton;

-    private TilePane wordsPane;
    private Button generateButton;
-    private Label validLabel;
-    private Label invalidLabel;
    private Button calculateButton;
    private Button backButton;
    private Button nextButton;
    private Button confirmButton;
    private List<String> generatedMnemonicCode;

-    private SimpleListProperty<String> wordEntriesProperty;
-    private final SimpleStringProperty passphraseProperty = new SimpleStringProperty();
-
    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer) {
-        super(importer.getName(), "Seed import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        super(importer.getName(), "Create or enter seed", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
        this.wallet = wallet;
        this.importer = importer;

@@ -65,41 +52,6 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        buttonBox.getChildren().add(importButton);
    }

-    public MnemonicKeystoreImportPane(Keystore keystore) {
-        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase enabled" : "Passphrase disabled", "", "image/" + WalletModel.SEED.getType() + ".png");
-        this.wallet = null;
-        this.importer = null;
-        showHideLink.setVisible(false);
-        buttonBox.getChildren().clear();
-
-        showWordList(keystore.getSeed());
-    }
-
-    @Override
-    protected Control createButton() {
-        createEnterMnemonicButton();
-        return enterMnemonicButton;
-    }
-
-    private void createEnterMnemonicButton() {
-        enterMnemonicButton = new SplitMenuButton();
-        enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
-        enterMnemonicButton.setText("Set Words Size");
-        enterMnemonicButton.setOnAction(event -> {
-            enterMnemonic(24);
-        });
-        int[] numberWords = new int[] {24, 21, 18, 15, 12};
-        for(int i = 0; i < numberWords.length; i++) {
-            MenuItem item = new MenuItem(numberWords[i] + " words");
-            final int words = numberWords[i];
-            item.setOnAction(event -> {
-                enterMnemonic(words);
-            });
-            enterMnemonicButton.getItems().add(item);
-        }
-        enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
-    }
-
    private void createImportButton() {
        importButton = new SplitMenuButton();
        importButton.setAlignment(Pos.CENTER_RIGHT);
@@ -109,7 +61,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
            importButton.setDisable(true);
            importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
        });
-        String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
+        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;
        for(int i = 0; i < scriptAccountsLength; i++) {
            MenuItem item = new MenuItem(accounts[i]);
@@ -125,157 +77,95 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        importButton.setVisible(false);
    }

-    private void enterMnemonic(int numWords) {
+    protected void enterMnemonic(int numWords) {
        generatedMnemonicCode = null;
-        setDescription("Enter mnemonic word list");
-        showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(numWords, false));
-        setExpanded(true);
+        super.enterMnemonic(numWords);
    }

-    private Node getMnemonicWordsEntry(int numWords, boolean displayWordsOnly) {
-        VBox vBox = new VBox();
-        vBox.setSpacing(10);
+    protected List<Node> createLeftButtons() {
+        generateButton = new Button("Generate New");
+        generateButton.setOnAction(event -> {
+            generateNew();
+        });
+        generateButton.managedProperty().bind(generateButton.visibleProperty());
+        generateButton.setTooltip(new Tooltip("Generate a unique set of words that provide the seed for your wallet"));

-        wordsPane = new TilePane();
-        wordsPane.setPrefRows(numWords/3);
-        wordsPane.setHgap(10);
-        wordsPane.setVgap(10);
-        wordsPane.setOrientation(Orientation.VERTICAL);
+        return List.of(generateButton);
+    }

-        List<String> words = new ArrayList<>();
-        for(int i = 0; i < numWords; i++) {
-            words.add("");
-        }
+    protected List<Node> createRightButtons() {
+        confirmButton = new Button("Re-enter Words...");
+        confirmButton.setOnAction(event -> {
+            confirmBackup();
+        });
+        confirmButton.managedProperty().bind(confirmButton.visibleProperty());
+        confirmButton.setVisible(false);
+        confirmButton.setDefaultButton(true);
+        confirmButton.setTooltip(new Tooltip("Re-enter the generated word list to confirm your backup is correct"));

-        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
-        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
-        for(int i = 0; i < numWords; i++) {
-            WordEntry wordEntry = new WordEntry(i, wordEntryList);
-            wordsPane.getChildren().add(wordEntry);
-        }
+        calculateButton = new Button("Create Keystore");
+        calculateButton.setDisable(true);
+        calculateButton.setDefaultButton(true);
+        calculateButton.setOnAction(event -> {
+            prepareImport();
+        });
+        calculateButton.managedProperty().bind(calculateButton.visibleProperty());
+        calculateButton.setTooltip(new Tooltip("Create the keystore from the provided word list"));

-        vBox.getChildren().add(wordsPane);
+        backButton = new Button("Back");
+        backButton.setOnAction(event -> {
+            displayMnemonicCode();
+        });
+        backButton.managedProperty().bind(backButton.visibleProperty());
+        backButton.setTooltip(new Tooltip("Go back to the generated word list"));
+        backButton.setVisible(false);

-        if(!displayWordsOnly) {
-            PassphraseEntry passphraseEntry = new PassphraseEntry();
-            passphraseEntry.setPadding(new Insets(0, 26, 10, 10));
-            vBox.getChildren().add(passphraseEntry);
+        nextButton = new Button("Confirm Backup...");
+        nextButton.setOnAction(event -> {
+            confirmRecord();
+        });
+        nextButton.managedProperty().bind(nextButton.visibleProperty());
+        nextButton.setTooltip(new Tooltip("Confirm you have recorded the generated word list"));
+        nextButton.setVisible(false);
+        nextButton.setDefaultButton(true);

-            AnchorPane buttonPane = new AnchorPane();
-            buttonPane.setPadding(new Insets(0, 26, 0, 10));
+        return List.of(backButton, nextButton, confirmButton, calculateButton);
+    }

-            generateButton = new Button("Generate New");
-            generateButton.setOnAction(event -> {
-                generateNew();
-            });
-            generateButton.managedProperty().bind(generateButton.visibleProperty());
-            generateButton.setTooltip(new Tooltip("Generate a unique set of words that provide the seed for your wallet"));
-            buttonPane.getChildren().add(generateButton);
-            AnchorPane.setLeftAnchor(generateButton, 0.0);
-
-            validLabel = new Label("Valid checksum", getValidGlyph());
-            validLabel.setContentDisplay(ContentDisplay.LEFT);
-            validLabel.setGraphicTextGap(5.0);
-            validLabel.managedProperty().bind(validLabel.visibleProperty());
-            validLabel.setVisible(false);
-            buttonPane.getChildren().add(validLabel);
-            AnchorPane.setTopAnchor(validLabel, 5.0);
-            AnchorPane.setLeftAnchor(validLabel, 0.0);
-
-            invalidLabel = new Label("Invalid checksum", getInvalidGlyph());
-            invalidLabel.setContentDisplay(ContentDisplay.LEFT);
-            invalidLabel.setGraphicTextGap(5.0);
-            invalidLabel.managedProperty().bind(invalidLabel.visibleProperty());
-            invalidLabel.setVisible(false);
-            buttonPane.getChildren().add(invalidLabel);
-            AnchorPane.setTopAnchor(invalidLabel, 5.0);
-            AnchorPane.setLeftAnchor(invalidLabel, 0.0);
-
-            confirmButton = new Button("Re-enter Words...");
-            confirmButton.setOnAction(event -> {
-                confirmBackup();
-            });
-            confirmButton.managedProperty().bind(confirmButton.visibleProperty());
-            confirmButton.setVisible(false);
-            confirmButton.setDefaultButton(true);
-            confirmButton.setTooltip(new Tooltip("Re-enter the generated word list to confirm your backup is correct"));
-
-            calculateButton = new Button("Calculate Seed");
-            calculateButton.setDisable(true);
-            calculateButton.setDefaultButton(true);
-            calculateButton.setOnAction(event -> {
-                prepareImport();
-            });
-            calculateButton.managedProperty().bind(calculateButton.visibleProperty());
-            calculateButton.setTooltip(new Tooltip("Calculate the seed from the provided word list"));
-
-            backButton = new Button("Back");
-            backButton.setOnAction(event -> {
-                displayMnemonicCode();
-            });
-            backButton.managedProperty().bind(backButton.visibleProperty());
-            backButton.setTooltip(new Tooltip("Go back to the generated word list"));
-            backButton.setVisible(false);
-
-            nextButton = new Button("Confirm Backup...");
-            nextButton.setOnAction(event -> {
-                confirmRecord();
-            });
-            nextButton.managedProperty().bind(nextButton.visibleProperty());
-            nextButton.setTooltip(new Tooltip("Confirm you have recorded the generated word list"));
-            nextButton.setVisible(false);
-            nextButton.setDefaultButton(true);
-
-            wordEntriesProperty.addListener((ListChangeListener<String>) c -> {
-                boolean empty = true;
-                boolean validWords = true;
-                boolean validChecksum = false;
-                for(String word : wordEntryList) {
-                    if(!word.isEmpty()) {
-                        empty = false;
-                    }
-
-                    if(!WordEntry.isValid(word)) {
-                        validWords = false;
-                    }
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        if(!empty && validWords) {
+            try {
+                importer.getKeystore(wallet.getScriptType().getDefaultDerivation(), wordEntriesProperty.get(), passphraseProperty.get());
+                validChecksum = true;
+            } catch(ImportException e) {
+                if(e.getCause() instanceof MnemonicException.MnemonicTypeException) {
+                    invalidLabel.setText("Unsupported Electrum seed");
+                    invalidLabel.setTooltip(new Tooltip("Seeds created in Electrum do not follow the BIP39 standard. Import the Electrum wallet file directly."));
+                } else {
+                    invalidLabel.setText("Invalid checksum");
+                    invalidLabel.setTooltip(null);
                }
-
-                if(!empty && validWords) {
-                    try {
-                        importer.getKeystore(wallet.getScriptType().getDefaultDerivation(), wordEntriesProperty.get(), passphraseProperty.get());
-                        validChecksum = true;
-                    } catch(ImportException e) {
-                        //ignore
-                    }
-                }
-
-                generateButton.setVisible(empty && generatedMnemonicCode == null);
-                calculateButton.setDisable(!validChecksum);
-                validLabel.setVisible(validChecksum);
-                invalidLabel.setVisible(!validChecksum && !empty);
-            });
-
-            HBox rightBox = new HBox();
-            rightBox.setSpacing(10);
-            rightBox.getChildren().addAll(backButton, nextButton, confirmButton, calculateButton);
-
-            buttonPane.getChildren().add(rightBox);
-            AnchorPane.setRightAnchor(rightBox, 0.0);
-
-            vBox.getChildren().add(buttonPane);
+            }
        }

-        StackPane stackPane = new StackPane();
-        stackPane.getChildren().add(vBox);
-        return stackPane;
+        generateButton.setVisible(empty && generatedMnemonicCode == null);
+        calculateButton.setDisable(!validChecksum);
+        validLabel.setVisible(validChecksum);
+        invalidLabel.setVisible(!validChecksum && !empty);
    }

    private void generateNew() {
        int mnemonicSeedLength = wordEntriesProperty.get().size() * 11;
        int entropyLength = mnemonicSeedLength - (mnemonicSeedLength/33);

-        DeterministicSeed deterministicSeed = new DeterministicSeed(new SecureRandom(), entropyLength, "");
+        SecureRandom secureRandom;
+        try {
+            secureRandom = SecureRandom.getInstanceStrong();
+        } catch(NoSuchAlgorithmException e) {
+            secureRandom = new SecureRandom();
+        }
+
+        DeterministicSeed deterministicSeed = new DeterministicSeed(secureRandom, entropyLength, "");
        generatedMnemonicCode = deterministicSeed.getMnemonicCode();

        displayMnemonicCode();
@@ -312,7 +202,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {

        StackPane wordsPane = (StackPane)getContent();
        StackPane confirmPane = new StackPane();
-        confirmPane.setMaxWidth(300);
+        confirmPane.setMaxWidth(350);
        confirmPane.setMaxHeight(100);
        Region region = new Region();
        region.setMinWidth(confirmPane.getMaxWidth());
@@ -333,7 +223,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
    private void confirmBackup() {
        setDescription("Confirm backup by re-entering words");
        showHideLink.setVisible(false);
-        setContent(getMnemonicWordsEntry(wordEntriesProperty.get().size(), false));
+        setContent(getMnemonicWordsEntry(wordEntriesProperty.get().size()));
        setExpanded(true);
        backButton.setVisible(true);
        generateButton.setVisible(false);
@@ -352,7 +242,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
            importButton.setDisable(false);
            setDescription("Ready to import");
            showHideLink.setText("Show Derivation...");
-            showHideLink.setVisible(true);
+            showHideLink.setVisible(false);
            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
        }
    }
@@ -362,6 +252,14 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        try {
            Keystore keystore = importer.getKeystore(derivation, wordEntriesProperty.get(), passphraseProperty.get());
            if(!dryrun) {
+                if(passphraseProperty.get() != null && !passphraseProperty.get().isEmpty()) {
+                    KeystorePassphraseDialog keystorePassphraseDialog = new KeystorePassphraseDialog(null, keystore, true);
+                    Optional<String> optPassphrase = keystorePassphraseDialog.showAndWait();
+                    if(optPassphrase.isEmpty() || !optPassphrase.get().equals(passphraseProperty.get())) {
+                        throw new ImportException("Re-entered passphrase did not match");
+                    }
+                }
+
                EventManager.get().post(new KeystoreImportEvent(keystore));
            }
            return true;
@@ -372,99 +270,12 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
            } else if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
                errorMessage = e.getCause().getMessage();
            }
-            setError("Import Error", errorMessage);
+            setError("Import Error", errorMessage + ".");
            importButton.setDisable(false);
            return false;
        }
    }

-    private static class WordEntry extends HBox {
-        private static List<String> wordList;
-        private final TextField wordField;
-
-        public WordEntry(int wordNumber, ObservableList<String> wordEntryList) {
-            super();
-            setAlignment(Pos.CENTER_RIGHT);
-
-            setSpacing(10);
-            Label label = new Label((wordNumber+1) + ".");
-            label.setPrefWidth(22);
-            label.setAlignment(Pos.CENTER_RIGHT);
-            wordField = new TextField();
-            wordField.setMaxWidth(100);
-
-            wordList = Bip39MnemonicCode.INSTANCE.getWordList();
-            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));
-            autoCompletionBinding.setDelay(50);
-
-            ValidationSupport validationSupport = new ValidationSupport();
-            validationSupport.registerValidator(wordField, Validator.combine(
-                    Validator.createEmptyValidator("Word is required"),
-                    (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid word", !wordList.contains(newValue))
-            ));
-            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
-
-            wordField.textProperty().addListener((observable, oldValue, newValue) -> {
-                wordEntryList.set(wordNumber, newValue);
-            });
-
-            this.getChildren().addAll(label, wordField);
-        }
-
-        public TextField getEditor() {
-            return wordField;
-        }
-
-        public static boolean isValid(String word) {
-            return wordList.contains(word);
-        }
-    }
-
-    private static class WordlistSuggestionProvider implements Callback<AutoCompletionBinding.ISuggestionRequest, Collection<String>> {
-        private final List<String> wordList;
-
-        public WordlistSuggestionProvider(List<String> wordList) {
-            this.wordList = wordList;
-        }
-
-        @Override
-        public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
-            List<String> suggestions = new ArrayList<>();
-            if(!request.getUserText().isEmpty()) {
-                for(String word : wordList) {
-                    if(word.equals(request.getUserText())) {
-                        return Collections.emptyList();
-                    }
-
-                    if(word.startsWith(request.getUserText())) {
-                        suggestions.add(word);
-                    }
-                }
-            }
-
-            return suggestions;
-        }
-    }
-
-    private class PassphraseEntry extends HBox {
-        public PassphraseEntry() {
-            super();
-
-            setAlignment(Pos.CENTER_LEFT);
-            setSpacing(10);
-            Label passphraseLabel = new Label("Passphrase:");
-            CustomTextField passphraseField = (CustomTextField) TextFields.createClearableTextField();
-            passphraseProperty.bind(passphraseField.textProperty());
-            passphraseField.setPromptText("Leave blank for none");
-
-            HelpLabel helpLabel = new HelpLabel();
-            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!");
-
-            getChildren().addAll(passphraseLabel, passphraseField, helpLabel);
-        }
-    }
-
    private Node getDerivationEntry(List<ChildNumber> derivation) {
        TextField derivationField = new TextField();
        derivationField.setPromptText("Derivation path");
@@ -472,13 +283,14 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        HBox.setHgrow(derivationField, Priority.ALWAYS);

        ValidationSupport validationSupport = new ValidationSupport();
+        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
        validationSupport.registerValidator(derivationField, Validator.combine(
                Validator.createEmptyValidator("Derivation is required"),
                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid derivation", !KeyDerivation.isValid(newValue))
        ));
-        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());

-        Button importDerivationButton = new Button("Import");
+        Button importDerivationButton = new Button("Import Custom Derivation Keystore");
+        importDerivationButton.setDisable(true);
        importDerivationButton.setOnAction(event -> {
            showHideLink.setVisible(true);
            setExpanded(false);
@@ -487,7 +299,8 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        });

        derivationField.textProperty().addListener((observable, oldValue, newValue) -> {
-            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue));
+            importButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || !KeyDerivation.parsePath(newValue).equals(derivation));
+            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || KeyDerivation.parsePath(newValue).equals(derivation));
        });

        HBox contentBox = new HBox();
@@ -500,30 +313,4 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {

        return contentBox;
    }
-
-    private void showWordList(DeterministicSeed seed) {
-        List<String> words = seed.getMnemonicCode();
-        setContent(getMnemonicWordsEntry(words.size(), 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);
-        }
-    }
-
-    public static Glyph getValidGlyph() {
-        Glyph validGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
-        validGlyph.getStyleClass().add("valid-checksum");
-        validGlyph.setFontSize(12);
-        return validGlyph;
-    }
-
-    public static Glyph getInvalidGlyph() {
-        Glyph invalidGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
-        invalidGlyph.getStyleClass().add("invalid-checksum");
-        invalidGlyph.setFontSize(12);
-        return invalidGlyph;
-    }
 }
@@ -0,0 +1,384 @@
+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;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.geometry.Insets;
+import javafx.geometry.Orientation;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.input.Clipboard;
+import javafx.scene.layout.*;
+import javafx.util.Callback;
+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.*;
+
+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 IntegerProperty defaultWordSizeProperty;
+
+    public MnemonicKeystorePane(String title, String description, String content, String imageUrl) {
+        super(title, description, content, imageUrl);
+    }
+
+    @Override
+    protected Control createButton() {
+        createEnterMnemonicButton();
+        return enterMnemonicButton;
+    }
+
+    private void createEnterMnemonicButton() {
+        enterMnemonicButton = new SplitMenuButton();
+        enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
+        enterMnemonicButton.setText("Use 24 Words");
+        defaultWordSizeProperty = new SimpleIntegerProperty(24);
+        defaultWordSizeProperty.addListener((observable, oldValue, newValue) -> {
+            enterMnemonicButton.setText("Use " + newValue + " Words");
+        });
+        enterMnemonicButton.setOnAction(event -> {
+            enterMnemonic(defaultWordSizeProperty.get());
+        });
+        int[] numberWords = new int[] {24, 21, 18, 15, 12};
+        for(int i = 0; i < numberWords.length; i++) {
+            MenuItem item = new MenuItem("Use " + numberWords[i] + " Words");
+            final int words = numberWords[i];
+            item.setOnAction(event -> {
+                defaultWordSizeProperty.set(words);
+                enterMnemonic(words);
+            });
+            enterMnemonicButton.getItems().add(item);
+        }
+        enterMnemonicButton.getItems().add(new SeparatorMenuItem());
+        MenuItem scanItem = new MenuItem("Scan QR...");
+        scanItem.setOnAction(event -> {
+            scanQR();
+        });
+        enterMnemonicButton.getItems().add(scanItem);
+        enterMnemonicButton.managedProperty().bind(enterMnemonicButton.visibleProperty());
+    }
+
+    protected void scanQR() {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        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()));
+        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));
+        setExpanded(true);
+    }
+
+    protected Node getMnemonicWordsEntry(int numWords) {
+        VBox vBox = new VBox();
+        vBox.setSpacing(10);
+
+        wordsPane = new TilePane();
+        wordsPane.setPrefRows(numWords/3);
+        wordsPane.setHgap(10);
+        wordsPane.setVgap(10);
+        wordsPane.setOrientation(Orientation.VERTICAL);
+
+        List<String> words = new ArrayList<>();
+        for(int i = 0; i < numWords; i++) {
+            words.add("");
+        }
+
+        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
+        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
+        List<WordEntry> wordEntries = new ArrayList<>(numWords);
+        for(int i = 0; i < numWords; i++) {
+            wordEntries.add(new WordEntry(i, wordEntryList));
+        }
+        for(int i = 0; i < numWords - 1; i++) {
+            wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
+            wordEntries.get(i).setNextField(wordEntries.get(i + 1).getEditor());
+        }
+        wordsPane.getChildren().addAll(wordEntries);
+
+        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);
+
+        AnchorPane buttonPane = new AnchorPane();
+        buttonPane.setPadding(new Insets(0, 26, 0, 10));
+
+        HBox leftBox = new HBox(10);
+        leftBox.getChildren().addAll(createLeftButtons());
+
+        buttonPane.getChildren().add(leftBox);
+        AnchorPane.setLeftAnchor(leftBox, 0.0);
+
+        validLabel = new Label("Valid checksum", getValidGlyph());
+        validLabel.setContentDisplay(ContentDisplay.LEFT);
+        validLabel.setGraphicTextGap(5.0);
+        validLabel.managedProperty().bind(validLabel.visibleProperty());
+        validLabel.setVisible(false);
+        buttonPane.getChildren().add(validLabel);
+        AnchorPane.setTopAnchor(validLabel, 5.0);
+        AnchorPane.setLeftAnchor(validLabel, 0.0);
+
+        invalidLabel = new Label("Invalid checksum", getInvalidGlyph());
+        invalidLabel.setContentDisplay(ContentDisplay.LEFT);
+        invalidLabel.setGraphicTextGap(5.0);
+        invalidLabel.managedProperty().bind(invalidLabel.visibleProperty());
+        invalidLabel.setVisible(false);
+        buttonPane.getChildren().add(invalidLabel);
+        AnchorPane.setTopAnchor(invalidLabel, 5.0);
+        AnchorPane.setLeftAnchor(invalidLabel, 0.0);
+
+        wordEntriesProperty.addListener((ListChangeListener<String>) c -> {
+            boolean empty = true;
+            boolean validWords = true;
+            boolean validChecksum = false;
+            for(String word : wordEntryList) {
+                if(!word.isEmpty()) {
+                    empty = false;
+                }
+
+                if(!WordEntry.isValid(word)) {
+                    validWords = false;
+                }
+            }
+
+            onWordChange(empty, validWords, validChecksum);
+        });
+
+        HBox rightBox = new HBox();
+        rightBox.setSpacing(10);
+        rightBox.getChildren().addAll(createRightButtons());
+
+        buttonPane.getChildren().add(rightBox);
+        AnchorPane.setRightAnchor(rightBox, 0.0);
+
+        vBox.getChildren().add(buttonPane);
+
+        Platform.runLater(() -> wordEntries.get(0).getEditor().requestFocus());
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(vBox);
+        return stackPane;
+    }
+
+    protected List<Node> createLeftButtons() {
+        return Collections.emptyList();
+    }
+
+    protected List<Node> createRightButtons() {
+        return Collections.emptyList();
+    }
+
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        //nothing by default
+    }
+
+    protected static class WordEntry extends HBox {
+        private static List<String> wordList;
+        private final TextField wordField;
+        private WordEntry nextEntry;
+        private TextField nextField;
+
+        public WordEntry(int wordNumber, ObservableList<String> wordEntryList) {
+            super();
+            setAlignment(Pos.CENTER_RIGHT);
+
+            setSpacing(10);
+            Label label = new Label((wordNumber+1) + ".");
+            label.setPrefWidth(22);
+            label.setAlignment(Pos.CENTER_RIGHT);
+            wordField = new TextField() {
+                @Override
+                public void paste() {
+                    Clipboard clipboard = Clipboard.getSystemClipboard();
+                    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) {
+                            if(entry.nextField != null) {
+                                entry.nextField.requestFocus();
+                            }
+
+                            entry.wordField.setText(word);
+                            entry = entry.nextEntry;
+                            if(entry == null) {
+                                break;
+                            }
+                        }
+                    } else {
+                        super.paste();
+                    }
+                }
+            };
+            wordField.setMaxWidth(100);
+            TextFormatter<?> formatter = new TextFormatter<>((TextFormatter.Change change) -> {
+                String text = change.getText();
+                // if text was added, fix the text to fit the requirements
+                if(!text.isEmpty()) {
+                    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
+                    change.selectRange(carretPos, carretPos);
+                }
+                return change;
+            });
+            wordField.setTextFormatter(formatter);
+
+            wordList = Bip39MnemonicCode.INSTANCE.getWordList();
+            AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));
+            autoCompletionBinding.setDelay(50);
+            autoCompletionBinding.setOnAutoCompleted(event -> {
+                if(nextField != null) {
+                    nextField.requestFocus();
+                }
+            });
+
+            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))
+            ));
+
+            wordField.textProperty().addListener((observable, oldValue, newValue) -> {
+                wordEntryList.set(wordNumber, newValue);
+            });
+
+            this.getChildren().addAll(label, wordField);
+        }
+
+        public TextField getEditor() {
+            return wordField;
+        }
+
+        public void setNextEntry(WordEntry nextEntry) {
+            this.nextEntry = nextEntry;
+        }
+
+        public void setNextField(TextField field) {
+            this.nextField = field;
+        }
+
+        public static boolean isValid(String word) {
+            return wordList.contains(word);
+        }
+    }
+
+    protected static class WordlistSuggestionProvider implements Callback<AutoCompletionBinding.ISuggestionRequest, Collection<String>> {
+        private final List<String> wordList;
+
+        public WordlistSuggestionProvider(List<String> wordList) {
+            this.wordList = wordList;
+        }
+
+        @Override
+        public Collection<String> call(AutoCompletionBinding.ISuggestionRequest request) {
+            List<String> suggestions = new ArrayList<>();
+            if(!request.getUserText().isEmpty()) {
+                for(String word : wordList) {
+                    if(word.startsWith(request.getUserText())) {
+                        suggestions.add(word);
+                    }
+                }
+            }
+
+            return suggestions;
+        }
+    }
+
+    protected class PassphraseEntry extends HBox {
+        private final CustomTextField passphraseField;
+
+        public PassphraseEntry() {
+            super();
+
+            setAlignment(Pos.CENTER_LEFT);
+            setSpacing(10);
+            Label passphraseLabel = new Label("Passphrase:");
+            passphraseField = (CustomTextField) TextFields.createClearableTextField();
+            passphraseProperty.bind(passphraseField.textProperty());
+            passphraseField.setPromptText("Leave blank for none");
+
+            HelpLabel helpLabel = new HelpLabel();
+            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!");
+
+            getChildren().addAll(passphraseLabel, passphraseField, helpLabel);
+        }
+
+        public TextField getEditor() {
+            return passphraseField;
+        }
+    }
+
+    public static Glyph getValidGlyph() {
+        Glyph validGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
+        validGlyph.getStyleClass().add("success");
+        validGlyph.setFontSize(12);
+        return validGlyph;
+    }
+
+    public static Glyph getInvalidGlyph() {
+        Glyph invalidGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+        invalidGlyph.getStyleClass().add("failure");
+        invalidGlyph.setFontSize(12);
+        return invalidGlyph;
+    }
+}
@@ -0,0 +1,220 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+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.ImportException;
+import com.sparrowwallet.sparrow.io.KeystoreMnemonicImport;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
+import javafx.collections.FXCollections;
+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.Region;
+import javafx.util.StringConverter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class MnemonicWalletKeystoreImportPane extends MnemonicKeystorePane {
+    private static final Logger log = LoggerFactory.getLogger(MnemonicWalletKeystoreImportPane.class);
+
+    private final KeystoreMnemonicImport importer;
+
+    private Button discoverButton;
+    private Button importButton;
+
+    public MnemonicWalletKeystoreImportPane(KeystoreMnemonicImport importer) {
+        super(importer.getName(), "Seed import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        this.importer = importer;
+    }
+
+    @Override
+    protected void enterMnemonic(int numWords) {
+        super.enterMnemonic(numWords);
+        setDescription("Enter word list");
+    }
+
+    @Override
+    protected List<Node> createRightButtons() {
+        discoverButton = new Button("Discover Wallet");
+        discoverButton.setDisable(true);
+        discoverButton.setDefaultButton(true);
+        discoverButton.managedProperty().bind(discoverButton.visibleProperty());
+        discoverButton.setOnAction(event -> {
+            discoverWallet();
+        });
+        discoverButton.managedProperty().bind(discoverButton.visibleProperty());
+        discoverButton.setTooltip(new Tooltip("Look for existing transactions from the provided word list"));
+        discoverButton.visibleProperty().bind(AppServices.onlineProperty());
+
+        importButton = new Button("Import Wallet");
+        importButton.setDisable(true);
+        importButton.managedProperty().bind(importButton.visibleProperty());
+        importButton.visibleProperty().bind(discoverButton.visibleProperty().not());
+        importButton.setOnAction(event -> {
+            setContent(getScriptTypeEntry());
+            setExpanded(true);
+        });
+
+        return List.of(discoverButton, importButton);
+    }
+
+    @Override
+    protected void onWordChange(boolean empty, boolean validWords, boolean validChecksum) {
+        if(!empty && validWords) {
+            try {
+                importer.getKeystore(ScriptType.P2WPKH.getDefaultDerivation(), wordEntriesProperty.get(), passphraseProperty.get());
+                validChecksum = true;
+            } catch(ImportException e) {
+                if(e.getCause() instanceof MnemonicException.MnemonicTypeException) {
+                    invalidLabel.setText("Unsupported Electrum seed");
+                    invalidLabel.setTooltip(new Tooltip("Seeds created in Electrum do not follow the BIP39 standard. Import the Electrum wallet file directly."));
+                } else {
+                    invalidLabel.setText("Invalid checksum");
+                    invalidLabel.setTooltip(null);
+                }
+            }
+        }
+
+        discoverButton.setDisable(!validChecksum || !AppServices.isConnected());
+        importButton.setDisable(!validChecksum);
+        validLabel.setVisible(validChecksum);
+        invalidLabel.setVisible(!validChecksum && !empty);
+    }
+
+    private void discoverWallet() {
+        discoverButton.setDisable(true);
+        discoverButton.setMaxHeight(discoverButton.getHeight());
+        ProgressIndicator progressIndicator = new ProgressIndicator(0);
+        progressIndicator.getStyleClass().add("button-progress");
+        discoverButton.setGraphic(progressIndicator);
+        List<Wallet> wallets = new ArrayList<>();
+
+        List<List<ChildNumber>> derivations = ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE).stream().map(ScriptType::getDefaultDerivation).collect(Collectors.toList());
+        derivations.add(List.of(new ChildNumber(0, true)));
+
+        for(ScriptType scriptType : ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE)) {
+            for(List<ChildNumber> derivation : derivations) {
+                try {
+                    Wallet wallet = getWallet(scriptType, derivation);
+                    wallets.add(wallet);
+                } catch(ImportException e) {
+                    String errorMessage = e.getMessage();
+                    if(e.getCause() instanceof MnemonicException.MnemonicChecksumException) {
+                        errorMessage = "Invalid word list - checksum incorrect";
+                    } else if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                        errorMessage = e.getCause().getMessage();
+                    }
+                    setError("Import Error", errorMessage + ".");
+                    discoverButton.setDisable(!AppServices.isConnected());
+                }
+            }
+        }
+
+        ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(wallets);
+        progressIndicator.progressProperty().bind(walletDiscoveryService.progressProperty());
+        walletDiscoveryService.setOnSucceeded(successEvent -> {
+            discoverButton.setGraphic(null);
+            Optional<Wallet> optWallet = walletDiscoveryService.getValue();
+            if(optWallet.isPresent()) {
+                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);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
+                    setContent(getScriptTypeEntry());
+                    setExpanded(true);
+                }
+            }
+        });
+        walletDiscoveryService.setOnFailed(failedEvent -> {
+            discoverButton.setGraphic(null);
+            log.error("Failed to discover wallets", failedEvent.getSource().getException());
+            setError("Failed to discover wallets", failedEvent.getSource().getException().getMessage());
+        });
+        walletDiscoveryService.start();
+    }
+
+    private Wallet getWallet(ScriptType scriptType, List<ChildNumber> derivation) throws ImportException {
+        Wallet wallet = new Wallet("");
+        wallet.setPolicyType(PolicyType.SINGLE);
+        wallet.setScriptType(scriptType);
+        Keystore keystore = importer.getKeystore(derivation, wordEntriesProperty.get(), passphraseProperty.get());
+        wallet.getKeystores().add(keystore);
+        wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, scriptType, wallet.getKeystores(), 1));
+        return wallet;
+    }
+
+    private Node getScriptTypeEntry() {
+        Label label = new Label("Script Type:");
+
+        HBox fieldBox = new HBox(5);
+        fieldBox.setAlignment(Pos.CENTER_RIGHT);
+        ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(ScriptType.getAddressableScriptTypes(PolicyType.SINGLE)));
+        if(scriptTypeComboBox.getItems().contains(ScriptType.P2WPKH)) {
+            scriptTypeComboBox.setValue(ScriptType.P2WPKH);
+        }
+        scriptTypeComboBox.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return null;
+            }
+        });
+        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.");
+        fieldBox.getChildren().addAll(scriptTypeComboBox, helpLabel);
+
+        Region region = new Region();
+        HBox.setHgrow(region, Priority.SOMETIMES);
+
+        Button importMnemonicButton = new Button("Import");
+        importMnemonicButton.setOnAction(event -> {
+            showHideLink.setVisible(true);
+            setExpanded(false);
+            try {
+                ScriptType scriptType = scriptTypeComboBox.getValue();
+                Wallet wallet = getWallet(scriptType, scriptType.getDefaultDerivation());
+                EventManager.get().post(new WalletImportEvent(wallet));
+            } catch(ImportException e) {
+                log.error("Error importing mnemonic", e);
+                String errorMessage = e.getMessage();
+                if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                    errorMessage = e.getCause().getMessage();
+                }
+                setError("Import Error", errorMessage);
+                importButton.setDisable(false);
+            }
+        });
+
+        HBox contentBox = new HBox();
+        contentBox.setAlignment(Pos.CENTER_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().addAll(label, fieldBox, region, importMnemonicButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefHeight(60);
+
+        return contentBox;
+    }
+}
@@ -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);
+        }
+    }
+}
@@ -0,0 +1,147 @@
+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;
+import javafx.concurrent.Task;
+import javafx.scene.image.Image;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.shape.Circle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PayNymAvatar extends StackPane {
+    private static final Logger log = LoggerFactory.getLogger(PayNymAvatar.class);
+
+    private final ObjectProperty<PaymentCode> paymentCodeProperty = new SimpleObjectProperty<>(null);
+
+    private static final Map<String, Image> paymentCodeCache = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<String, Object> paymentCodeLoading = Collections.synchronizedMap(new HashMap<>());
+
+    public PayNymAvatar() {
+        super();
+
+        paymentCodeProperty.addListener((observable, oldValue, paymentCode) -> {
+            if(paymentCode == null) {
+                getChildren().clear();
+            } else if(Config.get().isUsePayNym() && (oldValue == null || !oldValue.toString().equals(paymentCode.toString()))) {
+                String cacheId = getCacheId(paymentCode, getPrefWidth());
+                if(paymentCodeCache.containsKey(cacheId)) {
+                    setImage(paymentCodeCache.get(cacheId));
+                } else if(AppServices.isConnected()) {
+                    PayNymAvatarService payNymAvatarService = new PayNymAvatarService(paymentCode, getPrefWidth());
+                    payNymAvatarService.setOnRunning(runningEvent -> {
+                        getChildren().clear();
+                    });
+                    payNymAvatarService.setOnSucceeded(successEvent -> {
+                        setImage(payNymAvatarService.getValue());
+                    });
+                    payNymAvatarService.setOnFailed(failedEvent -> {
+                        log.debug("Error loading PayNym avatar", failedEvent.getSource().getException());
+                    });
+                    payNymAvatarService.start();
+                }
+            }
+        });
+    }
+
+    private void setImage(Image image) {
+        getChildren().clear();
+        Circle circle = new Circle(getPrefWidth() / 2,getPrefHeight() / 2,getPrefWidth() / 2);
+        circle.setFill(new ImagePattern(image));
+        getChildren().add(circle);
+    }
+
+    public PaymentCode getPaymentCode() {
+        return paymentCodeProperty.get();
+    }
+
+    public ObjectProperty<PaymentCode> paymentCodeProperty() {
+        return paymentCodeProperty;
+    }
+
+    public void setPaymentCode(PaymentCode paymentCode) {
+        this.paymentCodeProperty.set(paymentCode);
+    }
+
+    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
+        setPaymentCode(PaymentCode.fromString(paymentCode.toString()));
+    }
+
+    public void clearPaymentCode() {
+        this.paymentCodeProperty.set(null);
+    }
+
+    private static String getCacheId(PaymentCode paymentCode, double width) {
+        return paymentCode.toString();
+    }
+
+    private static class PayNymAvatarService extends Service<Image> {
+        private final PaymentCode paymentCode;
+        private final double width;
+
+        public PayNymAvatarService(PaymentCode paymentCode, double width) {
+            this.paymentCode = paymentCode;
+            this.width = width;
+        }
+
+        @Override
+        protected Task<Image> createTask() {
+            return new Task<>() {
+                @Override
+                protected Image call() throws Exception {
+                    String paymentCodeStr = paymentCode.toString();
+                    String cacheId = getCacheId(paymentCode, width);
+
+                    Object lock = paymentCodeLoading.get(cacheId);
+                    if(lock != null) {
+                        synchronized(lock) {
+                            if(paymentCodeCache.containsKey(cacheId)) {
+                                return paymentCodeCache.get(cacheId);
+                            }
+                        }
+                    } else {
+                        lock = new Object();
+                        paymentCodeLoading.put(cacheId, lock);
+                    }
+
+                    synchronized(lock) {
+                        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);
+                            throw e;
+                        } finally {
+                            lock.notifyAll();
+                        }
+                    }
+                }
+            };
+        }
+    }
+}
--- a/Show More
+++ b/Show More