diff --git a/tests/snapshots/flex/test_dashboard/00000.png b/tests/snapshots/flex/test_dashboard/00000.png
new file mode 100644
index 000000000..5250af4d9
Binary files /dev/null and b/tests/snapshots/flex/test_dashboard/00000.png differ
diff --git a/tests/snapshots/flex/test_dashboard/00001.png b/tests/snapshots/flex/test_dashboard/00001.png
new file mode 100644
index 000000000..af8481dc9
Binary files /dev/null and b/tests/snapshots/flex/test_dashboard/00001.png differ
diff --git a/tests/snapshots/flex/test_dashboard/00002.png b/tests/snapshots/flex/test_dashboard/00002.png
new file mode 100644
index 000000000..5250af4d9
Binary files /dev/null and b/tests/snapshots/flex/test_dashboard/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00000.png
new file mode 100644
index 000000000..572a6b90f
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00001.png
new file mode 100644
index 000000000..b8270024b
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00002.png
new file mode 100644
index 000000000..315b8ad18
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00003.png
new file mode 100644
index 000000000..ec89a977b
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00004.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00004.png
new file mode 100644
index 000000000..776019652
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_0/00004.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00000.png
new file mode 100644
index 000000000..572a6b90f
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00001.png
new file mode 100644
index 000000000..b8270024b
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00002.png
new file mode 100644
index 000000000..c4db99e15
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00003.png
new file mode 100644
index 000000000..a37d9a377
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00004.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00004.png
new file mode 100644
index 000000000..776019652
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_0_0/00004.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png
new file mode 100644
index 000000000..572a6b90f
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png
new file mode 100644
index 000000000..0f8bd095f
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png
new file mode 100644
index 000000000..dfe4ada1b
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png
new file mode 100644
index 000000000..670198f69
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png
new file mode 100644
index 000000000..7883480ca
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png
new file mode 100644
index 000000000..5dd2e6b7c
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png
new file mode 100644
index 000000000..866b59dfe
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png
new file mode 100644
index 000000000..dea762b1b
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png
new file mode 100644
index 000000000..094172a39
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png
new file mode 100644
index 000000000..e23d3a391
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png
new file mode 100644
index 000000000..b4bfb711a
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png
new file mode 100644
index 000000000..93eeedc41
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png
new file mode 100644
index 000000000..cd9d18d0c
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png
new file mode 100644
index 000000000..2ced974f5
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png
new file mode 100644
index 000000000..5f37d6e75
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png
new file mode 100644
index 000000000..8f46c3b76
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png
new file mode 100644
index 000000000..e73d7fa05
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_1/00000.png b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_1/00000.png
new file mode 100644
index 000000000..3e6952a36
Binary files /dev/null and b/tests/snapshots/flex/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png
new file mode 100644
index 000000000..112cbc35b
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png
new file mode 100644
index 000000000..c16a92793
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png
new file mode 100644
index 000000000..de3efda0e
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_1/00000.png b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_1/00000.png
new file mode 100644
index 000000000..4321e6018
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_multisig_legacy_v1_ui_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png
new file mode 100644
index 000000000..bb9bc14f7
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png
new file mode 100644
index 000000000..4da45ae31
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_1/00000.png b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_1/00000.png
new file mode 100644
index 000000000..4321e6018
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png
new file mode 100644
index 000000000..bb9bc14f7
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png
new file mode 100644
index 000000000..3ca0fc2c0
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_1/00000.png b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_1/00000.png
new file mode 100644
index 000000000..4321e6018
Binary files /dev/null and b/tests/snapshots/flex/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00000.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00000.png
new file mode 100644
index 000000000..db082dbd9
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00001.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00001.png
new file mode 100644
index 000000000..15cc2fbed
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png
new file mode 100644
index 000000000..06f74a98b
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00003.png b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00003.png
new file mode 100644
index 000000000..77972ecf0
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_0_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00000.png b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00001.png b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00001.png
new file mode 100644
index 000000000..6d292e546
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00002.png
new file mode 100644
index 000000000..56c30b1db
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00003.png b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00000.png b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00001.png b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00001.png
new file mode 100644
index 000000000..9a327076d
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00002.png
new file mode 100644
index 000000000..c1c7747d1
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00003.png b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00000.png b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00001.png b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00001.png
new file mode 100644
index 000000000..b3604ac61
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00002.png b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00002.png
new file mode 100644
index 000000000..7097ab019
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00003.png b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_miniscript_long_policy_3_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png
new file mode 100644
index 000000000..11a7ae48c
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png
new file mode 100644
index 000000000..6d292e546
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png
new file mode 100644
index 000000000..5a9765900
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png
new file mode 100644
index 000000000..ecb0395f3
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png
new file mode 100644
index 000000000..6d292e546
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png
new file mode 100644
index 000000000..5a9765900
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png
new file mode 100644
index 000000000..af6d80203
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png
new file mode 100644
index 000000000..6d292e546
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png
new file mode 100644
index 000000000..5a9765900
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png
new file mode 100644
index 000000000..38f09e33e
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png
new file mode 100644
index 000000000..6d292e546
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png
new file mode 100644
index 000000000..5a9765900
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00001.png
new file mode 100644
index 000000000..7683322c6
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00002.png
new file mode 100644
index 000000000..c3108faaf
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00002.png
new file mode 100644
index 000000000..a2ef1e368
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00001.png
new file mode 100644
index 000000000..76a4e481f
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00002.png
new file mode 100644
index 000000000..0842765e8
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00002.png
new file mode 100644
index 000000000..e84d41a15
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_legacy_v1_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00001.png
new file mode 100644
index 000000000..63bcedb5e
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00002.png
new file mode 100644
index 000000000..52c7e0199
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00002.png
new file mode 100644
index 000000000..8aea267d0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00001.png
new file mode 100644
index 000000000..917aae73d
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00002.png
new file mode 100644
index 000000000..5e9eea659
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00002.png
new file mode 100644
index 000000000..16e2e8511
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_sh_wit_v1_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00001.png
new file mode 100644
index 000000000..22affa697
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00002.png
new file mode 100644
index 000000000..69241c21a
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00002.png
new file mode 100644
index 000000000..56c30b1db
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00001.png
new file mode 100644
index 000000000..4a5812d61
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00002.png
new file mode 100644
index 000000000..db6ce181f
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00002.png
new file mode 100644
index 000000000..333d78551
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_accept_wit_v1_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00001.png
new file mode 100644
index 000000000..22affa697
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_invalid_pubkey_version_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00001.png
new file mode 100644
index 000000000..22affa697
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_reject_header_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00001.png
new file mode 100644
index 000000000..4a5812d61
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_reject_header_v1_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00001.png
new file mode 100644
index 000000000..cc46fbdd9
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00002.png
new file mode 100644
index 000000000..69241c21a
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00002.png
new file mode 100644
index 000000000..56c30b1db
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_pk_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00001.png
new file mode 100644
index 000000000..89b83589b
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00001.png
new file mode 100644
index 000000000..6d292e546
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00002.png
new file mode 100644
index 000000000..8aea267d0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00001.png
new file mode 100644
index 000000000..9a327076d
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00002.png
new file mode 100644
index 000000000..69241c21a
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00001.png
new file mode 100644
index 000000000..b95cac7f6
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00002.png
new file mode 100644
index 000000000..56c30b1db
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_script_sortedmulti_3_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00001.png
new file mode 100644
index 000000000..6999a9c34
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00001.png
new file mode 100644
index 000000000..5ba01dcf5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00002.png
new file mode 100644
index 000000000..d7f999bc2
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00002.png
new file mode 100644
index 000000000..56c30b1db
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_tr_with_nums_keypath_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00000.png b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00000.png
new file mode 100644
index 000000000..9f0313910
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00001.png b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00001.png
new file mode 100644
index 000000000..3e3ad570d
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00002.png b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00002.png
new file mode 100644
index 000000000..2e1a485b1
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00000.png b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00001.png b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00001.png
new file mode 100644
index 000000000..64ae28514
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00002.png b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00002.png
new file mode 100644
index 000000000..69241c21a
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00003.png b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_1_0/00003.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00000.png b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00000.png
new file mode 100644
index 000000000..219c24e78
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00001.png b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00001.png
new file mode 100644
index 000000000..1d5913de5
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00001.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00002.png b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00002.png
new file mode 100644
index 000000000..56c30b1db
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00002.png differ
diff --git a/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00003.png b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00003.png
new file mode 100644
index 000000000..00ddecee0
Binary files /dev/null and b/tests/snapshots/flex/test_register_wallet_with_long_name_2_0/00003.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_1_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_1/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_2/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_input_changed_3_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_input_changed_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_1_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_1/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_2/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_output_changed_3_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_output_changed_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_sign_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_1_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_sign_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_2_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_sign_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_2_1/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_sign_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_2_2/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_sign_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_anyone_sign_3_0/00000.png b/tests/snapshots/flex/test_sighash_all_anyone_sign_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_anyone_sign_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_input_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_1_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_input_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_1_1/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_1_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_1_2/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_input_modified_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_input_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_all_input_modified_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_input_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_output_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_1_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_output_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_1_1/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_1_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_output_modified_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_1_2/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_output_modified_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_output_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_all_output_modified_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_output_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_0_0/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_sign_psbt_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_1_0/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_1_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_sign_psbt_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_1_1/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_1_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_1_2/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_sign_psbt_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_all_sign_psbt_2_0/00000.png b/tests/snapshots/flex/test_sighash_all_sign_psbt_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_all_sign_psbt_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_1_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_1/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_2/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_input_changed_3_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_input_changed_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_1_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_1/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_2/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_output_changed_3_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_output_changed_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_sign_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_1_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_sign_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_2_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_sign_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_2_1/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_sign_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_2_2/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_sign_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_anyone_sign_3_0/00000.png b/tests/snapshots/flex/test_sighash_none_anyone_sign_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_anyone_sign_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_input_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_input_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_input_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_2_1/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_input_modified_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_2_2/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_input_modified_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_input_modified_3_0/00000.png b/tests/snapshots/flex/test_sighash_none_input_modified_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_input_modified_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_output_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_output_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_output_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_2_1/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_2_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_output_modified_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_2_2/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_output_modified_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_output_modified_3_0/00000.png b/tests/snapshots/flex/test_sighash_none_output_modified_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_output_modified_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_0_0/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_sign_psbt_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_1_0/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_sign_psbt_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_2_0/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_sign_psbt_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_2_1/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_sign_psbt_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_2_2/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_sign_psbt_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_none_sign_psbt_3_0/00000.png b/tests/snapshots/flex/test_sighash_none_sign_psbt_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_none_sign_psbt_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_1_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_1_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_2_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_2_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_2_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash1_3_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_1_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_2_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_2_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_3_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_3_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_3_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash2_4_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash2_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_1_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_2_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_2_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_3_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_3_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_3_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash3_4_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash3_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_1_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_2_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_2_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_3_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_3_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_3_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash81_4_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash81_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_1_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_2_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_2_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_3_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_3_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_3_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash82_4_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash82_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_1_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_2_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_2_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_3_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_3_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_3_1/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_segwitv0_sighash83_4_0/00000.png b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_segwitv0_sighash83_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_input_changed_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_input_changed_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_output_changed_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_output_changed_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_sign_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_sign_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_sign_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_sign_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_sign_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_anyone_sign_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_anyone_sign_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_anyone_sign_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_input_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_input_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_input_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_input_modified_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_input_modified_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_input_modified_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_input_modified_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_input_modified_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_different_index_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_different_index_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_0/00000.png
new file mode 100644
index 000000000..97e237fcd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_different_index_modified_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_different_index_modified_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_1/00000.png
new file mode 100644
index 000000000..2b925f3fd
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_output_same_index_modified_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_output_same_index_modified_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_0_0/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_0_0/00000.png
new file mode 100644
index 000000000..62e3ec6f9
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_sign_psbt_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_1_0/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_sign_psbt_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_2_0/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_2_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_sign_psbt_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_2_1/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_2_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_sign_psbt_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_2_2/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_sign_psbt_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_single_sign_psbt_3_0/00000.png b/tests/snapshots/flex/test_sighash_single_sign_psbt_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_single_sign_psbt_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_0_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_1_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_1_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_1_1/00000.png b/tests/snapshots/flex/test_sighash_unsupported_1_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_1_2/00000.png b/tests/snapshots/flex/test_sighash_unsupported_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_2_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_0/00000.png
new file mode 100644
index 000000000..55343f768
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_1/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_1/00000.png
new file mode 100644
index 000000000..de71ee577
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_2/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_2_0/00000.png b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sighash_unsupported_for_segwitv0_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_0_0/00000.png b/tests/snapshots/flex/test_sign_message_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_0_1/00000.png b/tests/snapshots/flex/test_sign_message_0_1/00000.png
new file mode 100644
index 000000000..a924390a8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_0_2/00000.png b/tests/snapshots/flex/test_sign_message_0_2/00000.png
new file mode 100644
index 000000000..a4d8a88de
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_0_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_0_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_0_1/00000.png b/tests/snapshots/flex/test_sign_message_accept_0_1/00000.png
new file mode 100644
index 000000000..7d4b26a44
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_0_2/00000.png b/tests/snapshots/flex/test_sign_message_accept_0_2/00000.png
new file mode 100644
index 000000000..a4d8a88de
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_0_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_0_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_0_1/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_0_1/00000.png
new file mode 100644
index 000000000..bc06c3280
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_1_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_1_0/00000.png
new file mode 100644
index 000000000..1e5966aa8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_2_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_2_0/00000.png
new file mode 100644
index 000000000..67d3062ff
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_3_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_3_0/00000.png
new file mode 100644
index 000000000..baaae1a78
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_4_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_4_0/00000.png
new file mode 100644
index 000000000..b0713524b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_long_4_1/00000.png b/tests/snapshots/flex/test_sign_message_accept_long_4_1/00000.png
new file mode 100644
index 000000000..a4d8a88de
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_long_4_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_1/00000.png b/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_1/00000.png
new file mode 100644
index 000000000..7820f684a
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_2/00000.png b/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_2/00000.png
new file mode 100644
index 000000000..a4d8a88de
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_non_ascii_0_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_too_long_0_0/00000.png b/tests/snapshots/flex/test_sign_message_accept_too_long_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_too_long_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_too_long_0_1/00000.png b/tests/snapshots/flex/test_sign_message_accept_too_long_0_1/00000.png
new file mode 100644
index 000000000..a912452c3
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_too_long_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_accept_too_long_0_2/00000.png b/tests/snapshots/flex/test_sign_message_accept_too_long_0_2/00000.png
new file mode 100644
index 000000000..a4d8a88de
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_accept_too_long_0_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_hash_reject_0_0/00000.png b/tests/snapshots/flex/test_sign_message_hash_reject_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_hash_reject_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_hash_reject_0_1/00000.png b/tests/snapshots/flex/test_sign_message_hash_reject_0_1/00000.png
new file mode 100644
index 000000000..70030efc3
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_hash_reject_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_hash_reject_0_2/00000.png b/tests/snapshots/flex/test_sign_message_hash_reject_0_2/00000.png
new file mode 100644
index 000000000..0a6b19532
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_hash_reject_0_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_reject_0_0/00000.png b/tests/snapshots/flex/test_sign_message_reject_0_0/00000.png
new file mode 100644
index 000000000..13f5f15bb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_reject_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_reject_0_1/00000.png b/tests/snapshots/flex/test_sign_message_reject_0_1/00000.png
new file mode 100644
index 000000000..89b4002c5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_reject_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_message_reject_0_2/00000.png b/tests/snapshots/flex/test_sign_message_reject_0_2/00000.png
new file mode 100644
index 000000000..0a6b19532
Binary files /dev/null and b/tests/snapshots/flex/test_sign_message_reject_0_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png
new file mode 100644
index 000000000..403a25c16
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png
new file mode 100644
index 000000000..6707b0670
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_1/00000.png
new file mode 100644
index 000000000..958a6f427
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_fail_11_changes_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_fail_11_changes_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_fail_11_changes_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_fail_11_changes_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_fail_11_changes_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_fail_11_changes_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_highfee_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_1_0/00000.png
new file mode 100644
index 000000000..b56f8e243
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_highfee_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_2_0/00000.png
new file mode 100644
index 000000000..cd726ca42
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_highfee_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_2_1/00000.png
new file mode 100644
index 000000000..3a5b65f4e
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_highfee_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_highfee_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_highfee_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_highfee_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_highfee_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00001.png
new file mode 100644
index 000000000..f770c73d6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_0/00000.png
new file mode 100644
index 000000000..a021dd1c9
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_1/00000.png
new file mode 100644
index 000000000..d336221f4
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_miniscript_multikey_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00001.png
new file mode 100644
index 000000000..472f17198
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_0/00000.png
new file mode 100644
index 000000000..4a160ad9c
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_1/00000.png
new file mode 100644
index 000000000..9c14a15b0
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png
new file mode 100644
index 000000000..472f17198
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_1_0/00000.png
new file mode 100644
index 000000000..ea8072052
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png
new file mode 100644
index 000000000..4a160ad9c
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_1/00000.png
new file mode 100644
index 000000000..9c14a15b0
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_2/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00001.png
new file mode 100644
index 000000000..472f17198
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_2_0/00000.png
new file mode 100644
index 000000000..fdc19b654
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_3_0/00000.png
new file mode 100644
index 000000000..e9b91e7cd
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_3_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_4_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00001.png
new file mode 100644
index 000000000..472f17198
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_2_0/00000.png
new file mode 100644
index 000000000..fdc19b654
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_3_0/00000.png
new file mode 100644
index 000000000..e9b91e7cd
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_3_1/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_3_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_3_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_4_0/00000.png b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_4_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_multisig_wsh_v1_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_0/00000.png
new file mode 100644
index 000000000..68768785b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_1/00000.png
new file mode 100644
index 000000000..61420dd21
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png
new file mode 100644
index 000000000..68768785b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_1/00000.png
new file mode 100644
index 000000000..61420dd21
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png
new file mode 100644
index 000000000..f11fedcda
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_1/00000.png
new file mode 100644
index 000000000..684bc4014
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png
new file mode 100644
index 000000000..f11fedcda
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_1/00000.png
new file mode 100644
index 000000000..684bc4014
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png
new file mode 100644
index 000000000..f11fedcda
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_1/00000.png
new file mode 100644
index 000000000..684bc4014
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png
new file mode 100644
index 000000000..f11fedcda
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_1/00000.png
new file mode 100644
index 000000000..684bc4014
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png
new file mode 100644
index 000000000..b3096658d
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png
new file mode 100644
index 000000000..1487210d6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png
new file mode 100644
index 000000000..b3096658d
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png
new file mode 100644
index 000000000..1487210d6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png
new file mode 100644
index 000000000..7dd34c9fc
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png
new file mode 100644
index 000000000..645da9d44
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png
new file mode 100644
index 000000000..9c7fd74eb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_1/00000.png
new file mode 100644
index 000000000..2a2902c5b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0/00000.png
new file mode 100644
index 000000000..ea8072052
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png
new file mode 100644
index 000000000..9c7fd74eb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_1/00000.png
new file mode 100644
index 000000000..2a2902c5b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png
new file mode 100644
index 000000000..9c7fd74eb
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_1/00000.png
new file mode 100644
index 000000000..2a2902c5b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png
new file mode 100644
index 000000000..c11806e04
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png
new file mode 100644
index 000000000..31d6e396b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_1/00000.png
new file mode 100644
index 000000000..913f83fb6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png
new file mode 100644
index 000000000..c11806e04
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png
new file mode 100644
index 000000000..31d6e396b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_1/00000.png
new file mode 100644
index 000000000..913f83fb6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png
new file mode 100644
index 000000000..50a6e716f
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_1_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png
new file mode 100644
index 000000000..09a732225
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_1/00000.png
new file mode 100644
index 000000000..9063de9fe
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png
new file mode 100644
index 000000000..09a732225
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_1/00000.png
new file mode 100644
index 000000000..9063de9fe
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png
new file mode 100644
index 000000000..09a732225
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_1/00000.png
new file mode 100644
index 000000000..9063de9fe
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_0/00000.png
new file mode 100644
index 000000000..09a732225
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_1/00000.png
new file mode 100644
index 000000000..9063de9fe
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_taproot_1to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png
new file mode 100644
index 000000000..1d82bb540
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png
new file mode 100644
index 000000000..5681eb4c4
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png
new file mode 100644
index 000000000..f937c30c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png
new file mode 100644
index 000000000..c99a34fe5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png
new file mode 100644
index 000000000..0747c53a4
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_1/00000.png
new file mode 100644
index 000000000..ded485dc7
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_2/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_2_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_0_0/00000.png
new file mode 100644
index 000000000..1f7d50d83
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_2_0/00000.png
new file mode 100644
index 000000000..c56fc5ab6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_3_0/00000.png
new file mode 100644
index 000000000..d048b6b77
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_4_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_4_0/00000.png
new file mode 100644
index 000000000..70842470b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_5_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_5_0/00000.png
new file mode 100644
index 000000000..361cd6cb2
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_5_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_0/00000.png
new file mode 100644
index 000000000..d9a91c336
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_1/00000.png
new file mode 100644
index 000000000..2376f31a5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_6_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_7_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_7_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_0_7_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_0_0/00000.png
new file mode 100644
index 000000000..1f7d50d83
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_2_0/00000.png
new file mode 100644
index 000000000..c56fc5ab6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_3_0/00000.png
new file mode 100644
index 000000000..932ab5bf9
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_4_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_4_0/00000.png
new file mode 100644
index 000000000..28b82ed90
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_0/00000.png
new file mode 100644
index 000000000..0d3e08de3
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_1/00000.png
new file mode 100644
index 000000000..2376f31a5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_5_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_6_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_6_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_1_6_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_0_0/00000.png
new file mode 100644
index 000000000..1f7d50d83
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_1_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_2_0/00000.png
new file mode 100644
index 000000000..c56fc5ab6
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_3_0/00000.png
new file mode 100644
index 000000000..d048b6b77
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_4_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_4_0/00000.png
new file mode 100644
index 000000000..70842470b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_4_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_0/00000.png
new file mode 100644
index 000000000..0d3e08de3
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_1/00000.png
new file mode 100644
index 000000000..2376f31a5
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_5_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_6_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_6_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_external_inputs_2_6_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_1_0/00000.png
new file mode 100644
index 000000000..999a8cddf
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_2_0/00000.png
new file mode 100644
index 000000000..be5ad5983
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_naked_opreturn_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_1_0/00000.png
new file mode 100644
index 000000000..3bfde3528
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_1_1/00000.png
new file mode 100644
index 000000000..4d0c871ea
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_2_0/00000.png
new file mode 100644
index 000000000..be5ad5983
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_1_0/00000.png
new file mode 100644
index 000000000..3bfde3528
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_1_1/00000.png
new file mode 100644
index 000000000..4d0c871ea
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_2_0/00000.png
new file mode 100644
index 000000000..be5ad5983
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_2_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_2_1/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_2_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_3_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_3_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_opreturn_v1_3_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_0/00000.png
new file mode 100644
index 000000000..5ddb3a8c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_1/00000.png
new file mode 100644
index 000000000..5238c2733
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_2_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png
new file mode 100644
index 000000000..0cfe1e08b
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png
new file mode 100644
index 000000000..5ddb3a8c8
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_1/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_1/00000.png
new file mode 100644
index 000000000..5238c2733
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_1/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_2/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_2/00000.png
new file mode 100644
index 000000000..78571a283
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_1_2/00000.png differ
diff --git a/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png
new file mode 100644
index 000000000..be51a9d55
Binary files /dev/null and b/tests/snapshots/flex/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00000.png
index ea1af86e4..eab53d988 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00001.png
index 7f4d17e4b..62407ffac 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00002.png
index 51718a0c1..0eebcb254 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00003.png
index bfea18008..727d4f002 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00004.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00004.png
index d237b94bf..eded0a8f7 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00004.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_0/00004.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00000.png
index ea1af86e4..eab53d988 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00001.png
index 7f4d17e4b..62407ffac 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00002.png
index a080b8d67..f9b96b12e 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00003.png
index abef66338..91f6ed13c 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00004.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00004.png
index d237b94bf..eded0a8f7 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00004.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_0_0/00004.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png
index ea1af86e4..eab53d988 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00001.png
deleted file mode 100644
index 7f4d17e4b..000000000
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00002.png
deleted file mode 100644
index a080b8d67..000000000
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00003.png
deleted file mode 100644
index abef66338..000000000
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00004.png b/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00004.png
deleted file mode 100644
index d237b94bf..000000000
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_non_standard_reject_early_0_0/00004.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png
index 5cdab244f..1c2c024af 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png
index dc3a95ca9..f85d5780a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/0'_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png
index 5853dbd5f..5509afe14 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png
index ca54005c5..6c7edef4f 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/10'_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png
index 163e845e9..f2a7aba0c 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png
index 0e96bccf3..c1539b528 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/44'/1'/2'/1/42_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png
index f6c957cf1..14219c58b 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png
index 3ef07c8ca..b9b965b02 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/48'/1'/4'/1'/0/7_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png
index 4ac8011b0..c76ad096b 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png
index 39f550005..7b3abb2eb 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/49'/1'/1'/1/3_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png
index ef4e7a408..51aacd09e 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png
index b928ec76e..fe35444a2 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/84'/1'/2'/0/10_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png
index ea1af86e4..8691fc2ca 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png
index 79145c9c0..301860155 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png
index 2b60f9f9b..6b0c99e3d 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png
index d237b94bf..b89ef486a 100644
Binary files a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_1/00000.png b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_1/00000.png
new file mode 100644
index 000000000..9deaee1e7
Binary files /dev/null and b/tests/snapshots/stax/test_get_extended_pubkey_standard_display_m/86'/1'/4'/1/12_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png
index d2e9e991b..2690000aa 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png and b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png
index 99b673ce7..733a6980c 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png and b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png
index 5755bc9c9..d9840ddf9 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png and b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_1/00000.png b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_1/00000.png
new file mode 100644
index 000000000..3f906b2b7
Binary files /dev/null and b/tests/snapshots/stax/test_get_wallet_address_multisig_legacy_v1_ui_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png
index 300268993..c7106ce4f 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png and b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png
index 6b7c4de42..475185ed4 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png and b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_1/00000.png b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_1/00000.png
new file mode 100644
index 000000000..3f906b2b7
Binary files /dev/null and b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_0_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png
index 300268993..c7106ce4f 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png and b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png
index 445a4b0f4..4641b1805 100644
Binary files a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png and b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_1/00000.png b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_1/00000.png
new file mode 100644
index 000000000..3f906b2b7
Binary files /dev/null and b/tests/snapshots/stax/test_get_wallet_address_singlesig_legacy_v1_ui_1_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00000.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00000.png
index 13cf02337..1bfeedab0 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00000.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00001.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00001.png
index 5cf0c3c19..1b05cd456 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00001.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png
index 0aea8a378..d8002eb78 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00003.png b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00003.png
index 50f8ca2ca..dfbc67805 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00003.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_0_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00000.png b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00000.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00001.png b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00001.png
index 40cab4247..a658cee9f 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00001.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00002.png b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00002.png
index c703c4897..2a95ca101 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00002.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00003.png b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00003.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00000.png b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00000.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00001.png b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00001.png
index 0c4941468..4e6dc26f9 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00001.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00002.png b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00002.png
index a8c26d386..7e048768b 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00002.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00003.png b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00003.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00000.png b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00000.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00001.png b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00001.png
index a521a56be..57c3828fe 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00001.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00002.png b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00002.png
index 23809c712..4b1bab888 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00002.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00003.png b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00003.png and b/tests/snapshots/stax/test_register_miniscript_long_policy_3_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png
index 9e2f810a7..33f271a57 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png
index 40cab4247..a658cee9f 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png
index 434a102d1..a9e4c2bb2 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Legacy_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png
index e90b2bb8f..274251737 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png
index 40cab4247..a658cee9f 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png
index 434a102d1..a9e4c2bb2 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Native_Segwit_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png
index 39c86f915..9ca52463f 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png
index 40cab4247..a658cee9f 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png
index 434a102d1..a9e4c2bb2 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Nested_Segwit_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png
index 2c961e487..9df65e874 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png
index 40cab4247..a658cee9f 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png
index 434a102d1..a9e4c2bb2 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png and b/tests/snapshots/stax/test_register_unusual_singlesig_accounts_Unusual_Taproot_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00001.png
index 502335564..a434a6ff0 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00002.png
index 27eaa5e9f..28525f7b1 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00002.png
index 2a0de0b74..5803cb130 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00001.png
index 1bd62f7ff..290928703 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00002.png
index 4882e790d..cba3452b3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00002.png
index b6518b389..cfb8b7887 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_legacy_v1_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00001.png
index 6fedf31cc..035f58eee 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00002.png
index 74f466b1b..4354a9ee0 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00002.png
index c7c4ec3a5..d532a9433 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00001.png
index 5d2dd0714..7fc8ea665 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00002.png
index 5f1840688..c9d3c3943 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00002.png
index 3659f40e1..afdae8d5a 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_sh_wit_v1_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00001.png
index 1d6d1024a..2e63e9f2f 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00002.png
index a105b1fe9..6a240303c 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00002.png
index c703c4897..2a95ca101 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00001.png
index c9b431885..abffe1074 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00002.png
index be5443d82..e1f5fc05e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00002.png
index 9c0542acf..762930630 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_accept_wit_v1_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00001.png
index 1d6d1024a..2e63e9f2f 100644
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00000.png
deleted file mode 100644
index 825d88301..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00001.png
deleted file mode 100644
index 2d7408bdf..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00002.png
deleted file mode 100644
index 78ec3da74..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00003.png
deleted file mode 100644
index 055f6df69..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_1_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00000.png
deleted file mode 100644
index 825d88301..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00000.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00001.png
deleted file mode 100644
index 976d0604f..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00002.png
deleted file mode 100644
index c703c4897..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00003.png
deleted file mode 100644
index 055f6df69..000000000
Binary files a/tests/snapshots/stax/test_register_wallet_invalid_pubkey_version_2_0/00003.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00001.png
index 1d6d1024a..2e63e9f2f 100644
Binary files a/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_reject_header_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00001.png
index c9b431885..abffe1074 100644
Binary files a/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_reject_header_v1_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00001.png
index b41874f80..22d09a828 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00002.png
index a105b1fe9..6a240303c 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00002.png
index c703c4897..2a95ca101 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_script_pk_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00001.png
index ba8cd19e1..6d7aba821 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00001.png
index 40cab4247..a658cee9f 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00002.png
index c7c4ec3a5..d532a9433 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00001.png
index 0c4941468..4e6dc26f9 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00002.png
index a105b1fe9..6a240303c 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00001.png
index ffe4d17c8..1791a42fe 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00002.png
index c703c4897..2a95ca101 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_script_sortedmulti_3_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00001.png
index a79e36fde..8eb2f670c 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00001.png
index 005a6ba0b..835c81a90 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00002.png
index ac99afb9d..2374d9cd3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00002.png
index c703c4897..2a95ca101 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_tr_with_nums_keypath_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00000.png b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00000.png
index 13cf02337..d687348d3 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00000.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00001.png b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00001.png
index 3ee790be5..e560a2f00 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00001.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00002.png b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00002.png
index 345ce91d4..1e6273794 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00002.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00000.png b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00000.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00001.png b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00001.png
index cb1605435..498b1c59d 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00001.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00002.png b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00002.png
index a105b1fe9..6a240303c 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00002.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00003.png b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00003.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_1_0/00003.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00000.png b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00000.png
index 825d88301..40b579ecb 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00000.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00001.png b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00001.png
index 0dcdcce99..3fa80f94e 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00001.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00001.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00002.png b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00002.png
index c703c4897..2a95ca101 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00002.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00002.png differ
diff --git a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00003.png b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00003.png
index 055f6df69..93504f5b8 100644
Binary files a/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00003.png and b/tests/snapshots/stax/test_register_wallet_with_long_name_2_0/00003.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00001.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00001.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00002.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_1/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_2/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_3_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_input_changed_3_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_input_changed_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00001.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00001.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00002.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_1/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_2/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_3_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_output_changed_3_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_output_changed_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00001.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_sign_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00001.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00002.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_1/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_2_2/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_anyone_sign_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_anyone_sign_3_0/00000.png b/tests/snapshots/stax/test_sighash_all_anyone_sign_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_all_anyone_sign_3_0/00000.png and b/tests/snapshots/stax/test_sighash_all_anyone_sign_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00000.png b/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00000.png and b/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00001.png b/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_input_modified_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00002.png b/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_input_modified_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_1_1/00000.png b/tests/snapshots/stax/test_sighash_all_input_modified_1_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_input_modified_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_1_2/00000.png b/tests/snapshots/stax/test_sighash_all_input_modified_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_input_modified_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_input_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_all_input_modified_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_all_input_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_all_input_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00000.png b/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00000.png and b/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00001.png b/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_output_modified_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00002.png b/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_output_modified_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_1_1/00000.png b/tests/snapshots/stax/test_sighash_all_output_modified_1_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_output_modified_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_1_2/00000.png b/tests/snapshots/stax/test_sighash_all_output_modified_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_output_modified_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_output_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_all_output_modified_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_all_output_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_all_output_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00000.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00000.png and b/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00001.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_sign_psbt_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00000.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00000.png and b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00001.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00002.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_1/00000.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_1_2/00000.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_all_sign_psbt_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_all_sign_psbt_2_0/00000.png b/tests/snapshots/stax/test_sighash_all_sign_psbt_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_all_sign_psbt_2_0/00000.png and b/tests/snapshots/stax/test_sighash_all_sign_psbt_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00001.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00001.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00002.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_1/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_2/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_3_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_input_changed_3_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_input_changed_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00001.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00001.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00002.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_1/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_2/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_3_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_output_changed_3_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_output_changed_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00001.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_sign_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00001.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00002.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_1/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_2_2/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_anyone_sign_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_anyone_sign_3_0/00000.png b/tests/snapshots/stax/test_sighash_none_anyone_sign_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_none_anyone_sign_3_0/00000.png and b/tests/snapshots/stax/test_sighash_none_anyone_sign_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_input_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00001.png b/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00002.png b/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_input_modified_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_2_1/00000.png b/tests/snapshots/stax/test_sighash_none_input_modified_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_input_modified_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_2_2/00000.png b/tests/snapshots/stax/test_sighash_none_input_modified_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_input_modified_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_input_modified_3_0/00000.png b/tests/snapshots/stax/test_sighash_none_input_modified_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_none_input_modified_3_0/00000.png and b/tests/snapshots/stax/test_sighash_none_input_modified_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_output_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00001.png b/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00002.png b/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_output_modified_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_2_1/00000.png b/tests/snapshots/stax/test_sighash_none_output_modified_2_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_output_modified_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_2_2/00000.png b/tests/snapshots/stax/test_sighash_none_output_modified_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_output_modified_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_output_modified_3_0/00000.png b/tests/snapshots/stax/test_sighash_none_output_modified_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_none_output_modified_3_0/00000.png and b/tests/snapshots/stax/test_sighash_none_output_modified_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00000.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00000.png and b/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00001.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_sign_psbt_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00000.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00000.png and b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00001.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00002.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_1/00000.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_2_2/00000.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_none_sign_psbt_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_none_sign_psbt_3_0/00000.png b/tests/snapshots/stax/test_sighash_none_sign_psbt_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_none_sign_psbt_3_0/00000.png and b/tests/snapshots/stax/test_sighash_none_sign_psbt_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_1/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_3_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash1_3_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_1/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_4_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash2_4_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash2_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_1/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_4_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash3_4_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash3_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_1/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_4_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash81_4_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash81_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_1/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_4_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash82_4_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash82_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00001.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_1/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_4_0/00000.png b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_segwitv0_sighash83_4_0/00000.png and b/tests/snapshots/stax/test_sighash_segwitv0_sighash83_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_input_changed_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_input_changed_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_output_changed_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_output_changed_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_sign_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_anyone_sign_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_anyone_sign_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_anyone_sign_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_anyone_sign_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_anyone_sign_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_input_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_input_modified_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_input_modified_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_input_modified_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_input_modified_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_input_modified_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_input_modified_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_input_modified_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_input_modified_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_input_modified_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00000.png
index 6efdc63a7..f4f2bda75 100644
Binary files a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_output_different_index_modified_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_output_different_index_modified_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00001.png
deleted file mode 100644
index 7d0653538..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_1/00000.png
new file mode 100644
index 000000000..d8f8a702b
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_output_same_index_modified_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_output_same_index_modified_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00000.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00000.png and b/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00001.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_sign_psbt_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00000.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00000.png and b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00001.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00002.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_1/00000.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_2_2/00000.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_single_sign_psbt_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_single_sign_psbt_3_0/00000.png b/tests/snapshots/stax/test_sighash_single_sign_psbt_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_single_sign_psbt_3_0/00000.png and b/tests/snapshots/stax/test_sighash_single_sign_psbt_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_0_0/00000.png b/tests/snapshots/stax/test_sighash_unsupported_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_unsupported_0_0/00000.png and b/tests/snapshots/stax/test_sighash_unsupported_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_0_0/00001.png b/tests/snapshots/stax/test_sighash_unsupported_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_unsupported_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_1_0/00000.png b/tests/snapshots/stax/test_sighash_unsupported_1_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_unsupported_1_0/00000.png and b/tests/snapshots/stax/test_sighash_unsupported_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_1_0/00001.png b/tests/snapshots/stax/test_sighash_unsupported_1_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_unsupported_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_1_0/00002.png b/tests/snapshots/stax/test_sighash_unsupported_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_unsupported_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_1_1/00000.png b/tests/snapshots/stax/test_sighash_unsupported_1_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_unsupported_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_1_2/00000.png b/tests/snapshots/stax/test_sighash_unsupported_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_unsupported_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_2_0/00000.png b/tests/snapshots/stax/test_sighash_unsupported_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_unsupported_2_0/00000.png and b/tests/snapshots/stax/test_sighash_unsupported_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00000.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00000.png and b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00001.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00000.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00000.png
index 97524e00d..ab13563ad 100644
Binary files a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00000.png and b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00001.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00001.png
deleted file mode 100644
index e72ba2fa6..000000000
Binary files a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00002.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_1/00000.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_1/00000.png
new file mode 100644
index 000000000..d3dc23888
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_2/00000.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_2_0/00000.png b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_2_0/00000.png and b/tests/snapshots/stax/test_sighash_unsupported_for_segwitv0_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_0_0/00000.png b/tests/snapshots/stax/test_sign_message_0_0/00000.png
index c42ad9a36..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_0_0/00002.png b/tests/snapshots/stax/test_sign_message_0_0/00002.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_0_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_0_0/00001.png b/tests/snapshots/stax/test_sign_message_0_1/00000.png
similarity index 100%
rename from tests/snapshots/stax/test_sign_message_0_0/00001.png
rename to tests/snapshots/stax/test_sign_message_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_message_0_2/00000.png b/tests/snapshots/stax/test_sign_message_0_2/00000.png
new file mode 100644
index 000000000..9196d0620
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_0_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_0_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_0_0/00000.png
index c42ad9a36..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_0_0/00002.png b/tests/snapshots/stax/test_sign_message_accept_0_0/00002.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_0_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_0_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_0_1/00000.png
similarity index 100%
rename from tests/snapshots/stax/test_sign_message_accept_0_0/00001.png
rename to tests/snapshots/stax/test_sign_message_accept_0_1/00000.png
diff --git a/tests/snapshots/stax/test_sign_message_accept_0_2/00000.png b/tests/snapshots/stax/test_sign_message_accept_0_2/00000.png
new file mode 100644
index 000000000..9196d0620
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_0_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_0_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_0_0/00000.png
index c42ad9a36..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_long_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_0_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_long_0_0/00001.png
deleted file mode 100644
index 695fc7c4c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_0_0/00002.png b/tests/snapshots/stax/test_sign_message_accept_long_0_0/00002.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_0_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_0_1/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_0_1/00000.png
new file mode 100644
index 000000000..e6080c2ae
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_long_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_1_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_1_0/00000.png
index 7ec24f1e3..3757c3e3e 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_1_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_long_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_1_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_long_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_2_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_2_0/00000.png
index c8a1a6d94..73b715143 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_2_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_long_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_2_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_long_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_3_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_3_0/00000.png
index d5673beef..f858187b2 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_3_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_long_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_3_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_long_3_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_4_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_4_0/00000.png
index 823fe9147..325d2de53 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_4_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_long_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_4_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_long_4_0/00001.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_long_4_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_long_4_1/00000.png b/tests/snapshots/stax/test_sign_message_accept_long_4_1/00000.png
new file mode 100644
index 000000000..9196d0620
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_long_4_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00000.png
index 731541c9c..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00001.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_1/00000.png b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_1/00000.png
new file mode 100644
index 000000000..731541c9c
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_2/00000.png b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_2/00000.png
new file mode 100644
index 000000000..9196d0620
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_non_ascii_0_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00000.png b/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00000.png
index f59ea32ec..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00001.png b/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00001.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_accept_too_long_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_too_long_0_1/00000.png b/tests/snapshots/stax/test_sign_message_accept_too_long_0_1/00000.png
new file mode 100644
index 000000000..f59ea32ec
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_too_long_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_accept_too_long_0_2/00000.png b/tests/snapshots/stax/test_sign_message_accept_too_long_0_2/00000.png
new file mode 100644
index 000000000..9196d0620
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_accept_too_long_0_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00000.png b/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00000.png
index 83a99df7b..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00001.png b/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00001.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_hash_reject_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_hash_reject_0_1/00000.png b/tests/snapshots/stax/test_sign_message_hash_reject_0_1/00000.png
index 751b367f2..83a99df7b 100644
Binary files a/tests/snapshots/stax/test_sign_message_hash_reject_0_1/00000.png and b/tests/snapshots/stax/test_sign_message_hash_reject_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_hash_reject_0_2/00000.png b/tests/snapshots/stax/test_sign_message_hash_reject_0_2/00000.png
new file mode 100644
index 000000000..56afa4b24
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_hash_reject_0_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_reject_0_0/00000.png b/tests/snapshots/stax/test_sign_message_reject_0_0/00000.png
index c42ad9a36..098a7dd3f 100644
Binary files a/tests/snapshots/stax/test_sign_message_reject_0_0/00000.png and b/tests/snapshots/stax/test_sign_message_reject_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_reject_0_0/00001.png b/tests/snapshots/stax/test_sign_message_reject_0_0/00001.png
deleted file mode 100644
index d375d66b7..000000000
Binary files a/tests/snapshots/stax/test_sign_message_reject_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_reject_0_0/00002.png b/tests/snapshots/stax/test_sign_message_reject_0_0/00002.png
deleted file mode 100644
index e50bf611c..000000000
Binary files a/tests/snapshots/stax/test_sign_message_reject_0_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_message_reject_0_1/00000.png b/tests/snapshots/stax/test_sign_message_reject_0_1/00000.png
index 751b367f2..d375d66b7 100644
Binary files a/tests/snapshots/stax/test_sign_message_reject_0_1/00000.png and b/tests/snapshots/stax/test_sign_message_reject_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_message_reject_0_2/00000.png b/tests/snapshots/stax/test_sign_message_reject_0_2/00000.png
new file mode 100644
index 000000000..56afa4b24
Binary files /dev/null and b/tests/snapshots/stax/test_sign_message_reject_0_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png
index f0bfb1ca7..428c346c0 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png
index 49e98e252..9b6e282b5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00001.png
deleted file mode 100644
index f56cc38ba..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_1/00000.png
new file mode 100644
index 000000000..4c6a1e859
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_against_wrong_tapleaf_hash_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_fail_11_changes_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00000.png
index dc7955b79..5523926c7 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00000.png
index 4bace98bf..167724c76 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00001.png b/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_2_1/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_highfee_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_highfee_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_highfee_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_highfee_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_highfee_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_highfee_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00001.png
index 1bcaeea79..c21939201 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00000.png
index b35016dec..519dcf6b8 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00001.png
deleted file mode 100644
index e5d77cf1d..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_1/00000.png
new file mode 100644
index 000000000..3dc9e2295
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_miniscript_multikey_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00001.png
index 48f68a44d..0713e758b 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00000.png
index fdbf91e7a..3c69ff058 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00001.png
deleted file mode 100644
index ad4daa734..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_1/00000.png
new file mode 100644
index 000000000..b5e351184
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png
index 48f68a44d..0713e758b 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png
index fdbf91e7a..3c69ff058 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00001.png
deleted file mode 100644
index ad4daa734..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00002.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_1/00000.png
new file mode 100644
index 000000000..b5e351184
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_2/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_3_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_sh_wsh_missing_nonwitnessutxo_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00001.png
index 48f68a44d..0713e758b 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00000.png
index caa284a71..58a236702 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00000.png
index 08a0fc72e..84a6840d9 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_4_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_4_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00001.png
index 48f68a44d..0713e758b 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00000.png
index caa284a71..58a236702 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00000.png
index 08a0fc72e..84a6840d9 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00001.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_1/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_3_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_4_0/00000.png b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_4_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_4_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_multisig_wsh_v1_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00000.png
index f89bec723..90c32b5d4 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00001.png
deleted file mode 100644
index adb6a691b..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_1/00000.png
new file mode 100644
index 000000000..c5bac20c0
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png
index f89bec723..90c32b5d4 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00001.png
deleted file mode 100644
index adb6a691b..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_1/00000.png
new file mode 100644
index 000000000..c5bac20c0
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_large_amount_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png
index 17b5e632c..d3e7d16b9 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00001.png
deleted file mode 100644
index d2e7752c2..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_1/00000.png
new file mode 100644
index 000000000..3516b6f02
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png
index 17b5e632c..d3e7d16b9 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00001.png
deleted file mode 100644
index d2e7752c2..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_1/00000.png
new file mode 100644
index 000000000..3516b6f02
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_0_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png
index 17b5e632c..d3e7d16b9 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00001.png
deleted file mode 100644
index d2e7752c2..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_1/00000.png
new file mode 100644
index 000000000..3516b6f02
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_other_encodings_1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png
index 17b5e632c..d3e7d16b9 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00001.png
deleted file mode 100644
index d2e7752c2..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_1/00000.png
new file mode 100644
index 000000000..3516b6f02
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_pkh_1to1_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png
index 1277ee8fc..06e55ce35 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png
index 918961ee3..400d33524 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png
index 1277ee8fc..06e55ce35 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png
index 918961ee3..400d33524 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_sh_wpkh_1to2_v1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png
index 3a71fd4de..9693b0759 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png
index 06f5cd200..ed9bb0bd7 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_1to2_v1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png
index 23c3a90cf..6acf52c8a 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00001.png
deleted file mode 100644
index 099a93882..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_1/00000.png
new file mode 100644
index 000000000..8aadd0e2b
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png
index 23c3a90cf..6acf52c8a 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00001.png
deleted file mode 100644
index 099a93882..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_1/00000.png
new file mode 100644
index 000000000..8aadd0e2b
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_missing_nonwitnessutxo_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png
index 23c3a90cf..6acf52c8a 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00001.png
deleted file mode 100644
index 099a93882..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_1/00000.png
new file mode 100644
index 000000000..8aadd0e2b
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_2to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png
index 0b6df0c48..9b7bcfc1e 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png
index 9aa0dfef1..434a59efe 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00001.png
deleted file mode 100644
index d86e844f4..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00002.png
deleted file mode 100644
index cdbaa25e5..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_1/00000.png
new file mode 100644
index 000000000..fb54c1117
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png
index 0b6df0c48..9b7bcfc1e 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png
index 9aa0dfef1..434a59efe 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00001.png
deleted file mode 100644
index d86e844f4..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00002.png
deleted file mode 100644
index cdbaa25e5..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_1/00000.png
new file mode 100644
index 000000000..fb54c1117
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_4to3_v1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png
index 9c8b1c9dc..9d3927b67 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00001.png
deleted file mode 100644
index 8cb4c4c47..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_singlesig_wpkh_selftransfer_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png
index 5b406ed2a..b30e2e798 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00001.png
deleted file mode 100644
index 72ad42f3b..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_1/00000.png
new file mode 100644
index 000000000..e0a674b49
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_all_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png
index 5b406ed2a..b30e2e798 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00001.png
deleted file mode 100644
index 72ad42f3b..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_1/00000.png
new file mode 100644
index 000000000..e0a674b49
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_0_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png
index 5b406ed2a..b30e2e798 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00001.png
deleted file mode 100644
index 72ad42f3b..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_1/00000.png
new file mode 100644
index 000000000..e0a674b49
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_sighash_default_1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00000.png
index 5b406ed2a..b30e2e798 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00001.png
deleted file mode 100644
index 72ad42f3b..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_1/00000.png
new file mode 100644
index 000000000..e0a674b49
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_taproot_1to2_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png
index fe8259008..d863ed002 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png
index e22ababe8..cb02f14a1 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png
index ec47288ae..08abaf817 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_0/00002.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png
index adccaeb16..29e0ff9fb 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_0_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png
index be3f449b3..951388516 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00001.png
deleted file mode 100644
index 836808a6e..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00002.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_1/00000.png
new file mode 100644
index 000000000..25b8eed69
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_2/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_2_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_tr_script_pk_sighash_all_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00000.png
index ea5fb3d81..f514ba4fd 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00000.png
index 42106b4bb..6744bd41c 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00000.png
index 7c1a7e9e2..4fbcb3a28 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_4_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00000.png
index 6ee137310..a84f29517 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_5_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00000.png
index 418e6ef8a..c65bb0d57 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00001.png
deleted file mode 100644
index eea1e44ab..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00002.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00002.png
deleted file mode 100644
index e527647ea..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_1/00000.png
new file mode 100644
index 000000000..de1b0e791
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_2/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_6_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_7_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_7_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_7_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_0_7_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00000.png
index 28e9f1f67..f514ba4fd 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00000.png
index d107be40b..a2242567c 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00000.png
index 702835c99..c1bc25fc5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_4_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00000.png
index 46c831e49..29cafe94d 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00001.png
deleted file mode 100644
index 03e7b30e1..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00002.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00002.png
deleted file mode 100644
index 71a9455bd..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_1/00000.png
new file mode 100644
index 000000000..de1b0e791
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_2/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_5_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_6_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_6_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_6_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_1_6_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00000.png
index 28e9f1f67..f514ba4fd 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00000.png
index a0d52ebea..6744bd41c 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_3_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00000.png
index 87b4d22b2..4fbcb3a28 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_4_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00000.png
index 46c831e49..29cafe94d 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00001.png
deleted file mode 100644
index 03e7b30e1..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00002.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00002.png
deleted file mode 100644
index 71a9455bd..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_1/00000.png
new file mode 100644
index 000000000..de1b0e791
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_2/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_5_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_6_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_6_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_6_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_external_inputs_2_6_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00000.png
index 3df60593c..3326334a2 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00000.png
index 766686653..839df13ec 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_naked_opreturn_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00000.png
index 480e7557f..d414707df 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_1/00000.png
new file mode 100644
index 000000000..3b7f645be
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00000.png
index 766686653..839df13ec 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00000.png
index 480e7557f..d414707df 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_1/00000.png
new file mode 100644
index 000000000..3b7f645be
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00000.png
index 766686653..839df13ec 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00001.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_1/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_2_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_3_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_3_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_3_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_opreturn_v1_3_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00000.png
index 6ccba4e59..a00f8eb61 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00001.png
deleted file mode 100644
index 1c41bd804..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_1/00000.png
new file mode 100644
index 000000000..f8dcc95bd
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_2_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png
index 14439c154..7a8fa15fa 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00001.png
deleted file mode 100644
index ddae32d91..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_0_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png
index 6ccba4e59..a00f8eb61 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00001.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00001.png
deleted file mode 100644
index 1c41bd804..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00001.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00002.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00002.png
deleted file mode 100644
index 1f9f7a35a..000000000
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_0/00002.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_1/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_1/00000.png
new file mode 100644
index 000000000..f8dcc95bd
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_1/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_2/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_2/00000.png
new file mode 100644
index 000000000..066a141c3
Binary files /dev/null and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_1_2/00000.png differ
diff --git a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png
index a21279c8a..2ba6d27d5 100644
Binary files a/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png and b/tests/snapshots/stax/test_sign_psbt_with_segwit_v16_v1_2_0/00000.png differ