diff --git a/app/Makefile.version b/app/Makefile.version
index 9a13384b..891962f2 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=1
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=0
 # This is the patch version of this release
-APPVERSION_P=1
+APPVERSION_P=2
diff --git a/app/flex_icon.gif b/app/flex_icon.gif
index 31540fc2..47e26d42 100644
Binary files a/app/flex_icon.gif and b/app/flex_icon.gif differ
diff --git a/deps/ledger-zxlib b/deps/ledger-zxlib
index 50df5b5c..0172a430 160000
--- a/deps/ledger-zxlib
+++ b/deps/ledger-zxlib
@@ -1 +1 @@
-Subproject commit 50df5b5c1551ff99ad06716d0772a4a4be2cbb35
+Subproject commit 0172a430279045bfd5103e51d3975a3fbb9dc4b4
diff --git a/ledger_app.toml b/ledger_app.toml
index 3e4cbb1f..7f63dfec 100644
--- a/ledger_app.toml
+++ b/ledger_app.toml
@@ -1,7 +1,7 @@
 [app]
 build_directory = "./app/"
 sdk = "C"
-devices = ["nanos", "nanox", "nanos+", "stax"]
+devices = ["nanos", "nanox", "nanos+", "stax", "flex"]
 
 [tests]
 unit_directory = "./tests/"
