diff --git a/tests/snapshots/nanos/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00010.png b/tests/snapshots/nanos/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00010.png
deleted file mode 100644
index 0ac6557b0..000000000
Binary files a/tests/snapshots/nanos/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00010.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00011.png b/tests/snapshots/nanos/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00011.png
deleted file mode 100644
index 66c411c2e..000000000
Binary files a/tests/snapshots/nanos/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00011.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00000.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00000.png
deleted file mode 100644
index 64cd242c3..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00001.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00001.png
deleted file mode 100644
index 55041b434..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00002.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00002.png
deleted file mode 100644
index 4c71b7457..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00003.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00003.png
deleted file mode 100644
index 650c707b2..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00004.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00004.png
deleted file mode 100644
index a25a822b6..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00005.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00005.png
deleted file mode 100644
index b7451681c..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00006.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00006.png
deleted file mode 100644
index aac554996..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00007.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00007.png
deleted file mode 100644
index 7a1592a3e..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00008.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00008.png
deleted file mode 100644
index 66c411c2e..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_1_0/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00000.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00000.png
deleted file mode 100644
index 3ff7ed563..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00001.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00001.png
deleted file mode 100644
index 16270bf06..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00002.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00002.png
deleted file mode 100644
index bed037356..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00003.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00003.png
deleted file mode 100644
index cc2dcc1a1..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00004.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00004.png
deleted file mode 100644
index 5435cba82..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00004.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00005.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00005.png
deleted file mode 100644
index 04baf13de..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00005.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00006.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00006.png
deleted file mode 100644
index eddf09893..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00007.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00007.png
deleted file mode 100644
index 48014581c..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00008.png b/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00008.png
deleted file mode 100644
index 66c411c2e..000000000
Binary files a/tests/snapshots/nanos/test_register_wallet_invalid_pubkey_version_2_0/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_0/00005.png b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_0/00005.png b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_0/00005.png b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00000.png b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00001.png b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00002.png b/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_all_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_all_input_modified_0_0/00005.png b/tests/snapshots/nanos/test_sighash_all_input_modified_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_input_modified_0_0/00005.png and b/tests/snapshots/nanos/test_sighash_all_input_modified_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00000.png b/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00000.png and b/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00001.png b/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00001.png and b/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00002.png b/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_all_input_modified_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_all_output_modified_0_0/00005.png b/tests/snapshots/nanos/test_sighash_all_output_modified_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_output_modified_0_0/00005.png and b/tests/snapshots/nanos/test_sighash_all_output_modified_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00000.png b/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00000.png and b/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00001.png b/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00001.png and b/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00002.png b/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_all_output_modified_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_0/00005.png b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_0/00005.png and b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00000.png b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00000.png and b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00001.png b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00001.png and b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00002.png b/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_all_sign_psbt_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_0/00005.png b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_0/00005.png b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_0/00005.png b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00000.png b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00001.png b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00002.png b/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_none_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_none_input_modified_1_0/00005.png b/tests/snapshots/nanos/test_sighash_none_input_modified_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_input_modified_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_none_input_modified_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00000.png b/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00001.png b/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00002.png b/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_none_input_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_none_output_modified_1_0/00005.png b/tests/snapshots/nanos/test_sighash_none_output_modified_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_output_modified_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_none_output_modified_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00000.png b/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00001.png b/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00002.png b/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_none_output_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_0/00005.png b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00000.png b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00001.png b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00002.png b/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_none_sign_psbt_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_0_0/00004.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_0_0/00004.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00000.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00000.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00001.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00001.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00002.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_1_0/00004.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_1_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_1_0/00004.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_1_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00000.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00000.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00001.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00001.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00002.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash2_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_1_0/00004.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_1_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_1_0/00004.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_1_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00000.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00000.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00001.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00001.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00002.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash3_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_1_0/00004.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_1_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_1_0/00004.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_1_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00000.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00000.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00001.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00001.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00002.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash81_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_1_0/00004.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_1_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_1_0/00004.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_1_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00000.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00000.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00001.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00001.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00002.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash82_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_1_0/00004.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_1_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_1_0/00004.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_1_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00000.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00000.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00001.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00001.png and b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00002.png b/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_segwitv0_sighash83_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_input_modified_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_input_modified_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_input_modified_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_input_modified_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_input_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_output_different_index_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00000.png
index 50d6e47ab..13ac88e55 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00001.png
index 2af22f7ca..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_output_same_index_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_0/00005.png b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_0/00005.png and b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00000.png b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00000.png and b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00001.png b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00001.png and b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00002.png b/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_single_sign_psbt_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_0_0/00005.png b/tests/snapshots/nanos/test_sighash_unsupported_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_0_0/00005.png and b/tests/snapshots/nanos/test_sighash_unsupported_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_0_1/00000.png b/tests/snapshots/nanos/test_sighash_unsupported_0_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_0_1/00000.png and b/tests/snapshots/nanos/test_sighash_unsupported_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_0_1/00001.png b/tests/snapshots/nanos/test_sighash_unsupported_0_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_0_1/00001.png and b/tests/snapshots/nanos/test_sighash_unsupported_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_0_1/00002.png b/tests/snapshots/nanos/test_sighash_unsupported_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_0/00005.png b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_0/00005.png and b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00000.png b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00000.png
index 50d6e47ab..63bc77614 100644
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00000.png and b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00001.png b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00001.png
index ed018049a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00001.png and b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00002.png b/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sighash_unsupported_for_segwitv0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00003.png b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00003.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00003.png and b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00003.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png
index 50d6e47ab..00cb376b9 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png
index 8b23dab0d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_highfee_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_highfee_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_highfee_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_highfee_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00000.png
index 50d6e47ab..368c431be 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00001.png
index 72ec9ac5a..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_highfee_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_0_0/00003.png b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_0_0/00003.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_0_0/00003.png and b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_0_0/00003.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00000.png
index 50d6e47ab..1c4947d5a 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00001.png
index 584742322..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_miniscript_multikey_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_0_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_0_0/00002.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_0_0/00002.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00000.png
index 50d6e47ab..150191ed9 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00001.png
index 5b902a479..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png
index 50d6e47ab..150191ed9 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png
index 5b902a479..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_0_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_0_0/00002.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_0_0/00002.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00000.png
index 50d6e47ab..3a5ef5f56 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00001.png
index 0a63fc98e..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_0_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_0_0/00002.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_0_0/00002.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_0_0/00002.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00000.png
index 50d6e47ab..3a5ef5f56 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00001.png
index 0a63fc98e..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_multisig_wsh_v1_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00000.png
index 50d6e47ab..b744c60a2 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00001.png
index a1dd97a9d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png
index 50d6e47ab..b744c60a2 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png
index a1dd97a9d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png
index 50d6e47ab..274a5c125 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png
index 7ba086f8f..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png
index 50d6e47ab..274a5c125 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png
index 7ba086f8f..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png
index 50d6e47ab..274a5c125 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png
index 7ba086f8f..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png
index 50d6e47ab..274a5c125 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png
index 7ba086f8f..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png
index 50d6e47ab..12073c912 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png
index 8c6093506..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png
index 50d6e47ab..12073c912 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png
index 8c6093506..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png
index 50d6e47ab..9333a4225 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png
index 8bcd6e61d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png
index 50d6e47ab..62cb4623c 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png
index 82d0ff395..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png
index 50d6e47ab..62cb4623c 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png
index 82d0ff395..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png
index 50d6e47ab..62cb4623c 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png
index 82d0ff395..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png
index 50d6e47ab..57a28b5d5 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png
index f3c2f880f..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png
index 50d6e47ab..57a28b5d5 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png
index f3c2f880f..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png
index 1c9156c31..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png and b/tests/snapshots/nanos/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png
index 50d6e47ab..5a885f5e6 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png
index 4dbd457a6..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png
index 50d6e47ab..5a885f5e6 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png
index 4dbd457a6..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png
index 50d6e47ab..5a885f5e6 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png
index 4dbd457a6..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00000.png
index 50d6e47ab..5a885f5e6 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00001.png
index 4dbd457a6..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_taproot_1to2_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_0_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_0_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_0_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_0_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png
index 50d6e47ab..c8ee3a900 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png
index 9ff3e0238..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_2_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_2_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_2_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_2_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_3_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_3_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_3_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_3_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_4_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_4_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_4_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_4_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00000.png
index 50d6e47ab..142b6bd02 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00001.png
index 7a5c5796d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_0_5_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_2_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_2_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_2_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_2_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_3_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_3_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_3_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_3_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00000.png
index 50d6e47ab..142b6bd02 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00001.png
index 7a5c5796d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_1_4_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_1_0/00005.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_1_0/00005.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_1_0/00005.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_1_0/00005.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_2_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_2_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_2_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_2_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_3_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_3_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_3_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_3_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_0/00004.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_0/00004.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_0/00004.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_0/00004.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00000.png
index 50d6e47ab..142b6bd02 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00001.png
index 7a5c5796d..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_external_inputs_2_4_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_0_0/00003.png b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_0_0/00003.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_0_0/00003.png and b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_0_0/00003.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00000.png
index 50d6e47ab..d959f7e4a 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00001.png
index 51e92ae30..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_naked_opreturn_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_0_0/00011.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_0_0/00011.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_0_0/00011.png and b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_0_0/00011.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00000.png
index 50d6e47ab..d959f7e4a 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00001.png
index 51e92ae30..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_0_0/00011.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_0_0/00011.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_0_0/00011.png and b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_0_0/00011.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00000.png
index 50d6e47ab..d959f7e4a 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00001.png
index 51e92ae30..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_opreturn_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00000.png
index 50d6e47ab..c947508d7 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00001.png
index 6330ad3b6..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_0/00006.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_0/00006.png
index 66c411c2e..12b06a78e 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_0/00006.png and b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_0/00006.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png
index 50d6e47ab..c947508d7 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png and b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png
index 6330ad3b6..9ccdcd1f0 100644
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png and b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png b/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png
deleted file mode 100644
index 1c9156c31..000000000
Binary files a/tests/snapshots/nanos/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00000.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00000.png
deleted file mode 100644
index 915ae0921..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00001.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00001.png
deleted file mode 100644
index 3bc200d4c..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00002.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00002.png
deleted file mode 100644
index 370bc50fa..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00003.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00003.png
deleted file mode 100644
index 53ae65195..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_1_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00000.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00000.png
deleted file mode 100644
index 94066967e..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00001.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00001.png
deleted file mode 100644
index f3f350a36..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00002.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00002.png
deleted file mode 100644
index 07df4915d..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00003.png b/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00003.png
deleted file mode 100644
index 53ae65195..000000000
Binary files a/tests/snapshots/nanosp/test_register_wallet_invalid_pubkey_version_2_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_all_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_0/00003.png b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_0/00003.png and b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00000.png b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00000.png and b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00001.png b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00001.png and b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00002.png b/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_all_input_modified_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_0/00003.png b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_0/00003.png and b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00000.png b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00000.png and b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00001.png b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00001.png and b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00002.png b/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_all_output_modified_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_0/00003.png b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_0/00003.png and b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00000.png b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00000.png and b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00001.png b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00001.png and b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00002.png b/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_all_sign_psbt_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_none_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_none_input_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_none_output_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_none_sign_psbt_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_0_0/00003.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_0_0/00003.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00000.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00000.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00001.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00001.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00002.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00000.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00000.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00001.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00001.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00002.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash2_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00000.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00000.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00001.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00001.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00002.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash3_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00000.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00000.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00001.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00001.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00002.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash81_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00000.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00000.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00001.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00001.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00002.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash82_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00000.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00000.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00001.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00001.png and b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00002.png b/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_segwitv0_sighash83_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_input_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_different_index_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_output_same_index_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_0/00003.png b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_0/00003.png and b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00000.png b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00000.png and b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00001.png b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00001.png and b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00002.png b/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_single_sign_psbt_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_0_0/00003.png b/tests/snapshots/nanosp/test_sighash_unsupported_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_0_0/00003.png and b/tests/snapshots/nanosp/test_sighash_unsupported_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00000.png b/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00000.png and b/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00001.png b/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00001.png and b/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00002.png b/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_0/00003.png b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_0/00003.png and b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00000.png b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00000.png and b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00001.png b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00001.png and b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00002.png b/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sighash_unsupported_for_segwitv0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png
index ffdae22ce..1562d40df 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png
index 421dfebce..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_highfee_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_highfee_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_highfee_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_highfee_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00000.png
index ffdae22ce..7a139ba8e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00001.png
index 0a5b3ed3c..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_highfee_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00000.png
index ffdae22ce..184d002d4 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00001.png
index 312ef94eb..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_miniscript_multikey_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00000.png
index ffdae22ce..78a269ed2 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00001.png
index 9711df4e1..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png
index ffdae22ce..78a269ed2 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png
index 9711df4e1..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00000.png
index ffdae22ce..73bcd7be8 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00001.png
index e28e418f7..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00000.png
index ffdae22ce..73bcd7be8 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00001.png
index e28e418f7..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_multisig_wsh_v1_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00000.png
index ffdae22ce..905cdba55 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00001.png
index 42088ca1d..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png
index ffdae22ce..905cdba55 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png
index 42088ca1d..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png
index ffdae22ce..f71b3a662 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png
index 0a11ccdf7..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png
index ffdae22ce..f71b3a662 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png
index 0a11ccdf7..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png
index ffdae22ce..7a3d318ff 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png
index 53d797266..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png
index ffdae22ce..7a3d318ff 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png
index 53d797266..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png
index ffdae22ce..7a3d318ff 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png
index 53d797266..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png
index ffdae22ce..25f4bd2ba 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png
index bf03a0f93..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png
index ffdae22ce..25f4bd2ba 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png
index bf03a0f93..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png
index 570ce28d5..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_taproot_1to2_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png and b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png
index ffdae22ce..6af6144d6 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png
index 624b4ad05..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_2_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_2_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_2_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_2_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_3_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_3_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_3_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_3_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_4_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_4_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_4_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_4_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00000.png
index ffdae22ce..223063c8a 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00001.png
index f62193def..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_0_5_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_2_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_2_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_2_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_2_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_3_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_3_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_3_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_3_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00000.png
index ffdae22ce..223063c8a 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00001.png
index f62193def..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_1_4_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_1_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_1_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_1_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_2_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_2_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_2_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_2_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_3_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_3_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_3_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_3_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00000.png
index ffdae22ce..223063c8a 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00001.png
index f62193def..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_external_inputs_2_4_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_0_0/00003.png b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_0_0/00003.png and b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_0_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00000.png
index ffdae22ce..80f6eb6a4 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00001.png
index e5a41b927..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_naked_opreturn_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_0_0/00005.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_0_0/00005.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_0_0/00005.png and b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_0_0/00005.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00000.png
index ffdae22ce..80f6eb6a4 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00001.png
index e5a41b927..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_0_0/00005.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_0_0/00005.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_0_0/00005.png and b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_0_0/00005.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00000.png
index ffdae22ce..80f6eb6a4 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00001.png
index e5a41b927..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_opreturn_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00000.png
index ffdae22ce..cc1210f5c 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00001.png
index 311426246..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png and b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png
index ffdae22ce..cc1210f5c 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png and b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png
index 311426246..1366e8dae 100644
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png and b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png b/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanosp/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00000.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00000.png
deleted file mode 100644
index 915ae0921..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00001.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00001.png
deleted file mode 100644
index 3bc200d4c..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00002.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00002.png
deleted file mode 100644
index 370bc50fa..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00003.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00003.png
deleted file mode 100644
index 53ae65195..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_1_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00000.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00000.png
deleted file mode 100644
index 94066967e..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00001.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00001.png
deleted file mode 100644
index f3f350a36..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00002.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00002.png
deleted file mode 100644
index 07df4915d..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00003.png b/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00003.png
deleted file mode 100644
index 53ae65195..000000000
Binary files a/tests/snapshots/nanox/test_register_wallet_invalid_pubkey_version_2_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_0/00003.png b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_0/00003.png b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_0/00003.png b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00000.png b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00001.png b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00002.png b/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_all_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_all_input_modified_0_0/00003.png b/tests/snapshots/nanox/test_sighash_all_input_modified_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_input_modified_0_0/00003.png and b/tests/snapshots/nanox/test_sighash_all_input_modified_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00000.png b/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00000.png and b/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00001.png b/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00001.png and b/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00002.png b/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_all_input_modified_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_all_output_modified_0_0/00003.png b/tests/snapshots/nanox/test_sighash_all_output_modified_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_output_modified_0_0/00003.png and b/tests/snapshots/nanox/test_sighash_all_output_modified_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00000.png b/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00000.png and b/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00001.png b/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00001.png and b/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00002.png b/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_all_output_modified_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_0/00003.png b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_0/00003.png and b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00000.png b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00000.png and b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00001.png b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00001.png and b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00002.png b/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_all_sign_psbt_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_0/00003.png b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_0/00003.png b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_0/00003.png b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00000.png b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00001.png b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00002.png b/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_none_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_none_input_modified_1_0/00003.png b/tests/snapshots/nanox/test_sighash_none_input_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_input_modified_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_none_input_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00000.png b/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00001.png b/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00002.png b/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_none_input_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_none_output_modified_1_0/00003.png b/tests/snapshots/nanox/test_sighash_none_output_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_output_modified_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_none_output_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00000.png b/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00001.png b/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00002.png b/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_none_output_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_0/00003.png b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00000.png b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00001.png b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00002.png b/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_none_sign_psbt_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_0_0/00003.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_0_0/00003.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00000.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00000.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00001.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00001.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00002.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_1_0/00003.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00000.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00000.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00001.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00001.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00002.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash2_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_1_0/00003.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00000.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00000.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00001.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00001.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00002.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash3_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_1_0/00003.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00000.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00000.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00001.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00001.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00002.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash81_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_1_0/00003.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00000.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00000.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00001.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00001.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00002.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash82_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_1_0/00003.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00000.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00000.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00001.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00001.png and b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00002.png b/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_segwitv0_sighash83_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_input_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_output_changed_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_anyone_sign_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_input_modified_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_input_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_input_modified_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_input_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_input_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_output_different_index_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00000.png
index ffdae22ce..4033d25ff 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00001.png
index a84aced09..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_output_same_index_modified_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_0/00003.png b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_0/00003.png and b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00000.png b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00000.png and b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00001.png b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00001.png and b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00002.png b/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_single_sign_psbt_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_0_0/00003.png b/tests/snapshots/nanox/test_sighash_unsupported_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_0_0/00003.png and b/tests/snapshots/nanox/test_sighash_unsupported_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_0_1/00000.png b/tests/snapshots/nanox/test_sighash_unsupported_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_0_1/00000.png and b/tests/snapshots/nanox/test_sighash_unsupported_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_0_1/00001.png b/tests/snapshots/nanox/test_sighash_unsupported_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_0_1/00001.png and b/tests/snapshots/nanox/test_sighash_unsupported_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_0_1/00002.png b/tests/snapshots/nanox/test_sighash_unsupported_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_0/00003.png b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_0/00003.png and b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00000.png b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00000.png
index ffdae22ce..937df53d4 100644
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00000.png and b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00001.png b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00001.png
index 3d1922e56..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00001.png and b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00002.png b/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sighash_unsupported_for_segwitv0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png
index ffdae22ce..1562d40df 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png
index 421dfebce..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_against_wrong_tapleaf_hash_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_highfee_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_highfee_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_highfee_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_highfee_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00000.png
index ffdae22ce..7a139ba8e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00001.png
index 0a5b3ed3c..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_highfee_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00000.png
index ffdae22ce..184d002d4 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00001.png
index 312ef94eb..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_miniscript_multikey_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00000.png
index ffdae22ce..78a269ed2 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00001.png
index 9711df4e1..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png
index ffdae22ce..78a269ed2 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png
index 9711df4e1..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00000.png
index ffdae22ce..73bcd7be8 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00001.png
index e28e418f7..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00000.png
index ffdae22ce..73bcd7be8 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00001.png
index e28e418f7..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_multisig_wsh_v1_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00000.png
index ffdae22ce..905cdba55 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00001.png
index 42088ca1d..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png
index ffdae22ce..905cdba55 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png
index 42088ca1d..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_large_amount_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png
index ffdae22ce..70f4c453d 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png
index cc9e51b57..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_pkh_1to1_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png
index ffdae22ce..f71b3a662 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png
index 0a11ccdf7..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png
index ffdae22ce..f71b3a662 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png
index 0a11ccdf7..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png
index ffdae22ce..97499543f 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png
index 180698115..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png
index ffdae22ce..7a3d318ff 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png
index 53d797266..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png
index ffdae22ce..7a3d318ff 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png
index 53d797266..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png
index ffdae22ce..7a3d318ff 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png
index 53d797266..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_2to2_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png
index ffdae22ce..25f4bd2ba 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png
index bf03a0f93..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png
index ffdae22ce..25f4bd2ba 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png
index bf03a0f93..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_4to3_v1_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png
index 570ce28d5..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_all_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_0_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_sighash_default_1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00000.png
index ffdae22ce..43fdfdd3c 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00001.png
index cba3ca488..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_taproot_1to2_v1_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png and b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png
index ffdae22ce..6af6144d6 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png
index 624b4ad05..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_tr_script_pk_sighash_all_1_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_2_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_2_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_2_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_2_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_3_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_3_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_3_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_3_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_4_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_4_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_4_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_4_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00000.png
index ffdae22ce..223063c8a 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00001.png
index f62193def..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_0_5_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_2_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_2_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_2_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_2_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_3_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_3_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_3_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_3_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00000.png
index ffdae22ce..223063c8a 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00001.png
index f62193def..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_1_4_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_1_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_1_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_1_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_1_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_2_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_2_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_2_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_2_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_3_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_3_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_3_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_3_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00000.png
index ffdae22ce..223063c8a 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00001.png
index f62193def..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_external_inputs_2_4_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_0_0/00003.png b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_0_0/00003.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_0_0/00003.png and b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_0_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00000.png
index ffdae22ce..80f6eb6a4 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00001.png
index e5a41b927..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_naked_opreturn_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_0_0/00005.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_0_0/00005.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_0_0/00005.png and b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_0_0/00005.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00000.png
index ffdae22ce..80f6eb6a4 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00001.png
index e5a41b927..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_0_0/00005.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_0_0/00005.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_0_0/00005.png and b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_0_0/00005.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00000.png
index ffdae22ce..80f6eb6a4 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00001.png
index e5a41b927..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_opreturn_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00000.png
index ffdae22ce..cc1210f5c 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00001.png
index 311426246..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_0_1/00002.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png
index 53ae65195..adea5145e 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png and b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png
index ffdae22ce..cc1210f5c 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png and b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png
index 311426246..1366e8dae 100644
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png and b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png b/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png
deleted file mode 100644
index 570ce28d5..000000000
Binary files a/tests/snapshots/nanox/test_sign_psbt_with_segwit_v16_v1_0_1/00002.png and /dev/null differ