diff --git a/tests_zemu/snapshots/fl-mainmenu/00001.png b/tests_zemu/snapshots/fl-mainmenu/00001.png
index 71655d9f..38416747 100644
Binary files a/tests_zemu/snapshots/fl-mainmenu/00001.png and b/tests_zemu/snapshots/fl-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00002.png b/tests_zemu/snapshots/fl-mainmenu/00002.png
index 068eb46b..e985c584 100644
Binary files a/tests_zemu/snapshots/fl-mainmenu/00002.png and b/tests_zemu/snapshots/fl-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00003.png b/tests_zemu/snapshots/fl-mainmenu/00003.png
index 71655d9f..38416747 100644
Binary files a/tests_zemu/snapshots/fl-mainmenu/00003.png and b/tests_zemu/snapshots/fl-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/fl-mainmenu/00004.png b/tests_zemu/snapshots/fl-mainmenu/00004.png
index 872ab843..58a8d725 100644
Binary files a/tests_zemu/snapshots/fl-mainmenu/00004.png and b/tests_zemu/snapshots/fl-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/fl-show_address/00000.png b/tests_zemu/snapshots/fl-show_address/00000.png
index 67602cf6..834cfaed 100644
Binary files a/tests_zemu/snapshots/fl-show_address/00000.png and b/tests_zemu/snapshots/fl-show_address/00000.png differ
diff --git a/tests_zemu/snapshots/fl-show_address/00001.png b/tests_zemu/snapshots/fl-show_address/00001.png
index 55792e99..573c58d4 100644
Binary files a/tests_zemu/snapshots/fl-show_address/00001.png and b/tests_zemu/snapshots/fl-show_address/00001.png differ
diff --git a/tests_zemu/snapshots/fl-show_address_reject/00000.png b/tests_zemu/snapshots/fl-show_address_reject/00000.png
index 67602cf6..834cfaed 100644
Binary files a/tests_zemu/snapshots/fl-show_address_reject/00000.png and b/tests_zemu/snapshots/fl-show_address_reject/00000.png differ
diff --git a/tests_zemu/snapshots/fl-show_address_reject/00001.png b/tests_zemu/snapshots/fl-show_address_reject/00001.png
index 55792e99..573c58d4 100644
Binary files a/tests_zemu/snapshots/fl-show_address_reject/00001.png and b/tests_zemu/snapshots/fl-show_address_reject/00001.png differ
diff --git a/tests_zemu/snapshots/fl-show_address_shielded/00000.png b/tests_zemu/snapshots/fl-show_address_shielded/00000.png
index 67602cf6..834cfaed 100644
Binary files a/tests_zemu/snapshots/fl-show_address_shielded/00000.png and b/tests_zemu/snapshots/fl-show_address_shielded/00000.png differ
diff --git a/tests_zemu/snapshots/fl-show_address_shielded/00001.png b/tests_zemu/snapshots/fl-show_address_shielded/00001.png
index 68a7f450..f24fdfbe 100644
Binary files a/tests_zemu/snapshots/fl-show_address_shielded/00001.png and b/tests_zemu/snapshots/fl-show_address_shielded/00001.png differ
diff --git a/tests_zemu/snapshots/fl-show_address_shielded_reject/00000.png b/tests_zemu/snapshots/fl-show_address_shielded_reject/00000.png
index 67602cf6..834cfaed 100644
Binary files a/tests_zemu/snapshots/fl-show_address_shielded_reject/00000.png and b/tests_zemu/snapshots/fl-show_address_shielded_reject/00000.png differ
diff --git a/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png b/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png
index 68a7f450..f24fdfbe 100644
Binary files a/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png and b/tests_zemu/snapshots/fl-show_address_shielded_reject/00001.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00002.png b/tests_zemu/snapshots/fl-show_viewkey/00002.png
index d3ec3e62..b4330875 100644
Binary files a/tests_zemu/snapshots/fl-show_viewkey/00002.png and b/tests_zemu/snapshots/fl-show_viewkey/00002.png differ
diff --git a/tests_zemu/snapshots/fl-show_viewkey/00003.png b/tests_zemu/snapshots/fl-show_viewkey/00003.png
index dcbdf8d0..698405b5 100644
Binary files a/tests_zemu/snapshots/fl-show_viewkey/00003.png and b/tests_zemu/snapshots/fl-show_viewkey/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign-bond/00000.png b/tests_zemu/snapshots/fl-sign-bond/00000.png
index 7443e557..8eaa343f 100644
Binary files a/tests_zemu/snapshots/fl-sign-bond/00000.png and b/tests_zemu/snapshots/fl-sign-bond/00000.png differ
diff --git a/tests_zemu/snapshots/fl-sign-bond/00001.png b/tests_zemu/snapshots/fl-sign-bond/00001.png
index e5db1dc0..babce741 100644
Binary files a/tests_zemu/snapshots/fl-sign-bond/00001.png and b/tests_zemu/snapshots/fl-sign-bond/00001.png differ
diff --git a/tests_zemu/snapshots/fl-sign-init_proposal/00002.png b/tests_zemu/snapshots/fl-sign-init_proposal/00002.png
index c5e4b842..6cd5f377 100644
Binary files a/tests_zemu/snapshots/fl-sign-init_proposal/00002.png and b/tests_zemu/snapshots/fl-sign-init_proposal/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign-init_proposal/00003.png b/tests_zemu/snapshots/fl-sign-init_proposal/00003.png
index 454693af..6b23c1e4 100644
Binary files a/tests_zemu/snapshots/fl-sign-init_proposal/00003.png and b/tests_zemu/snapshots/fl-sign-init_proposal/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png
index 37811722..bc925130 100644
Binary files a/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png and b/tests_zemu/snapshots/fl-sign-masp-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png
index d5bdab9d..fa294f70 100644
Binary files a/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png and b/tests_zemu/snapshots/fl-sign-masp-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png b/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png
index 02b4e70f..8fac6292 100644
Binary files a/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png and b/tests_zemu/snapshots/fl-sign-masp-transfer/00006.png differ
diff --git a/tests_zemu/snapshots/fl-sign-multisig_address/00002.png b/tests_zemu/snapshots/fl-sign-multisig_address/00002.png
index 7ea8dc89..784691b3 100644
Binary files a/tests_zemu/snapshots/fl-sign-multisig_address/00002.png and b/tests_zemu/snapshots/fl-sign-multisig_address/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign-multisig_address/00003.png b/tests_zemu/snapshots/fl-sign-multisig_address/00003.png
index 0bc541a4..ea7b452f 100644
Binary files a/tests_zemu/snapshots/fl-sign-multisig_address/00003.png and b/tests_zemu/snapshots/fl-sign-multisig_address/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00002.png b/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00002.png
index 2f9d6dfc..6a86f965 100644
Binary files a/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00002.png and b/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00003.png b/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00003.png
index 5e2f310c..b4c8afde 100644
Binary files a/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00003.png and b/tests_zemu/snapshots/fl-sign-multisig_pubkeys/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign-update_vp/00000.png b/tests_zemu/snapshots/fl-sign-update_vp/00000.png
index e573fca4..07f09810 100644
Binary files a/tests_zemu/snapshots/fl-sign-update_vp/00000.png and b/tests_zemu/snapshots/fl-sign-update_vp/00000.png differ
diff --git a/tests_zemu/snapshots/fl-sign-update_vp/00001.png b/tests_zemu/snapshots/fl-sign-update_vp/00001.png
index 01b18d10..259a0aca 100644
Binary files a/tests_zemu/snapshots/fl-sign-update_vp/00001.png and b/tests_zemu/snapshots/fl-sign-update_vp/00001.png differ
diff --git a/tests_zemu/snapshots/fl-sign-update_vp/00004.png b/tests_zemu/snapshots/fl-sign-update_vp/00004.png
index 734b0fdf..58ad45f9 100644
Binary files a/tests_zemu/snapshots/fl-sign-update_vp/00004.png and b/tests_zemu/snapshots/fl-sign-update_vp/00004.png differ
diff --git a/tests_zemu/snapshots/fl-sign-update_vp/00005.png b/tests_zemu/snapshots/fl-sign-update_vp/00005.png
index 4163583e..8dc6ec62 100644
Binary files a/tests_zemu/snapshots/fl-sign-update_vp/00005.png and b/tests_zemu/snapshots/fl-sign-update_vp/00005.png differ
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00002.png b/tests_zemu/snapshots/fl-sign_masp_spends/00002.png
index b63dfd38..9db45ffc 100644
Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00002.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00002.png differ
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00003.png b/tests_zemu/snapshots/fl-sign_masp_spends/00003.png
index a318e4e9..7f632e61 100644
Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00003.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00003.png differ
diff --git a/tests_zemu/snapshots/fl-sign_masp_spends/00006.png b/tests_zemu/snapshots/fl-sign_masp_spends/00006.png
index a14f9312..7ecac71e 100644
Binary files a/tests_zemu/snapshots/fl-sign_masp_spends/00006.png and b/tests_zemu/snapshots/fl-sign_masp_spends/00006.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index 20f320a7..84478c0d 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
index 20f320a7..84478c0d 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00004.png b/tests_zemu/snapshots/sp-mainmenu/00004.png
index 018b74ea..662199a2 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00004.png and b/tests_zemu/snapshots/sp-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/sp-mainmenu/00010.png b/tests_zemu/snapshots/sp-mainmenu/00010.png
index 018b74ea..662199a2 100644
Binary files a/tests_zemu/snapshots/sp-mainmenu/00010.png and b/tests_zemu/snapshots/sp-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00001.png b/tests_zemu/snapshots/st-mainmenu/00001.png
index 9bb4b1aa..20194320 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00001.png and b/tests_zemu/snapshots/st-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00002.png b/tests_zemu/snapshots/st-mainmenu/00002.png
index e7796e3b..f1420fd3 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00002.png and b/tests_zemu/snapshots/st-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00003.png b/tests_zemu/snapshots/st-mainmenu/00003.png
index 9bb4b1aa..20194320 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00003.png and b/tests_zemu/snapshots/st-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/st-mainmenu/00004.png b/tests_zemu/snapshots/st-mainmenu/00004.png
index 46f0af54..67d7fe06 100644
Binary files a/tests_zemu/snapshots/st-mainmenu/00004.png and b/tests_zemu/snapshots/st-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00000.png b/tests_zemu/snapshots/st-sign-masp-transfer/00000.png
index 6fb558e6..63471c26 100644
Binary files a/tests_zemu/snapshots/st-sign-masp-transfer/00000.png and b/tests_zemu/snapshots/st-sign-masp-transfer/00000.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00001.png b/tests_zemu/snapshots/st-sign-masp-transfer/00001.png
index b66b06af..3c6d6ff7 100644
Binary files a/tests_zemu/snapshots/st-sign-masp-transfer/00001.png and b/tests_zemu/snapshots/st-sign-masp-transfer/00001.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00002.png b/tests_zemu/snapshots/st-sign-masp-transfer/00002.png
index 1a80d615..77de13b7 100644
Binary files a/tests_zemu/snapshots/st-sign-masp-transfer/00002.png and b/tests_zemu/snapshots/st-sign-masp-transfer/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00003.png b/tests_zemu/snapshots/st-sign-masp-transfer/00003.png
index 519e57d2..269bd098 100644
Binary files a/tests_zemu/snapshots/st-sign-masp-transfer/00003.png and b/tests_zemu/snapshots/st-sign-masp-transfer/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00004.png b/tests_zemu/snapshots/st-sign-masp-transfer/00004.png
index 3a0759ec..b82b810d 100644
Binary files a/tests_zemu/snapshots/st-sign-masp-transfer/00004.png and b/tests_zemu/snapshots/st-sign-masp-transfer/00004.png differ
diff --git a/tests_zemu/snapshots/st-sign-masp-transfer/00005.png b/tests_zemu/snapshots/st-sign-masp-transfer/00005.png
index d7358d6e..91413c03 100644
Binary files a/tests_zemu/snapshots/st-sign-masp-transfer/00005.png and b/tests_zemu/snapshots/st-sign-masp-transfer/00005.png differ
diff --git a/tests_zemu/snapshots/st-sign-multisig_address/00002.png b/tests_zemu/snapshots/st-sign-multisig_address/00002.png
index 4dc60474..fcb020f5 100644
Binary files a/tests_zemu/snapshots/st-sign-multisig_address/00002.png and b/tests_zemu/snapshots/st-sign-multisig_address/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign-multisig_address/00003.png b/tests_zemu/snapshots/st-sign-multisig_address/00003.png
index 71735e2d..17937bce 100644
Binary files a/tests_zemu/snapshots/st-sign-multisig_address/00003.png and b/tests_zemu/snapshots/st-sign-multisig_address/00003.png differ
diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00002.png b/tests_zemu/snapshots/st-sign_masp_spends/00002.png
index aaba032a..b8b4d9f6 100644
Binary files a/tests_zemu/snapshots/st-sign_masp_spends/00002.png and b/tests_zemu/snapshots/st-sign_masp_spends/00002.png differ
diff --git a/tests_zemu/snapshots/st-sign_masp_spends/00006.png b/tests_zemu/snapshots/st-sign_masp_spends/00006.png
index 8984821e..84d7c71f 100644
Binary files a/tests_zemu/snapshots/st-sign_masp_spends/00006.png and b/tests_zemu/snapshots/st-sign_masp_spends/00006.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 018b74ea..662199a2 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00010.png b/tests_zemu/snapshots/x-mainmenu/00010.png
index 018b74ea..662199a2 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00010.png and b/tests_zemu/snapshots/x-mainmenu/00010.png differ