diff --git a/Cargo.lock b/Cargo.lock
index 5eb897b..8632ea3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1988,7 +1988,7 @@ dependencies = [
 
 [[package]]
 name = "starknet"
-version = "2.2.0"
+version = "2.2.1"
 dependencies = [
  "hex",
  "include_gif",
diff --git a/starknet/Cargo.toml b/starknet/Cargo.toml
index 09fe8db..71b39f5 100644
--- a/starknet/Cargo.toml
+++ b/starknet/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "starknet"
-version = "2.2.0"
+version = "2.2.1"
 edition = "2021"
 authors = ["Ledger"]
 
diff --git a/starknet/src/display.rs b/starknet/src/display.rs
index 3ec6fe2..02c066b 100644
--- a/starknet/src/display.rs
+++ b/starknet/src/display.rs
@@ -17,13 +17,12 @@ use ledger_device_sdk::ui::{
     },
 };
 
-#[cfg(any(target_os = "stax", target_os = "flex"))]
 use crate::settings::Settings;
 #[cfg(any(target_os = "stax", target_os = "flex"))]
 use ledger_device_sdk::nbgl::{
     Field, NbglChoice, NbglGenericReview, NbglGlyph, NbglHomeAndSettings, NbglPageContent,
-    NbglReview, NbglReviewStatus, NbglStatus, PageIndex, TagValueConfirm, TagValueList,
-    TransactionType, TuneIndex,
+    NbglReview, NbglReviewStatus, NbglSpinner, NbglStatus, PageIndex, StatusType, TagValueConfirm,
+    TagValueList, TransactionType, TuneIndex,
 };
 
 pub fn show_tx(ctx: &mut Ctx) -> Option<bool> {
@@ -58,7 +57,7 @@ pub fn show_tx(ctx: &mut Ctx) -> Option<bool> {
 
             let my_fields = [
                 Field {
-                    name: "Deployed account",
+                    name: "Deploy account",
                     value: contract_address.as_str(),
                 },
                 Field {
@@ -92,7 +91,7 @@ pub fn show_tx(ctx: &mut Ctx) -> Option<bool> {
 
                 let review = NbglReview::new()
                     .tx_type(TransactionType::Transaction)
-                    .titles("Review", "Transaction", "Sign Transaction")
+                    .titles("Review transaction", "", "Sign Transaction ?")
                     .glyph(&APP_ICON);
 
                 Some(review.show(&my_fields))
@@ -172,7 +171,7 @@ pub fn show_tx(ctx: &mut Ctx) -> Option<bool> {
 
                         let review = NbglReview::new()
                             .tx_type(TransactionType::Transaction)
-                            .titles("Review", "Transaction", "Sign Transaction")
+                            .titles("Review transaction", "", "Sign Transaction ?")
                             .glyph(&APP_ICON);
 
                         Some(review.show(&my_fields))
@@ -198,68 +197,20 @@ pub fn show_hash(ctx: &mut Ctx, is_tx_hash: bool) -> bool {
 
     #[cfg(not(any(target_os = "stax", target_os = "flex")))]
     {
-        let accept = if is_tx_hash {
-            let page_0 = Page::new(
-                PageStyle::PictureNormal,
-                ["This transaction ", "cannot be trusted"],
-                Some(&WARNING),
-            );
-            let page_1 = Page::new(
-                PageStyle::PictureNormal,
-                ["Your Ledger cannot ", "decode this transaction."],
-                Some(&WARNING),
-            );
-            let page_2 = Page::new(
-                PageStyle::PictureNormal,
-                ["If you sign it, you", "could be authorizing"],
-                Some(&WARNING),
-            );
-            let page_3 = Page::new(
-                PageStyle::PictureNormal,
-                ["malicious actions that", "can drain your wallet."],
-                Some(&WARNING),
-            );
-
-            clear_screen();
-            page_0.place_and_wait();
-            clear_screen();
-            page_1.place_and_wait();
-            clear_screen();
-            page_2.place_and_wait();
-            clear_screen();
-            page_3.place_and_wait();
-
-            let warning_accept = MultiFieldReview::new(
-                &[],
-                &["I understand the risk"],
-                Some(&EYE),
-                "Accept",
-                Some(&VALIDATE_14),
-                "Reject",
-                Some(&CROSSMARK),
-            );
-
-            warning_accept.show()
-        } else {
-            true
-        };
-
-        match accept {
-            false => false,
-            true => {
-                let my_review = MultiFieldReview::new(
-                    &my_field,
-                    &["Confirm Hash to sign"],
-                    Some(&EYE),
-                    "Approve",
-                    Some(&VALIDATE_14),
-                    "Reject",
-                    Some(&CROSSMARK),
-                );
+        let page = Page::new(PageStyle::PictureBold, ["Blind", "Signing"], Some(&WARNING));
+        clear_screen();
+        page.place_and_wait();
 
-                my_review.show()
-            }
-        }
+        let my_review = MultiFieldReview::new(
+            &my_field,
+            &["Confirm Hash to sign"],
+            Some(&EYE),
+            "Approve",
+            Some(&VALIDATE_14),
+            "Reject",
+            Some(&CROSSMARK),
+        );
+        my_review.show()
     }
     #[cfg(any(target_os = "stax", target_os = "flex"))]
     {
@@ -272,46 +223,44 @@ pub fn show_hash(ctx: &mut Ctx, is_tx_hash: bool) -> bool {
         if is_tx_hash {
             review = review
                 .tx_type(TransactionType::Transaction)
-                .titles("Review", "Transaction", "Sign Transaction")
+                .titles("Review transaction", "", "Sign Transaction ?")
                 .blind();
         } else {
             review = review
                 .tx_type(TransactionType::Message)
-                .titles("Review", "Hash", "Sign Hash")
+                .titles("Review hash", "", "Sign Hash ?")
                 .blind();
         }
 
-        let res = review.show(&my_field);
-        ctx.home.show_and_return();
-        res
+        review.show(&my_field)
     }
 }
 
 pub fn show_pending() {
     #[cfg(not(any(target_os = "stax", target_os = "flex")))]
     {
-        let page_0 = Page::new(
-            PageStyle::BoldNormal,
-            ["Processing ", "Transaction..."],
-            None,
-        );
+        let page_0 = Page::new(PageStyle::BoldNormal, ["Computing ", "Tx Hash..."], None);
         clear_screen();
         page_0.place();
     }
     #[cfg(any(target_os = "stax", target_os = "flex"))]
     {
-        let spinner = NbglStatus::new();
-        spinner.text("Processing Transaction...").show(true);
+        let spinner = NbglSpinner::new();
+        spinner.text("Computing Tx Hash...").show();
     }
 }
 
 #[allow(unused_variables)]
-pub fn show_status(flag: bool, ctx: &mut Ctx) {
+pub fn show_status(flag: bool, is_tx: bool, ctx: &mut Ctx) {
     #[cfg(not(any(target_os = "stax", target_os = "flex")))]
     {
+        let msg = match is_tx {
+            true => "Transaction ",
+            false => "Message ",
+        };
         let content = match flag {
-            true => ["Transaction ", "signed"],
-            false => ["Transaction ", "rejected"],
+            true => [msg, "signed"],
+            false => [msg, "rejected"],
         };
         let page_0 = Page::new(PageStyle::BoldNormal, content, None);
         clear_screen();
@@ -319,7 +268,10 @@ pub fn show_status(flag: bool, ctx: &mut Ctx) {
     }
     #[cfg(any(target_os = "stax", target_os = "flex"))]
     {
-        let status = NbglReviewStatus::new();
+        let status = match is_tx {
+            true => NbglReviewStatus::new().status_type(StatusType::Transaction),
+            false => NbglReviewStatus::new().status_type(StatusType::Message),
+        };
         status.show(flag);
         ctx.home.show_and_return();
     }
@@ -398,6 +350,40 @@ fn about_ui(comm: &mut Comm) -> Event<Ins> {
     }
 }
 
+#[cfg(not(any(target_os = "stax", target_os = "flex")))]
+fn settings_ui(comm: &mut Comm) -> Event<Ins> {
+    {
+        let settings: Settings = Default::default();
+        let mut bs_enabled: bool = settings.get_element(0) != 0;
+        let mut bs_status = if bs_enabled { "Enabled" } else { "Disabled" };
+
+        loop {
+            let pages = [
+                &Page::from((["Blind Signing", bs_status], true)),
+                &Page::from(("Back", &BACK)),
+            ];
+            match MultiPageMenu::new(comm, &pages).show() {
+                EventOrPageIndex::Event(e) => return e,
+                EventOrPageIndex::Index(0) => {
+                    bs_enabled = !bs_enabled;
+                    match bs_enabled {
+                        true => {
+                            settings.set_element(0, 1);
+                            bs_status = "Enabled";
+                        }
+                        false => {
+                            settings.set_element(0, 0);
+                            bs_status = "Disabled";
+                        }
+                    }
+                }
+                EventOrPageIndex::Index(1) => return main_ui(comm),
+                EventOrPageIndex::Index(_) => (),
+            }
+        }
+    }
+}
+
 #[cfg(not(any(target_os = "stax", target_os = "flex")))]
 pub fn main_ui(comm: &mut Comm) -> Event<Ins> {
     const APP_ICON: Glyph = Glyph::from_include(include_gif!("starknet_small.gif"));
@@ -406,14 +392,16 @@ pub fn main_ui(comm: &mut Comm) -> Event<Ins> {
         // without having to use the new() function.
         &Page::from((["Starknet", "is ready"], &APP_ICON)),
         &Page::from((["Version", env!("CARGO_PKG_VERSION")], true)),
+        &Page::from(("Settings", &EYE)),
         &Page::from(("About", &CERTIFICATE)),
         &Page::from(("Quit", &DASHBOARD_X)),
     ];
     loop {
         match MultiPageMenu::new(comm, &pages).show() {
             EventOrPageIndex::Event(e) => return e,
-            EventOrPageIndex::Index(2) => return about_ui(comm),
-            EventOrPageIndex::Index(3) => ledger_device_sdk::exit_app(0),
+            EventOrPageIndex::Index(2) => return settings_ui(comm),
+            EventOrPageIndex::Index(3) => return about_ui(comm),
+            EventOrPageIndex::Index(4) => ledger_device_sdk::exit_app(0),
             EventOrPageIndex::Index(_) => (),
         }
     }
@@ -424,7 +412,7 @@ pub fn main_ui_nbgl(_comm: &mut Comm) -> NbglHomeAndSettings {
     // Load glyph from 64x64 4bpp gif file with include_gif macro. Creates an NBGL compatible glyph.
     const APP_ICON: NbglGlyph = NbglGlyph::from_include(include_gif!("starknet_64x64.gif", NBGL));
 
-    let settings_strings = [["Enable Blind signing", "Allow blind signing"]];
+    let settings_strings = [["Blind signing", "Enable transaction blind signing"]];
     let mut settings: Settings = Default::default();
 
     // Display the home screen.
@@ -438,20 +426,34 @@ pub fn main_ui_nbgl(_comm: &mut Comm) -> NbglHomeAndSettings {
         .settings(settings.get_mut(), &settings_strings)
 }
 
-#[cfg(any(target_os = "stax", target_os = "flex"))]
+#[allow(unused_variables)]
 pub fn blind_signing_enable_ui(ctx: &mut Ctx) {
-    let choice = NbglChoice::new().show(
-        "This transaction cannot be clear-signed",
-        "Enable blind-signing in the settings to sign this transaction",
-        "Go to settings",
-        "Reject transaction",
-    );
-    if choice {
-        ctx.home.set_start_page(PageIndex::Settings(0));
-        ctx.home.show_and_return();
-        ctx.home.set_start_page(PageIndex::Home);
-    } else {
-        ctx.home.show_and_return();
+    #[cfg(not(any(target_os = "stax", target_os = "flex")))]
+    {
+        let page = Page::new(
+            PageStyle::PictureNormal,
+            ["Blind signing must ", "be enabled in Settings"],
+            Some(&CROSSMARK),
+        );
+
+        clear_screen();
+        page.place_and_wait();
+    }
+    #[cfg(any(target_os = "stax", target_os = "flex"))]
+    {
+        let choice = NbglChoice::new().show(
+            "This transaction cannot be clear-signed",
+            "Enable blind-signing in the settings to sign this transaction",
+            "Go to settings",
+            "Reject transaction",
+        );
+        if choice {
+            ctx.home.set_start_page(PageIndex::Settings(0));
+            ctx.home.show_and_return();
+            ctx.home.set_start_page(PageIndex::Home);
+        } else {
+            ctx.home.show_and_return();
+        }
     }
 }
 
diff --git a/starknet/src/main.rs b/starknet/src/main.rs
index 1206113..572ba47 100644
--- a/starknet/src/main.rs
+++ b/starknet/src/main.rs
@@ -16,7 +16,6 @@ use context::{Ctx, DeployAccountTransaction, InvokeTransaction, RequestType, Tra
 use ledger_device_sdk::io;
 use types::FieldElement;
 
-#[cfg(any(target_os = "stax", target_os = "flex"))]
 use settings::Settings;
 
 ledger_device_sdk::set_panic!(ledger_device_sdk::exiting_panic);
@@ -37,13 +36,7 @@ extern "C" fn sample_main() {
             // Wait for either a specific button push to exit the app
             // or an APDU command
             if let io::Event::Command(ins) = display::main_ui(&mut comm) {
-                match handle_apdu(&mut comm, &ins, &mut ctx) {
-                    Ok(data) => {
-                        comm.append(data.as_slice());
-                        comm.reply_ok()
-                    }
-                    Err(sw) => comm.reply(sw),
-                }
+                handle_apdu(&mut comm, &ins, &mut ctx);
             }
         }
     }
@@ -60,13 +53,7 @@ extern "C" fn sample_main() {
         loop {
             // Wait for an APDU command
             let ins: Ins = comm.next_command();
-            match handle_apdu(&mut comm, &ins, &mut ctx) {
-                Ok(data) => {
-                    comm.append(data.as_slice());
-                    comm.reply_ok()
-                }
-                Err(sw) => comm.reply(sw),
-            }
+            handle_apdu(&mut comm, &ins, &mut ctx);
         }
     }
 }
@@ -115,9 +102,21 @@ use ledger_device_sdk::io::Reply;
 
 const SIG_LENGTH: u8 = 0x41;
 
-fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>, Reply> {
+fn send_data(comm: &mut io::Comm, data: Result<Option<Vec<u8>>, Reply>) {
+    match data {
+        Ok(data) => {
+            if let Some(data) = data {
+                comm.append(data.as_slice())
+            }
+            comm.reply_ok();
+        }
+        Err(sw) => comm.reply(sw),
+    }
+}
+
+fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) {
     if comm.rx == 0 {
-        return Err(io::StatusWords::NothingReceived.into());
+        send_data(comm, Err(io::StatusWords::NothingReceived.into()));
     }
 
     let apdu_header = comm.get_apdu_metadata();
@@ -131,23 +130,31 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
             let version_patch = env!("CARGO_PKG_VERSION_PATCH").parse::<u8>().unwrap();
 
             rdata.extend_from_slice([version_major, version_minor, version_patch].as_slice());
+
+            send_data(comm, Ok(Some(rdata)));
         }
         Ins::GetPubkey { display } => {
             ctx.reset();
             ctx.req_type = RequestType::GetPubkey;
 
-            let mut data = comm.get_data()?;
+            let mut data = match comm.get_data() {
+                Ok(data) => data,
+                Err(e) => {
+                    send_data(comm, Err(e.into()));
+                    return;
+                }
+            };
 
             let res = crypto::set_derivation_path(&mut data, ctx);
             match res {
                 Err(e) => {
-                    return Err(e.into());
+                    send_data(comm, Err(e.into()));
                 }
                 Ok(()) => {
                     let pub_key = crypto::get_pubkey(ctx);
                     match pub_key {
                         Err(e) => {
-                            return Err(Reply::from(e));
+                            send_data(comm, Err(Reply::from(e)));
                         }
                         Ok(key) => {
                             let ret = match display {
@@ -156,8 +163,9 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                             };
                             if ret {
                                 rdata.extend_from_slice(key.as_ref());
+                                send_data(comm, Ok(Some(rdata)));
                             } else {
-                                return Err(io::StatusWords::UserCancelled.into());
+                                send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                             }
                         }
                     }
@@ -167,34 +175,62 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
         #[cfg(feature = "signhash")]
         Ins::SignHash => {
             let p1 = apdu_header.p1;
-            let mut data = comm.get_data()?;
+            let mut data = match comm.get_data() {
+                Ok(data) => data,
+                Err(e) => {
+                    send_data(comm, Err(e.into()));
+                    return;
+                }
+            };
 
             match p1 {
                 0 => {
                     ctx.reset();
                     ctx.req_type = RequestType::SignHash;
 
-                    crypto::set_derivation_path(&mut data, ctx)?;
+                    match crypto::set_derivation_path(&mut data, ctx) {
+                        Ok(()) => {
+                            send_data(comm, Ok(None));
+                        }
+                        Err(e) => {
+                            send_data(comm, Err(e.into()));
+                        }
+                    }
                 }
                 _ => {
-                    ctx.hash.m_hash = data.into();
-                    match display::show_hash(ctx, false) {
-                        true => {
-                            crypto::sign_hash(ctx).unwrap();
-                            rdata.extend_from_slice([0x41].as_slice());
-                            rdata.extend_from_slice(ctx.hash.r.as_ref());
-                            rdata.extend_from_slice(ctx.hash.s.as_ref());
-                            rdata.extend_from_slice([ctx.hash.v].as_slice());
-                        }
-                        false => {
-                            return Err(io::StatusWords::UserCancelled.into());
+                    let settings: Settings = Default::default();
+                    if settings.get_element(0) == 0 {
+                        display::blind_signing_enable_ui(ctx);
+                        send_data(comm, Err(io::StatusWords::UserCancelled.into()));
+                    } else {
+                        ctx.hash.m_hash = data.into();
+                        match display::show_hash(ctx, false) {
+                            true => {
+                                crypto::sign_hash(ctx).unwrap();
+                                rdata.extend_from_slice([0x41].as_slice());
+                                rdata.extend_from_slice(ctx.hash.r.as_ref());
+                                rdata.extend_from_slice(ctx.hash.s.as_ref());
+                                rdata.extend_from_slice([ctx.hash.v].as_slice());
+                                display::show_status(true, false, ctx);
+                                send_data(comm, Ok(Some(rdata)));
+                            }
+                            false => {
+                                display::show_status(false, false, ctx);
+                                send_data(comm, Err(io::StatusWords::UserCancelled.into()));
+                            }
                         }
                     }
                 }
             }
         }
         Ins::SignTx => {
-            let mut data = comm.get_data()?;
+            let mut data = match comm.get_data() {
+                Ok(data) => data,
+                Err(e) => {
+                    send_data(comm, Err(e.into()));
+                    return;
+                }
+            };
             let p1 = apdu_header.p1;
             let p2 = apdu_header.p2;
 
@@ -204,19 +240,36 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                     ctx.req_type = RequestType::SignTx;
                     ctx.tx = Transaction::Invoke(InvokeTransaction::default());
 
-                    crypto::set_derivation_path(&mut data, ctx)?;
+                    match crypto::set_derivation_path(&mut data, ctx) {
+                        Ok(()) => {
+                            send_data(comm, Ok(None));
+                        }
+                        Err(e) => {
+                            send_data(comm, Err(e.into()));
+                        }
+                    }
+                }
+                1 => {
+                    transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V3);
+                    send_data(comm, Ok(None));
+                }
+                2 => {
+                    transaction::set_paymaster_data(data, p2, &mut ctx.tx);
+                    send_data(comm, Ok(None));
+                }
+                3 => {
+                    transaction::set_account_deployment_data(data, p2, &mut ctx.tx);
+                    send_data(comm, Ok(None));
                 }
-                1 => transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V3),
-                2 => transaction::set_paymaster_data(data, p2, &mut ctx.tx),
-                3 => transaction::set_account_deployment_data(data, p2, &mut ctx.tx),
                 4 => {
                     let nb_calls: u8 = FieldElement::from(data).into();
                     transaction::set_calldata_nb(&mut ctx.tx, nb_calls);
+                    send_data(comm, Ok(None));
                 }
                 5 => {
                     if let Some(err) = transaction::set_calldata(data, p2.into(), &mut ctx.tx).err()
                     {
-                        return Err(Reply(err as u16));
+                        send_data(comm, Err(Reply(err as u16)));
                     }
                     if p2 == transaction::SetCallStep::End.into()
                         && transaction::tx_complete(&ctx.tx)
@@ -232,50 +285,61 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                                     rdata.extend_from_slice(ctx.hash.r.as_ref());
                                     rdata.extend_from_slice(ctx.hash.s.as_ref());
                                     rdata.extend_from_slice([ctx.hash.v].as_slice());
-                                    display::show_status(true, ctx);
+                                    display::show_status(true, true, ctx);
+                                    send_data(comm, Ok(Some(rdata)));
                                 }
                                 false => {
-                                    display::show_status(false, ctx);
-                                    return Err(io::StatusWords::UserCancelled.into());
+                                    display::show_status(false, true, ctx);
+                                    send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                                 }
                             },
                             None => {
-                                #[cfg(any(target_os = "stax", target_os = "flex"))]
-                                {
-                                    let settings: Settings = Default::default();
-                                    if settings.get_element(0) == 0 {
-                                        display::blind_signing_enable_ui(ctx);
-                                        return Err(io::StatusWords::UserCancelled.into());
-                                    }
-                                }
-                                display::show_pending();
-                                ctx.hash.m_hash = crypto::tx_hash(&ctx.tx);
-                                match display::show_hash(ctx, true) {
-                                    true => {
-                                        rdata.extend_from_slice(ctx.hash.m_hash.value.as_ref());
-                                        crypto::sign_hash(ctx).unwrap();
-                                        rdata.extend_from_slice([SIG_LENGTH].as_slice());
-                                        rdata.extend_from_slice(ctx.hash.r.as_ref());
-                                        rdata.extend_from_slice(ctx.hash.s.as_ref());
-                                        rdata.extend_from_slice([ctx.hash.v].as_slice());
-                                        display::show_status(true, ctx);
-                                    }
-                                    false => {
-                                        display::show_status(false, ctx);
-                                        return Err(io::StatusWords::UserCancelled.into());
+                                let settings: Settings = Default::default();
+                                if settings.get_element(0) == 0 {
+                                    display::blind_signing_enable_ui(ctx);
+                                    send_data(comm, Err(io::StatusWords::UserCancelled.into()));
+                                } else {
+                                    display::show_pending();
+                                    ctx.hash.m_hash = crypto::tx_hash(&ctx.tx);
+                                    match display::show_hash(ctx, true) {
+                                        true => {
+                                            rdata.extend_from_slice(ctx.hash.m_hash.value.as_ref());
+                                            crypto::sign_hash(ctx).unwrap();
+                                            rdata.extend_from_slice([SIG_LENGTH].as_slice());
+                                            rdata.extend_from_slice(ctx.hash.r.as_ref());
+                                            rdata.extend_from_slice(ctx.hash.s.as_ref());
+                                            rdata.extend_from_slice([ctx.hash.v].as_slice());
+                                            display::show_status(true, true, ctx);
+                                            send_data(comm, Ok(Some(rdata)));
+                                        }
+                                        false => {
+                                            display::show_status(false, true, ctx);
+                                            send_data(
+                                                comm,
+                                                Err(io::StatusWords::UserCancelled.into()),
+                                            );
+                                        }
                                     }
                                 }
                             }
                         }
+                    } else {
+                        send_data(comm, Ok(None));
                     }
                 }
                 _ => {
-                    return Err(io::StatusWords::BadP1P2.into());
+                    send_data(comm, Err(io::StatusWords::BadP1P2.into()));
                 }
             }
         }
         Ins::SignTxV1 => {
-            let mut data = comm.get_data()?;
+            let mut data = match comm.get_data() {
+                Ok(data) => data,
+                Err(e) => {
+                    send_data(comm, Err(e.into()));
+                    return;
+                }
+            };
             let p1 = apdu_header.p1;
             let p2 = apdu_header.p2;
 
@@ -285,17 +349,28 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                     ctx.req_type = RequestType::SignTxV1;
                     ctx.tx = Transaction::Invoke(InvokeTransaction::default());
 
-                    crypto::set_derivation_path(&mut data, ctx)?;
+                    match crypto::set_derivation_path(&mut data, ctx) {
+                        Ok(()) => {
+                            send_data(comm, Ok(None));
+                        }
+                        Err(e) => {
+                            send_data(comm, Err(e.into()));
+                        }
+                    }
+                }
+                1 => {
+                    transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V1);
+                    send_data(comm, Ok(None));
                 }
-                1 => transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V1),
                 2 => {
                     let nb_calls: u8 = FieldElement::from(data).into();
                     transaction::set_calldata_nb(&mut ctx.tx, nb_calls);
+                    send_data(comm, Ok(None));
                 }
                 3 => {
                     if let Some(err) = transaction::set_calldata(data, p2.into(), &mut ctx.tx).err()
                     {
-                        return Err(Reply(err as u16));
+                        send_data(comm, Err(Reply(err as u16)));
                     }
                     if p2 == transaction::SetCallStep::End.into()
                         && transaction::tx_complete(&ctx.tx)
@@ -311,50 +386,61 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                                     rdata.extend_from_slice(ctx.hash.r.as_ref());
                                     rdata.extend_from_slice(ctx.hash.s.as_ref());
                                     rdata.extend_from_slice([ctx.hash.v].as_slice());
-                                    display::show_status(true, ctx);
+                                    display::show_status(true, true, ctx);
+                                    send_data(comm, Ok(Some(rdata)));
                                 }
                                 false => {
-                                    display::show_status(false, ctx);
-                                    return Err(io::StatusWords::UserCancelled.into());
+                                    display::show_status(false, true, ctx);
+                                    send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                                 }
                             },
                             None => {
-                                #[cfg(any(target_os = "stax", target_os = "flex"))]
-                                {
-                                    let settings: Settings = Default::default();
-                                    if settings.get_element(0) == 0 {
-                                        display::blind_signing_enable_ui(ctx);
-                                        return Err(io::StatusWords::UserCancelled.into());
-                                    }
-                                }
-                                display::show_pending();
-                                ctx.hash.m_hash = crypto::tx_hash(&ctx.tx);
-                                match display::show_hash(ctx, true) {
-                                    true => {
-                                        rdata.extend_from_slice(ctx.hash.m_hash.value.as_ref());
-                                        crypto::sign_hash(ctx).unwrap();
-                                        rdata.extend_from_slice([SIG_LENGTH].as_slice());
-                                        rdata.extend_from_slice(ctx.hash.r.as_ref());
-                                        rdata.extend_from_slice(ctx.hash.s.as_ref());
-                                        rdata.extend_from_slice([ctx.hash.v].as_slice());
-                                        display::show_status(true, ctx);
-                                    }
-                                    false => {
-                                        display::show_status(false, ctx);
-                                        return Err(io::StatusWords::UserCancelled.into());
+                                let settings: Settings = Default::default();
+                                if settings.get_element(0) == 0 {
+                                    display::blind_signing_enable_ui(ctx);
+                                    send_data(comm, Err(io::StatusWords::UserCancelled.into()));
+                                } else {
+                                    display::show_pending();
+                                    ctx.hash.m_hash = crypto::tx_hash(&ctx.tx);
+                                    match display::show_hash(ctx, true) {
+                                        true => {
+                                            rdata.extend_from_slice(ctx.hash.m_hash.value.as_ref());
+                                            crypto::sign_hash(ctx).unwrap();
+                                            rdata.extend_from_slice([SIG_LENGTH].as_slice());
+                                            rdata.extend_from_slice(ctx.hash.r.as_ref());
+                                            rdata.extend_from_slice(ctx.hash.s.as_ref());
+                                            rdata.extend_from_slice([ctx.hash.v].as_slice());
+                                            display::show_status(true, true, ctx);
+                                            send_data(comm, Ok(Some(rdata)));
+                                        }
+                                        false => {
+                                            display::show_status(false, true, ctx);
+                                            send_data(
+                                                comm,
+                                                Err(io::StatusWords::UserCancelled.into()),
+                                            );
+                                        }
                                     }
                                 }
                             }
                         }
+                    } else {
+                        send_data(comm, Ok(None));
                     }
                 }
                 _ => {
-                    return Err(io::StatusWords::BadP1P2.into());
+                    send_data(comm, Err(io::StatusWords::BadP1P2.into()));
                 }
             }
         }
         Ins::SignDeployAccount => {
-            let mut data = comm.get_data()?;
+            let mut data = match comm.get_data() {
+                Ok(data) => data,
+                Err(e) => {
+                    send_data(comm, Err(e.into()));
+                    return;
+                }
+            };
             let p1 = apdu_header.p1;
             let p2 = apdu_header.p2;
 
@@ -364,19 +450,36 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                     ctx.req_type = RequestType::SignDeployAccount;
                     ctx.tx = Transaction::DeployAccount(DeployAccountTransaction::default());
 
-                    crypto::set_derivation_path(&mut data, ctx)?;
+                    match crypto::set_derivation_path(&mut data, ctx) {
+                        Ok(()) => {
+                            send_data(comm, Ok(None));
+                        }
+                        Err(e) => {
+                            send_data(comm, Err(e.into()));
+                        }
+                    }
+                }
+                1 => {
+                    transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V3);
+                    send_data(comm, Ok(None));
+                }
+                2 => {
+                    transaction::set_tx_fees(data, &mut ctx.tx);
+                    send_data(comm, Ok(None));
+                }
+                3 => {
+                    transaction::set_paymaster_data(data, p2, &mut ctx.tx);
+                    send_data(comm, Ok(None));
                 }
-                1 => transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V3),
-                2 => transaction::set_tx_fees(data, &mut ctx.tx),
-                3 => transaction::set_paymaster_data(data, p2, &mut ctx.tx),
                 4 => {
                     let constructor_calldata_length: u8 = FieldElement::from(data).into();
                     transaction::set_calldata_nb(&mut ctx.tx, constructor_calldata_length);
+                    send_data(comm, Ok(None));
                 }
                 5 => {
                     if let Some(err) = transaction::set_calldata(data, p2.into(), &mut ctx.tx).err()
                     {
-                        return Err(Reply(err as u16));
+                        send_data(comm, Err(Reply(err as u16)));
                     }
                     if transaction::tx_complete(&ctx.tx) {
                         match display::show_tx(ctx) {
@@ -390,26 +493,35 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                                     rdata.extend_from_slice(ctx.hash.r.as_ref());
                                     rdata.extend_from_slice(ctx.hash.s.as_ref());
                                     rdata.extend_from_slice([ctx.hash.v].as_slice());
-                                    display::show_status(true, ctx);
+                                    display::show_status(true, true, ctx);
+                                    send_data(comm, Ok(Some(rdata)));
                                 }
                                 false => {
-                                    display::show_status(false, ctx);
-                                    return Err(io::StatusWords::UserCancelled.into());
+                                    display::show_status(false, true, ctx);
+                                    send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                                 }
                             },
                             None => {
-                                return Err(io::StatusWords::UserCancelled.into());
+                                send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                             }
                         }
+                    } else {
+                        send_data(comm, Ok(None));
                     }
                 }
                 _ => {
-                    return Err(io::StatusWords::BadP1P2.into());
+                    send_data(comm, Err(io::StatusWords::BadP1P2.into()));
                 }
             }
         }
         Ins::SignDeployAccountV1 => {
-            let mut data = comm.get_data()?;
+            let mut data = match comm.get_data() {
+                Ok(data) => data,
+                Err(e) => {
+                    send_data(comm, Err(e.into()));
+                    return;
+                }
+            };
             let p1 = apdu_header.p1;
             let p2 = apdu_header.p2;
 
@@ -419,18 +531,32 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                     ctx.req_type = RequestType::SignDeployAccountV1;
                     ctx.tx = Transaction::DeployAccount(DeployAccountTransaction::default());
 
-                    crypto::set_derivation_path(&mut data, ctx)?;
+                    match crypto::set_derivation_path(&mut data, ctx) {
+                        Ok(()) => {
+                            send_data(comm, Ok(None));
+                        }
+                        Err(e) => {
+                            send_data(comm, Err(e.into()));
+                        }
+                    }
+                }
+                1 => {
+                    transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V1);
+                    send_data(comm, Ok(None));
+                }
+                2 => {
+                    transaction::set_tx_fees(data, &mut ctx.tx);
+                    send_data(comm, Ok(None));
                 }
-                1 => transaction::set_tx_fields(data, &mut ctx.tx, transaction::TxVersion::V1),
-                2 => transaction::set_tx_fees(data, &mut ctx.tx),
                 3 => {
                     let constructor_calldata_length: u8 = FieldElement::from(data).into();
                     transaction::set_calldata_nb(&mut ctx.tx, constructor_calldata_length);
+                    send_data(comm, Ok(None));
                 }
                 4 => {
                     if let Some(err) = transaction::set_calldata(data, p2.into(), &mut ctx.tx).err()
                     {
-                        return Err(Reply(err as u16));
+                        send_data(comm, Err(Reply(err as u16)));
                     }
                     if transaction::tx_complete(&ctx.tx) {
                         match display::show_tx(ctx) {
@@ -444,21 +570,24 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
                                     rdata.extend_from_slice(ctx.hash.r.as_ref());
                                     rdata.extend_from_slice(ctx.hash.s.as_ref());
                                     rdata.extend_from_slice([ctx.hash.v].as_slice());
-                                    display::show_status(true, ctx);
+                                    display::show_status(true, true, ctx);
+                                    send_data(comm, Ok(Some(rdata)));
                                 }
                                 false => {
-                                    display::show_status(false, ctx);
-                                    return Err(io::StatusWords::UserCancelled.into());
+                                    display::show_status(false, true, ctx);
+                                    send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                                 }
                             },
                             None => {
-                                return Err(io::StatusWords::UserCancelled.into());
+                                send_data(comm, Err(io::StatusWords::UserCancelled.into()));
                             }
                         }
+                    } else {
+                        send_data(comm, Ok(None));
                     }
                 }
                 _ => {
-                    return Err(io::StatusWords::BadP1P2.into());
+                    send_data(comm, Err(io::StatusWords::BadP1P2.into()));
                 }
             }
         }
@@ -513,5 +642,4 @@ fn handle_apdu(comm: &mut io::Comm, ins: &Ins, ctx: &mut Ctx) -> Result<Vec<u8>,
             }
         }
     }
-    Ok(rdata)
 }
diff --git a/starknet/src/types.rs b/starknet/src/types.rs
index f848f15..107a584 100644
--- a/starknet/src/types.rs
+++ b/starknet/src/types.rs
@@ -89,11 +89,15 @@ impl FieldElement {
     #[allow(clippy::wrong_self_convention)]
     pub fn to_dec_string(&self, decimals: Option<usize>) -> String {
         let bn = BigUint::from_bytes_be(self.value.as_ref());
+        if bn == BigUint::ZERO {
+            return "0".to_string();
+        }
         match decimals {
             Some(d) => {
-                let bn_str = bn.to_string();
+                let mut bn_str = bn.to_string();
                 let len = bn_str.len();
                 if len <= d {
+                    bn_str = bn_str.trim_end_matches('0').to_string();
                     let mut s = String::from("0.");
                     s.push_str(&"0".repeat(d - len));
                     s.push_str(&bn_str);
@@ -102,6 +106,7 @@ impl FieldElement {
                     let (int_part, dec_part) = bn_str.split_at(len - d);
                     let mut s = String::from(int_part);
                     s.push('.');
+                    let dec_part = dec_part.trim_end_matches('0');
                     s.push_str(dec_part);
                     s
                 }
diff --git a/tests/snapshots/flex/test_app_mainmenu/00001.png b/tests/snapshots/flex/test_app_mainmenu/00001.png
index 54d300e..f62b426 100644
Binary files a/tests/snapshots/flex/test_app_mainmenu/00001.png and b/tests/snapshots/flex/test_app_mainmenu/00001.png differ
diff --git a/tests/snapshots/flex/test_app_mainmenu/00002.png b/tests/snapshots/flex/test_app_mainmenu/00002.png
index 7df496e..a3e147b 100644
Binary files a/tests/snapshots/flex/test_app_mainmenu/00002.png and b/tests/snapshots/flex/test_app_mainmenu/00002.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00000.png b/tests/snapshots/flex/test_blind_sign_tx_0/00000.png
index 8ddf1c5..acbb161 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00000.png and b/tests/snapshots/flex/test_blind_sign_tx_0/00000.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00001.png b/tests/snapshots/flex/test_blind_sign_tx_0/00001.png
index acbb161..47eb334 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00001.png and b/tests/snapshots/flex/test_blind_sign_tx_0/00001.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00002.png b/tests/snapshots/flex/test_blind_sign_tx_0/00002.png
index fec9f86..3d8bf7e 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00002.png and b/tests/snapshots/flex/test_blind_sign_tx_0/00002.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00003.png b/tests/snapshots/flex/test_blind_sign_tx_0/00003.png
index 3d8bf7e..8984c20 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00003.png and b/tests/snapshots/flex/test_blind_sign_tx_0/00003.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00004.png b/tests/snapshots/flex/test_blind_sign_tx_0/00004.png
index 597f65b..be51a9d 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00004.png and b/tests/snapshots/flex/test_blind_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00005.png b/tests/snapshots/flex/test_blind_sign_tx_0/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00005.png and b/tests/snapshots/flex/test_blind_sign_tx_0/00005.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_0/00006.png b/tests/snapshots/flex/test_blind_sign_tx_0/00006.png
deleted file mode 100644
index 89ba60a..0000000
Binary files a/tests/snapshots/flex/test_blind_sign_tx_0/00006.png and /dev/null differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00000.png b/tests/snapshots/flex/test_blind_sign_tx_1/00000.png
index 8ddf1c5..acbb161 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00000.png and b/tests/snapshots/flex/test_blind_sign_tx_1/00000.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00001.png b/tests/snapshots/flex/test_blind_sign_tx_1/00001.png
index acbb161..47eb334 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00001.png and b/tests/snapshots/flex/test_blind_sign_tx_1/00001.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00002.png b/tests/snapshots/flex/test_blind_sign_tx_1/00002.png
index fec9f86..3d3081a 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00002.png and b/tests/snapshots/flex/test_blind_sign_tx_1/00002.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00003.png b/tests/snapshots/flex/test_blind_sign_tx_1/00003.png
index 3d3081a..8984c20 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00003.png and b/tests/snapshots/flex/test_blind_sign_tx_1/00003.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00004.png b/tests/snapshots/flex/test_blind_sign_tx_1/00004.png
index 597f65b..be51a9d 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00004.png and b/tests/snapshots/flex/test_blind_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00005.png b/tests/snapshots/flex/test_blind_sign_tx_1/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00005.png and b/tests/snapshots/flex/test_blind_sign_tx_1/00005.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_1/00006.png b/tests/snapshots/flex/test_blind_sign_tx_1/00006.png
deleted file mode 100644
index 89ba60a..0000000
Binary files a/tests/snapshots/flex/test_blind_sign_tx_1/00006.png and /dev/null differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00000.png b/tests/snapshots/flex/test_blind_sign_tx_2/00000.png
index 8ddf1c5..acbb161 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00000.png and b/tests/snapshots/flex/test_blind_sign_tx_2/00000.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00001.png b/tests/snapshots/flex/test_blind_sign_tx_2/00001.png
index acbb161..47eb334 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00001.png and b/tests/snapshots/flex/test_blind_sign_tx_2/00001.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00002.png b/tests/snapshots/flex/test_blind_sign_tx_2/00002.png
index fec9f86..bea0dde 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00002.png and b/tests/snapshots/flex/test_blind_sign_tx_2/00002.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00003.png b/tests/snapshots/flex/test_blind_sign_tx_2/00003.png
index bea0dde..8984c20 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00003.png and b/tests/snapshots/flex/test_blind_sign_tx_2/00003.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00004.png b/tests/snapshots/flex/test_blind_sign_tx_2/00004.png
index 597f65b..be51a9d 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00004.png and b/tests/snapshots/flex/test_blind_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00005.png b/tests/snapshots/flex/test_blind_sign_tx_2/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00005.png and b/tests/snapshots/flex/test_blind_sign_tx_2/00005.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_2/00006.png b/tests/snapshots/flex/test_blind_sign_tx_2/00006.png
deleted file mode 100644
index 89ba60a..0000000
Binary files a/tests/snapshots/flex/test_blind_sign_tx_2/00006.png and /dev/null differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00000.png b/tests/snapshots/flex/test_blind_sign_tx_3/00000.png
index 8ddf1c5..acbb161 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00000.png and b/tests/snapshots/flex/test_blind_sign_tx_3/00000.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00001.png b/tests/snapshots/flex/test_blind_sign_tx_3/00001.png
index acbb161..47eb334 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00001.png and b/tests/snapshots/flex/test_blind_sign_tx_3/00001.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00002.png b/tests/snapshots/flex/test_blind_sign_tx_3/00002.png
index fec9f86..599c84f 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00002.png and b/tests/snapshots/flex/test_blind_sign_tx_3/00002.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00003.png b/tests/snapshots/flex/test_blind_sign_tx_3/00003.png
index 599c84f..8984c20 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00003.png and b/tests/snapshots/flex/test_blind_sign_tx_3/00003.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00004.png b/tests/snapshots/flex/test_blind_sign_tx_3/00004.png
index 597f65b..be51a9d 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00004.png and b/tests/snapshots/flex/test_blind_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00005.png b/tests/snapshots/flex/test_blind_sign_tx_3/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00005.png and b/tests/snapshots/flex/test_blind_sign_tx_3/00005.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_3/00006.png b/tests/snapshots/flex/test_blind_sign_tx_3/00006.png
deleted file mode 100644
index 89ba60a..0000000
Binary files a/tests/snapshots/flex/test_blind_sign_tx_3/00006.png and /dev/null differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00000.png b/tests/snapshots/flex/test_blind_sign_tx_4/00000.png
index 8ddf1c5..acbb161 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00000.png and b/tests/snapshots/flex/test_blind_sign_tx_4/00000.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00001.png b/tests/snapshots/flex/test_blind_sign_tx_4/00001.png
index acbb161..47eb334 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00001.png and b/tests/snapshots/flex/test_blind_sign_tx_4/00001.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00002.png b/tests/snapshots/flex/test_blind_sign_tx_4/00002.png
index fec9f86..00d54a5 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00002.png and b/tests/snapshots/flex/test_blind_sign_tx_4/00002.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00003.png b/tests/snapshots/flex/test_blind_sign_tx_4/00003.png
index 00d54a5..8984c20 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00003.png and b/tests/snapshots/flex/test_blind_sign_tx_4/00003.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00004.png b/tests/snapshots/flex/test_blind_sign_tx_4/00004.png
index 597f65b..be51a9d 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00004.png and b/tests/snapshots/flex/test_blind_sign_tx_4/00004.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00005.png b/tests/snapshots/flex/test_blind_sign_tx_4/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00005.png and b/tests/snapshots/flex/test_blind_sign_tx_4/00005.png differ
diff --git a/tests/snapshots/flex/test_blind_sign_tx_4/00006.png b/tests/snapshots/flex/test_blind_sign_tx_4/00006.png
deleted file mode 100644
index 89ba60a..0000000
Binary files a/tests/snapshots/flex/test_blind_sign_tx_4/00006.png and /dev/null differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00000.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00000.png
index 6cff07c..333cca5 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v1/00000.png and b/tests/snapshots/flex/test_clear_sign_deploy_v1/00000.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00001.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00001.png
index 5f1309a..7e334e1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v1/00001.png and b/tests/snapshots/flex/test_clear_sign_deploy_v1/00001.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00003.png
index fc7d079..d60a8f1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v1/00003.png and b/tests/snapshots/flex/test_clear_sign_deploy_v1/00003.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00004.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00004.png
index 8ddf1c5..be51a9d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v1/00004.png and b/tests/snapshots/flex/test_clear_sign_deploy_v1/00004.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v1/00005.png b/tests/snapshots/flex/test_clear_sign_deploy_v1/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v1/00005.png and b/tests/snapshots/flex/test_clear_sign_deploy_v1/00005.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00000.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00000.png
index 6cff07c..333cca5 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v3/00000.png and b/tests/snapshots/flex/test_clear_sign_deploy_v3/00000.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00001.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00001.png
index b2f28c6..f3ed0a1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v3/00001.png and b/tests/snapshots/flex/test_clear_sign_deploy_v3/00001.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00003.png
index fc7d079..d60a8f1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v3/00003.png and b/tests/snapshots/flex/test_clear_sign_deploy_v3/00003.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00004.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00004.png
index 8ddf1c5..be51a9d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v3/00004.png and b/tests/snapshots/flex/test_clear_sign_deploy_v3/00004.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_deploy_v3/00005.png b/tests/snapshots/flex/test_clear_sign_deploy_v3/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_deploy_v3/00005.png and b/tests/snapshots/flex/test_clear_sign_deploy_v3/00005.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00000.png b/tests/snapshots/flex/test_clear_sign_tx_0/00000.png
index 6cff07c..333cca5 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_0/00000.png and b/tests/snapshots/flex/test_clear_sign_tx_0/00000.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00001.png b/tests/snapshots/flex/test_clear_sign_tx_0/00001.png
index eccbdbd..cba8526 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_0/00001.png and b/tests/snapshots/flex/test_clear_sign_tx_0/00001.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00002.png b/tests/snapshots/flex/test_clear_sign_tx_0/00002.png
index 8ac0762..e8a412a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_0/00002.png and b/tests/snapshots/flex/test_clear_sign_tx_0/00002.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00003.png b/tests/snapshots/flex/test_clear_sign_tx_0/00003.png
index fc7d079..d60a8f1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_0/00003.png and b/tests/snapshots/flex/test_clear_sign_tx_0/00003.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00004.png b/tests/snapshots/flex/test_clear_sign_tx_0/00004.png
index 8ddf1c5..be51a9d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_0/00004.png and b/tests/snapshots/flex/test_clear_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_0/00005.png b/tests/snapshots/flex/test_clear_sign_tx_0/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_0/00005.png and b/tests/snapshots/flex/test_clear_sign_tx_0/00005.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00000.png b/tests/snapshots/flex/test_clear_sign_tx_1/00000.png
index 6cff07c..333cca5 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_1/00000.png and b/tests/snapshots/flex/test_clear_sign_tx_1/00000.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00001.png b/tests/snapshots/flex/test_clear_sign_tx_1/00001.png
index deed1fe..51b6b40 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_1/00001.png and b/tests/snapshots/flex/test_clear_sign_tx_1/00001.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00003.png b/tests/snapshots/flex/test_clear_sign_tx_1/00003.png
index fc7d079..d60a8f1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_1/00003.png and b/tests/snapshots/flex/test_clear_sign_tx_1/00003.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00004.png b/tests/snapshots/flex/test_clear_sign_tx_1/00004.png
index 8ddf1c5..be51a9d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_1/00004.png and b/tests/snapshots/flex/test_clear_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_1/00005.png b/tests/snapshots/flex/test_clear_sign_tx_1/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_1/00005.png and b/tests/snapshots/flex/test_clear_sign_tx_1/00005.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00000.png b/tests/snapshots/flex/test_clear_sign_tx_2/00000.png
index 6cff07c..333cca5 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_2/00000.png and b/tests/snapshots/flex/test_clear_sign_tx_2/00000.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00001.png b/tests/snapshots/flex/test_clear_sign_tx_2/00001.png
index 2f3087f..93c3f1d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_2/00001.png and b/tests/snapshots/flex/test_clear_sign_tx_2/00001.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00002.png b/tests/snapshots/flex/test_clear_sign_tx_2/00002.png
index 867f705..78d7e49 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_2/00002.png and b/tests/snapshots/flex/test_clear_sign_tx_2/00002.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00003.png b/tests/snapshots/flex/test_clear_sign_tx_2/00003.png
index fc7d079..d60a8f1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_2/00003.png and b/tests/snapshots/flex/test_clear_sign_tx_2/00003.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00004.png b/tests/snapshots/flex/test_clear_sign_tx_2/00004.png
index 8ddf1c5..be51a9d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_2/00004.png and b/tests/snapshots/flex/test_clear_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_2/00005.png b/tests/snapshots/flex/test_clear_sign_tx_2/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_2/00005.png and b/tests/snapshots/flex/test_clear_sign_tx_2/00005.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00000.png b/tests/snapshots/flex/test_clear_sign_tx_3/00000.png
index 6cff07c..333cca5 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_3/00000.png and b/tests/snapshots/flex/test_clear_sign_tx_3/00000.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00001.png b/tests/snapshots/flex/test_clear_sign_tx_3/00001.png
index 6f3386f..cfc867c 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_3/00001.png and b/tests/snapshots/flex/test_clear_sign_tx_3/00001.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00003.png b/tests/snapshots/flex/test_clear_sign_tx_3/00003.png
index fc7d079..d60a8f1 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_3/00003.png and b/tests/snapshots/flex/test_clear_sign_tx_3/00003.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00004.png b/tests/snapshots/flex/test_clear_sign_tx_3/00004.png
index 8ddf1c5..be51a9d 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_3/00004.png and b/tests/snapshots/flex/test_clear_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/flex/test_clear_sign_tx_3/00005.png b/tests/snapshots/flex/test_clear_sign_tx_3/00005.png
index be51a9d..89ba60a 100644
Binary files a/tests/snapshots/flex/test_clear_sign_tx_3/00005.png and b/tests/snapshots/flex/test_clear_sign_tx_3/00005.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_0/00001.png b/tests/snapshots/flex/test_sign_hash_0/00001.png
index 19f0951..3392516 100644
Binary files a/tests/snapshots/flex/test_sign_hash_0/00001.png and b/tests/snapshots/flex/test_sign_hash_0/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_0/00003.png b/tests/snapshots/flex/test_sign_hash_0/00003.png
index 8287e90..5166469 100644
Binary files a/tests/snapshots/flex/test_sign_hash_0/00003.png and b/tests/snapshots/flex/test_sign_hash_0/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_0/00004.png b/tests/snapshots/flex/test_sign_hash_0/00004.png
index 89ba60a..8b981d4 100644
Binary files a/tests/snapshots/flex/test_sign_hash_0/00004.png and b/tests/snapshots/flex/test_sign_hash_0/00004.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_1/00001.png b/tests/snapshots/flex/test_sign_hash_1/00001.png
index 19f0951..3392516 100644
Binary files a/tests/snapshots/flex/test_sign_hash_1/00001.png and b/tests/snapshots/flex/test_sign_hash_1/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_1/00003.png b/tests/snapshots/flex/test_sign_hash_1/00003.png
index 8287e90..5166469 100644
Binary files a/tests/snapshots/flex/test_sign_hash_1/00003.png and b/tests/snapshots/flex/test_sign_hash_1/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_1/00004.png b/tests/snapshots/flex/test_sign_hash_1/00004.png
index 89ba60a..8b981d4 100644
Binary files a/tests/snapshots/flex/test_sign_hash_1/00004.png and b/tests/snapshots/flex/test_sign_hash_1/00004.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_2/00001.png b/tests/snapshots/flex/test_sign_hash_2/00001.png
index 19f0951..3392516 100644
Binary files a/tests/snapshots/flex/test_sign_hash_2/00001.png and b/tests/snapshots/flex/test_sign_hash_2/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_2/00003.png b/tests/snapshots/flex/test_sign_hash_2/00003.png
index 8287e90..5166469 100644
Binary files a/tests/snapshots/flex/test_sign_hash_2/00003.png and b/tests/snapshots/flex/test_sign_hash_2/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_2/00004.png b/tests/snapshots/flex/test_sign_hash_2/00004.png
index 89ba60a..8b981d4 100644
Binary files a/tests/snapshots/flex/test_sign_hash_2/00004.png and b/tests/snapshots/flex/test_sign_hash_2/00004.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_3/00001.png b/tests/snapshots/flex/test_sign_hash_3/00001.png
index 19f0951..3392516 100644
Binary files a/tests/snapshots/flex/test_sign_hash_3/00001.png and b/tests/snapshots/flex/test_sign_hash_3/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_3/00003.png b/tests/snapshots/flex/test_sign_hash_3/00003.png
index 8287e90..5166469 100644
Binary files a/tests/snapshots/flex/test_sign_hash_3/00003.png and b/tests/snapshots/flex/test_sign_hash_3/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_3/00004.png b/tests/snapshots/flex/test_sign_hash_3/00004.png
index 89ba60a..8b981d4 100644
Binary files a/tests/snapshots/flex/test_sign_hash_3/00004.png and b/tests/snapshots/flex/test_sign_hash_3/00004.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_4/00001.png b/tests/snapshots/flex/test_sign_hash_4/00001.png
index 19f0951..3392516 100644
Binary files a/tests/snapshots/flex/test_sign_hash_4/00001.png and b/tests/snapshots/flex/test_sign_hash_4/00001.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_4/00003.png b/tests/snapshots/flex/test_sign_hash_4/00003.png
index 8287e90..5166469 100644
Binary files a/tests/snapshots/flex/test_sign_hash_4/00003.png and b/tests/snapshots/flex/test_sign_hash_4/00003.png differ
diff --git a/tests/snapshots/flex/test_sign_hash_4/00004.png b/tests/snapshots/flex/test_sign_hash_4/00004.png
index 89ba60a..8b981d4 100644
Binary files a/tests/snapshots/flex/test_sign_hash_4/00004.png and b/tests/snapshots/flex/test_sign_hash_4/00004.png differ
diff --git a/tests/snapshots/nanosp/test_app_mainmenu/00001.png b/tests/snapshots/nanosp/test_app_mainmenu/00001.png
index b3a905f..eb67edc 100644
Binary files a/tests/snapshots/nanosp/test_app_mainmenu/00001.png and b/tests/snapshots/nanosp/test_app_mainmenu/00001.png differ
diff --git a/tests/snapshots/nanosp/test_app_mainmenu/00002.png b/tests/snapshots/nanosp/test_app_mainmenu/00002.png
index 7e1a28c..7a0e6b4 100644
Binary files a/tests/snapshots/nanosp/test_app_mainmenu/00002.png and b/tests/snapshots/nanosp/test_app_mainmenu/00002.png differ
diff --git a/tests/snapshots/nanosp/test_app_mainmenu/00003.png b/tests/snapshots/nanosp/test_app_mainmenu/00003.png
index ca20b18..7e1a28c 100644
Binary files a/tests/snapshots/nanosp/test_app_mainmenu/00003.png and b/tests/snapshots/nanosp/test_app_mainmenu/00003.png differ
diff --git a/tests/snapshots/nanosp/test_app_mainmenu/00004.png b/tests/snapshots/nanosp/test_app_mainmenu/00004.png
new file mode 100644
index 0000000..ca20b18
Binary files /dev/null and b/tests/snapshots/nanosp/test_app_mainmenu/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00000.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00000.png and b/tests/snapshots/nanosp/test_blind_sign_tx_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00001.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00001.png and b/tests/snapshots/nanosp/test_blind_sign_tx_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00002.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00002.png
index 6cb2ed9..2ef6b5e 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00002.png and b/tests/snapshots/nanosp/test_blind_sign_tx_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00003.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00003.png
index 62530f7..1821910 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00003.png and b/tests/snapshots/nanosp/test_blind_sign_tx_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00004.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00004.png and b/tests/snapshots/nanosp/test_blind_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00005.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00005.png and b/tests/snapshots/nanosp/test_blind_sign_tx_0/00005.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00006.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00007.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00007.png
deleted file mode 100644
index 2ef6b5e..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00008.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00008.png
deleted file mode 100644
index 1821910..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00009.png b/tests/snapshots/nanosp/test_blind_sign_tx_0/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_0/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00000.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00000.png and b/tests/snapshots/nanosp/test_blind_sign_tx_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00001.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00001.png and b/tests/snapshots/nanosp/test_blind_sign_tx_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00002.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00002.png
index 6cb2ed9..e32bcb2 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00002.png and b/tests/snapshots/nanosp/test_blind_sign_tx_1/00002.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00003.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00003.png
index 62530f7..ffece7e 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00003.png and b/tests/snapshots/nanosp/test_blind_sign_tx_1/00003.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00004.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00004.png and b/tests/snapshots/nanosp/test_blind_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00005.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00005.png and b/tests/snapshots/nanosp/test_blind_sign_tx_1/00005.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00006.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00007.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00007.png
deleted file mode 100644
index e32bcb2..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00008.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00008.png
deleted file mode 100644
index ffece7e..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00009.png b/tests/snapshots/nanosp/test_blind_sign_tx_1/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_1/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00000.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00000.png and b/tests/snapshots/nanosp/test_blind_sign_tx_2/00000.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00001.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00001.png and b/tests/snapshots/nanosp/test_blind_sign_tx_2/00001.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00002.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00002.png
index 6cb2ed9..8a42142 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00002.png and b/tests/snapshots/nanosp/test_blind_sign_tx_2/00002.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00003.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00003.png
index 62530f7..6217f2b 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00003.png and b/tests/snapshots/nanosp/test_blind_sign_tx_2/00003.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00004.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00004.png and b/tests/snapshots/nanosp/test_blind_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00005.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00005.png and b/tests/snapshots/nanosp/test_blind_sign_tx_2/00005.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00006.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00007.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00007.png
deleted file mode 100644
index 8a42142..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00008.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00008.png
deleted file mode 100644
index 6217f2b..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00009.png b/tests/snapshots/nanosp/test_blind_sign_tx_2/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_2/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00000.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00000.png and b/tests/snapshots/nanosp/test_blind_sign_tx_3/00000.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00001.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00001.png and b/tests/snapshots/nanosp/test_blind_sign_tx_3/00001.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00002.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00002.png
index 6cb2ed9..e59d985 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00002.png and b/tests/snapshots/nanosp/test_blind_sign_tx_3/00002.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00003.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00003.png
index 62530f7..9247023 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00003.png and b/tests/snapshots/nanosp/test_blind_sign_tx_3/00003.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00004.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00004.png and b/tests/snapshots/nanosp/test_blind_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00005.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00005.png and b/tests/snapshots/nanosp/test_blind_sign_tx_3/00005.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00006.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00007.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00007.png
deleted file mode 100644
index e59d985..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00008.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00008.png
deleted file mode 100644
index 9247023..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00009.png b/tests/snapshots/nanosp/test_blind_sign_tx_3/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_3/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00000.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00000.png and b/tests/snapshots/nanosp/test_blind_sign_tx_4/00000.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00001.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00001.png and b/tests/snapshots/nanosp/test_blind_sign_tx_4/00001.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00002.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00002.png
index 6cb2ed9..97984bf 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00002.png and b/tests/snapshots/nanosp/test_blind_sign_tx_4/00002.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00003.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00003.png
index 62530f7..a55a82a 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00003.png and b/tests/snapshots/nanosp/test_blind_sign_tx_4/00003.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00004.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00004.png and b/tests/snapshots/nanosp/test_blind_sign_tx_4/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00005.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00005.png and b/tests/snapshots/nanosp/test_blind_sign_tx_4/00005.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00006.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00007.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00007.png
deleted file mode 100644
index 97984bf..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00008.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00008.png
deleted file mode 100644
index a55a82a..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00009.png b/tests/snapshots/nanosp/test_blind_sign_tx_4/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanosp/test_blind_sign_tx_4/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00001.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00001.png
index 54371f4..6bbe548 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00001.png and b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00002.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00002.png
index 8fbf844..2c0388f 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00002.png and b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00002.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00003.png
index 11ed13d..0e8b3e4 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00003.png and b/tests/snapshots/nanosp/test_clear_sign_deploy_v1/00003.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00001.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00001.png
index 54371f4..6bbe548 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00001.png and b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00001.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00002.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00002.png
index 8fbf844..2c0388f 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00002.png and b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00002.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00003.png
index 6473301..ef9a3ca 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00003.png and b/tests/snapshots/nanosp/test_clear_sign_deploy_v3/00003.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_0/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_0/00004.png
index ca73527..b607202 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_tx_0/00004.png and b/tests/snapshots/nanosp/test_clear_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_0/00007.png b/tests/snapshots/nanosp/test_clear_sign_tx_0/00007.png
index 8a531e7..5098187 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_tx_0/00007.png and b/tests/snapshots/nanosp/test_clear_sign_tx_0/00007.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_1/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_1/00004.png
index 7ae7090..e668a67 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_tx_1/00004.png and b/tests/snapshots/nanosp/test_clear_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_2/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_2/00004.png
index 20e4f0e..db4cc15 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_tx_2/00004.png and b/tests/snapshots/nanosp/test_clear_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_2/00007.png b/tests/snapshots/nanosp/test_clear_sign_tx_2/00007.png
index 6473301..ef9a3ca 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_tx_2/00007.png and b/tests/snapshots/nanosp/test_clear_sign_tx_2/00007.png differ
diff --git a/tests/snapshots/nanosp/test_clear_sign_tx_3/00004.png b/tests/snapshots/nanosp/test_clear_sign_tx_3/00004.png
index 13e51b6..0374091 100644
Binary files a/tests/snapshots/nanosp/test_clear_sign_tx_3/00004.png and b/tests/snapshots/nanosp/test_clear_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_0/00000.png b/tests/snapshots/nanosp/test_sign_hash_0/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_0/00000.png and b/tests/snapshots/nanosp/test_sign_hash_0/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_0/00001.png b/tests/snapshots/nanosp/test_sign_hash_0/00001.png
index ff9fc2b..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_0/00001.png and b/tests/snapshots/nanosp/test_sign_hash_0/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_0/00002.png b/tests/snapshots/nanosp/test_sign_hash_0/00002.png
index c2d4683..ff9fc2b 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_0/00002.png and b/tests/snapshots/nanosp/test_sign_hash_0/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_0/00003.png b/tests/snapshots/nanosp/test_sign_hash_0/00003.png
index 53ae651..c2d4683 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_0/00003.png and b/tests/snapshots/nanosp/test_sign_hash_0/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_0/00004.png b/tests/snapshots/nanosp/test_sign_hash_0/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_0/00004.png and b/tests/snapshots/nanosp/test_sign_hash_0/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_0/00010.png b/tests/snapshots/nanosp/test_sign_hash_0/00005.png
similarity index 100%
rename from tests/snapshots/nanosp/test_blind_sign_tx_0/00010.png
rename to tests/snapshots/nanosp/test_sign_hash_0/00005.png
diff --git a/tests/snapshots/nanosp/test_sign_hash_1/00000.png b/tests/snapshots/nanosp/test_sign_hash_1/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_1/00000.png and b/tests/snapshots/nanosp/test_sign_hash_1/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_1/00001.png b/tests/snapshots/nanosp/test_sign_hash_1/00001.png
index 5974e68..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_1/00001.png and b/tests/snapshots/nanosp/test_sign_hash_1/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_1/00002.png b/tests/snapshots/nanosp/test_sign_hash_1/00002.png
index 3256fd5..5974e68 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_1/00002.png and b/tests/snapshots/nanosp/test_sign_hash_1/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_1/00003.png b/tests/snapshots/nanosp/test_sign_hash_1/00003.png
index 53ae651..3256fd5 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_1/00003.png and b/tests/snapshots/nanosp/test_sign_hash_1/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_1/00004.png b/tests/snapshots/nanosp/test_sign_hash_1/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_1/00004.png and b/tests/snapshots/nanosp/test_sign_hash_1/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_1/00010.png b/tests/snapshots/nanosp/test_sign_hash_1/00005.png
similarity index 100%
rename from tests/snapshots/nanosp/test_blind_sign_tx_1/00010.png
rename to tests/snapshots/nanosp/test_sign_hash_1/00005.png
diff --git a/tests/snapshots/nanosp/test_sign_hash_2/00000.png b/tests/snapshots/nanosp/test_sign_hash_2/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_2/00000.png and b/tests/snapshots/nanosp/test_sign_hash_2/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_2/00001.png b/tests/snapshots/nanosp/test_sign_hash_2/00001.png
index 3b25292..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_2/00001.png and b/tests/snapshots/nanosp/test_sign_hash_2/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_2/00002.png b/tests/snapshots/nanosp/test_sign_hash_2/00002.png
index baa0e21..3b25292 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_2/00002.png and b/tests/snapshots/nanosp/test_sign_hash_2/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_2/00003.png b/tests/snapshots/nanosp/test_sign_hash_2/00003.png
index 53ae651..baa0e21 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_2/00003.png and b/tests/snapshots/nanosp/test_sign_hash_2/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_2/00004.png b/tests/snapshots/nanosp/test_sign_hash_2/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_2/00004.png and b/tests/snapshots/nanosp/test_sign_hash_2/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_2/00010.png b/tests/snapshots/nanosp/test_sign_hash_2/00005.png
similarity index 100%
rename from tests/snapshots/nanosp/test_blind_sign_tx_2/00010.png
rename to tests/snapshots/nanosp/test_sign_hash_2/00005.png
diff --git a/tests/snapshots/nanosp/test_sign_hash_3/00000.png b/tests/snapshots/nanosp/test_sign_hash_3/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_3/00000.png and b/tests/snapshots/nanosp/test_sign_hash_3/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_3/00001.png b/tests/snapshots/nanosp/test_sign_hash_3/00001.png
index 46e7447..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_3/00001.png and b/tests/snapshots/nanosp/test_sign_hash_3/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_3/00002.png b/tests/snapshots/nanosp/test_sign_hash_3/00002.png
index 0bee9ae..46e7447 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_3/00002.png and b/tests/snapshots/nanosp/test_sign_hash_3/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_3/00003.png b/tests/snapshots/nanosp/test_sign_hash_3/00003.png
index 53ae651..0bee9ae 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_3/00003.png and b/tests/snapshots/nanosp/test_sign_hash_3/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_3/00004.png b/tests/snapshots/nanosp/test_sign_hash_3/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_3/00004.png and b/tests/snapshots/nanosp/test_sign_hash_3/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_3/00010.png b/tests/snapshots/nanosp/test_sign_hash_3/00005.png
similarity index 100%
rename from tests/snapshots/nanosp/test_blind_sign_tx_3/00010.png
rename to tests/snapshots/nanosp/test_sign_hash_3/00005.png
diff --git a/tests/snapshots/nanosp/test_sign_hash_4/00000.png b/tests/snapshots/nanosp/test_sign_hash_4/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_4/00000.png and b/tests/snapshots/nanosp/test_sign_hash_4/00000.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_4/00001.png b/tests/snapshots/nanosp/test_sign_hash_4/00001.png
index d7ffad1..7a009f6 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_4/00001.png and b/tests/snapshots/nanosp/test_sign_hash_4/00001.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_4/00002.png b/tests/snapshots/nanosp/test_sign_hash_4/00002.png
index e683b67..d7ffad1 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_4/00002.png and b/tests/snapshots/nanosp/test_sign_hash_4/00002.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_4/00003.png b/tests/snapshots/nanosp/test_sign_hash_4/00003.png
index 53ae651..e683b67 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_4/00003.png and b/tests/snapshots/nanosp/test_sign_hash_4/00003.png differ
diff --git a/tests/snapshots/nanosp/test_sign_hash_4/00004.png b/tests/snapshots/nanosp/test_sign_hash_4/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanosp/test_sign_hash_4/00004.png and b/tests/snapshots/nanosp/test_sign_hash_4/00004.png differ
diff --git a/tests/snapshots/nanosp/test_blind_sign_tx_4/00010.png b/tests/snapshots/nanosp/test_sign_hash_4/00005.png
similarity index 100%
rename from tests/snapshots/nanosp/test_blind_sign_tx_4/00010.png
rename to tests/snapshots/nanosp/test_sign_hash_4/00005.png
diff --git a/tests/snapshots/nanox/test_app_mainmenu/00001.png b/tests/snapshots/nanox/test_app_mainmenu/00001.png
index b3a905f..eb67edc 100644
Binary files a/tests/snapshots/nanox/test_app_mainmenu/00001.png and b/tests/snapshots/nanox/test_app_mainmenu/00001.png differ
diff --git a/tests/snapshots/nanox/test_app_mainmenu/00002.png b/tests/snapshots/nanox/test_app_mainmenu/00002.png
index 7e1a28c..7a0e6b4 100644
Binary files a/tests/snapshots/nanox/test_app_mainmenu/00002.png and b/tests/snapshots/nanox/test_app_mainmenu/00002.png differ
diff --git a/tests/snapshots/nanox/test_app_mainmenu/00003.png b/tests/snapshots/nanox/test_app_mainmenu/00003.png
index ca20b18..7e1a28c 100644
Binary files a/tests/snapshots/nanox/test_app_mainmenu/00003.png and b/tests/snapshots/nanox/test_app_mainmenu/00003.png differ
diff --git a/tests/snapshots/nanox/test_app_mainmenu/00004.png b/tests/snapshots/nanox/test_app_mainmenu/00004.png
new file mode 100644
index 0000000..ca20b18
Binary files /dev/null and b/tests/snapshots/nanox/test_app_mainmenu/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00000.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00000.png and b/tests/snapshots/nanox/test_blind_sign_tx_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00001.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00001.png and b/tests/snapshots/nanox/test_blind_sign_tx_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00002.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00002.png
index 6cb2ed9..2ef6b5e 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00002.png and b/tests/snapshots/nanox/test_blind_sign_tx_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00003.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00003.png
index 62530f7..1821910 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00003.png and b/tests/snapshots/nanox/test_blind_sign_tx_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00004.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00004.png and b/tests/snapshots/nanox/test_blind_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00005.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00005.png and b/tests/snapshots/nanox/test_blind_sign_tx_0/00005.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00006.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00007.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00007.png
deleted file mode 100644
index 2ef6b5e..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00008.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00008.png
deleted file mode 100644
index 1821910..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00009.png b/tests/snapshots/nanox/test_blind_sign_tx_0/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_0/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00000.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00000.png and b/tests/snapshots/nanox/test_blind_sign_tx_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00001.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00001.png and b/tests/snapshots/nanox/test_blind_sign_tx_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00002.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00002.png
index 6cb2ed9..e32bcb2 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00002.png and b/tests/snapshots/nanox/test_blind_sign_tx_1/00002.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00003.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00003.png
index 62530f7..ffece7e 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00003.png and b/tests/snapshots/nanox/test_blind_sign_tx_1/00003.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00004.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00004.png and b/tests/snapshots/nanox/test_blind_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00005.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00005.png and b/tests/snapshots/nanox/test_blind_sign_tx_1/00005.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00006.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00007.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00007.png
deleted file mode 100644
index e32bcb2..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00008.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00008.png
deleted file mode 100644
index ffece7e..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00009.png b/tests/snapshots/nanox/test_blind_sign_tx_1/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_1/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00000.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00000.png and b/tests/snapshots/nanox/test_blind_sign_tx_2/00000.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00001.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00001.png and b/tests/snapshots/nanox/test_blind_sign_tx_2/00001.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00002.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00002.png
index 6cb2ed9..8a42142 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00002.png and b/tests/snapshots/nanox/test_blind_sign_tx_2/00002.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00003.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00003.png
index 62530f7..6217f2b 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00003.png and b/tests/snapshots/nanox/test_blind_sign_tx_2/00003.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00004.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00004.png and b/tests/snapshots/nanox/test_blind_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00005.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00005.png and b/tests/snapshots/nanox/test_blind_sign_tx_2/00005.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00006.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00007.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00007.png
deleted file mode 100644
index 8a42142..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00008.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00008.png
deleted file mode 100644
index 6217f2b..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00009.png b/tests/snapshots/nanox/test_blind_sign_tx_2/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_2/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00000.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00000.png and b/tests/snapshots/nanox/test_blind_sign_tx_3/00000.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00001.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00001.png and b/tests/snapshots/nanox/test_blind_sign_tx_3/00001.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00002.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00002.png
index 6cb2ed9..e59d985 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00002.png and b/tests/snapshots/nanox/test_blind_sign_tx_3/00002.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00003.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00003.png
index 62530f7..9247023 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00003.png and b/tests/snapshots/nanox/test_blind_sign_tx_3/00003.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00004.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00004.png and b/tests/snapshots/nanox/test_blind_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00005.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00005.png and b/tests/snapshots/nanox/test_blind_sign_tx_3/00005.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00006.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00007.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00007.png
deleted file mode 100644
index e59d985..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00008.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00008.png
deleted file mode 100644
index 9247023..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00009.png b/tests/snapshots/nanox/test_blind_sign_tx_3/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_3/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00000.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00000.png
index c119bb3..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00000.png and b/tests/snapshots/nanox/test_blind_sign_tx_4/00000.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00001.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00001.png
index 7e84956..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00001.png and b/tests/snapshots/nanox/test_blind_sign_tx_4/00001.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00002.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00002.png
index 6cb2ed9..97984bf 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00002.png and b/tests/snapshots/nanox/test_blind_sign_tx_4/00002.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00003.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00003.png
index 62530f7..a55a82a 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00003.png and b/tests/snapshots/nanox/test_blind_sign_tx_4/00003.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00004.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00004.png
index 3760874..53ae651 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00004.png and b/tests/snapshots/nanox/test_blind_sign_tx_4/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00005.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00005.png
index 9502cac..29f7b77 100644
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00005.png and b/tests/snapshots/nanox/test_blind_sign_tx_4/00005.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00006.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00006.png
deleted file mode 100644
index 7a009f6..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00006.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00007.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00007.png
deleted file mode 100644
index 97984bf..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00007.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00008.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00008.png
deleted file mode 100644
index a55a82a..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00008.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00009.png b/tests/snapshots/nanox/test_blind_sign_tx_4/00009.png
deleted file mode 100644
index 53ae651..0000000
Binary files a/tests/snapshots/nanox/test_blind_sign_tx_4/00009.png and /dev/null differ
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00001.png b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00001.png
index 54371f4..6bbe548 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00001.png and b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00001.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00002.png b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00002.png
index 8fbf844..2c0388f 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00002.png and b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00002.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00003.png
index 11ed13d..0e8b3e4 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_deploy_v1/00003.png and b/tests/snapshots/nanox/test_clear_sign_deploy_v1/00003.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00001.png b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00001.png
index 54371f4..6bbe548 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00001.png and b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00001.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00002.png b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00002.png
index 8fbf844..2c0388f 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00002.png and b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00002.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00003.png
index 6473301..ef9a3ca 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_deploy_v3/00003.png and b/tests/snapshots/nanox/test_clear_sign_deploy_v3/00003.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_0/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_0/00004.png
index ca73527..b607202 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_tx_0/00004.png and b/tests/snapshots/nanox/test_clear_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_0/00007.png b/tests/snapshots/nanox/test_clear_sign_tx_0/00007.png
index 8a531e7..5098187 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_tx_0/00007.png and b/tests/snapshots/nanox/test_clear_sign_tx_0/00007.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_1/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_1/00004.png
index 7ae7090..e668a67 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_tx_1/00004.png and b/tests/snapshots/nanox/test_clear_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_2/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_2/00004.png
index 20e4f0e..db4cc15 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_tx_2/00004.png and b/tests/snapshots/nanox/test_clear_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_2/00007.png b/tests/snapshots/nanox/test_clear_sign_tx_2/00007.png
index 6473301..ef9a3ca 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_tx_2/00007.png and b/tests/snapshots/nanox/test_clear_sign_tx_2/00007.png differ
diff --git a/tests/snapshots/nanox/test_clear_sign_tx_3/00004.png b/tests/snapshots/nanox/test_clear_sign_tx_3/00004.png
index 13e51b6..0374091 100644
Binary files a/tests/snapshots/nanox/test_clear_sign_tx_3/00004.png and b/tests/snapshots/nanox/test_clear_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_0/00000.png b/tests/snapshots/nanox/test_sign_hash_0/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_0/00000.png and b/tests/snapshots/nanox/test_sign_hash_0/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_0/00001.png b/tests/snapshots/nanox/test_sign_hash_0/00001.png
index ff9fc2b..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_0/00001.png and b/tests/snapshots/nanox/test_sign_hash_0/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_0/00002.png b/tests/snapshots/nanox/test_sign_hash_0/00002.png
index c2d4683..ff9fc2b 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_0/00002.png and b/tests/snapshots/nanox/test_sign_hash_0/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_0/00003.png b/tests/snapshots/nanox/test_sign_hash_0/00003.png
index 53ae651..c2d4683 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_0/00003.png and b/tests/snapshots/nanox/test_sign_hash_0/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_0/00004.png b/tests/snapshots/nanox/test_sign_hash_0/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_0/00004.png and b/tests/snapshots/nanox/test_sign_hash_0/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_0/00010.png b/tests/snapshots/nanox/test_sign_hash_0/00005.png
similarity index 100%
rename from tests/snapshots/nanox/test_blind_sign_tx_0/00010.png
rename to tests/snapshots/nanox/test_sign_hash_0/00005.png
diff --git a/tests/snapshots/nanox/test_sign_hash_1/00000.png b/tests/snapshots/nanox/test_sign_hash_1/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_1/00000.png and b/tests/snapshots/nanox/test_sign_hash_1/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_1/00001.png b/tests/snapshots/nanox/test_sign_hash_1/00001.png
index 5974e68..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_1/00001.png and b/tests/snapshots/nanox/test_sign_hash_1/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_1/00002.png b/tests/snapshots/nanox/test_sign_hash_1/00002.png
index 3256fd5..5974e68 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_1/00002.png and b/tests/snapshots/nanox/test_sign_hash_1/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_1/00003.png b/tests/snapshots/nanox/test_sign_hash_1/00003.png
index 53ae651..3256fd5 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_1/00003.png and b/tests/snapshots/nanox/test_sign_hash_1/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_1/00004.png b/tests/snapshots/nanox/test_sign_hash_1/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_1/00004.png and b/tests/snapshots/nanox/test_sign_hash_1/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_1/00010.png b/tests/snapshots/nanox/test_sign_hash_1/00005.png
similarity index 100%
rename from tests/snapshots/nanox/test_blind_sign_tx_1/00010.png
rename to tests/snapshots/nanox/test_sign_hash_1/00005.png
diff --git a/tests/snapshots/nanox/test_sign_hash_2/00000.png b/tests/snapshots/nanox/test_sign_hash_2/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_2/00000.png and b/tests/snapshots/nanox/test_sign_hash_2/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_2/00001.png b/tests/snapshots/nanox/test_sign_hash_2/00001.png
index 3b25292..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_2/00001.png and b/tests/snapshots/nanox/test_sign_hash_2/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_2/00002.png b/tests/snapshots/nanox/test_sign_hash_2/00002.png
index baa0e21..3b25292 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_2/00002.png and b/tests/snapshots/nanox/test_sign_hash_2/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_2/00003.png b/tests/snapshots/nanox/test_sign_hash_2/00003.png
index 53ae651..baa0e21 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_2/00003.png and b/tests/snapshots/nanox/test_sign_hash_2/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_2/00004.png b/tests/snapshots/nanox/test_sign_hash_2/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_2/00004.png and b/tests/snapshots/nanox/test_sign_hash_2/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_2/00010.png b/tests/snapshots/nanox/test_sign_hash_2/00005.png
similarity index 100%
rename from tests/snapshots/nanox/test_blind_sign_tx_2/00010.png
rename to tests/snapshots/nanox/test_sign_hash_2/00005.png
diff --git a/tests/snapshots/nanox/test_sign_hash_3/00000.png b/tests/snapshots/nanox/test_sign_hash_3/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_3/00000.png and b/tests/snapshots/nanox/test_sign_hash_3/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_3/00001.png b/tests/snapshots/nanox/test_sign_hash_3/00001.png
index 46e7447..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_3/00001.png and b/tests/snapshots/nanox/test_sign_hash_3/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_3/00002.png b/tests/snapshots/nanox/test_sign_hash_3/00002.png
index 0bee9ae..46e7447 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_3/00002.png and b/tests/snapshots/nanox/test_sign_hash_3/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_3/00003.png b/tests/snapshots/nanox/test_sign_hash_3/00003.png
index 53ae651..0bee9ae 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_3/00003.png and b/tests/snapshots/nanox/test_sign_hash_3/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_3/00004.png b/tests/snapshots/nanox/test_sign_hash_3/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_3/00004.png and b/tests/snapshots/nanox/test_sign_hash_3/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_3/00010.png b/tests/snapshots/nanox/test_sign_hash_3/00005.png
similarity index 100%
rename from tests/snapshots/nanox/test_blind_sign_tx_3/00010.png
rename to tests/snapshots/nanox/test_sign_hash_3/00005.png
diff --git a/tests/snapshots/nanox/test_sign_hash_4/00000.png b/tests/snapshots/nanox/test_sign_hash_4/00000.png
index 7a009f6..c6fae0c 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_4/00000.png and b/tests/snapshots/nanox/test_sign_hash_4/00000.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_4/00001.png b/tests/snapshots/nanox/test_sign_hash_4/00001.png
index d7ffad1..7a009f6 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_4/00001.png and b/tests/snapshots/nanox/test_sign_hash_4/00001.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_4/00002.png b/tests/snapshots/nanox/test_sign_hash_4/00002.png
index e683b67..d7ffad1 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_4/00002.png and b/tests/snapshots/nanox/test_sign_hash_4/00002.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_4/00003.png b/tests/snapshots/nanox/test_sign_hash_4/00003.png
index 53ae651..e683b67 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_4/00003.png and b/tests/snapshots/nanox/test_sign_hash_4/00003.png differ
diff --git a/tests/snapshots/nanox/test_sign_hash_4/00004.png b/tests/snapshots/nanox/test_sign_hash_4/00004.png
index 29f7b77..53ae651 100644
Binary files a/tests/snapshots/nanox/test_sign_hash_4/00004.png and b/tests/snapshots/nanox/test_sign_hash_4/00004.png differ
diff --git a/tests/snapshots/nanox/test_blind_sign_tx_4/00010.png b/tests/snapshots/nanox/test_sign_hash_4/00005.png
similarity index 100%
rename from tests/snapshots/nanox/test_blind_sign_tx_4/00010.png
rename to tests/snapshots/nanox/test_sign_hash_4/00005.png
diff --git a/tests/snapshots/stax/test_app_mainmenu/00001.png b/tests/snapshots/stax/test_app_mainmenu/00001.png
index d7e0b86..6f5faf6 100644
Binary files a/tests/snapshots/stax/test_app_mainmenu/00001.png and b/tests/snapshots/stax/test_app_mainmenu/00001.png differ
diff --git a/tests/snapshots/stax/test_app_mainmenu/00002.png b/tests/snapshots/stax/test_app_mainmenu/00002.png
index 14b74ab..69faa51 100644
Binary files a/tests/snapshots/stax/test_app_mainmenu/00002.png and b/tests/snapshots/stax/test_app_mainmenu/00002.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00000.png b/tests/snapshots/stax/test_blind_sign_tx_0/00000.png
index 8696fba..9696ae1 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00000.png and b/tests/snapshots/stax/test_blind_sign_tx_0/00000.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00001.png b/tests/snapshots/stax/test_blind_sign_tx_0/00001.png
index 9696ae1..b374c97 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00001.png and b/tests/snapshots/stax/test_blind_sign_tx_0/00001.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00002.png b/tests/snapshots/stax/test_blind_sign_tx_0/00002.png
index 32e1819..7dfd152 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00002.png and b/tests/snapshots/stax/test_blind_sign_tx_0/00002.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00003.png b/tests/snapshots/stax/test_blind_sign_tx_0/00003.png
index 7dfd152..5c912f2 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00003.png and b/tests/snapshots/stax/test_blind_sign_tx_0/00003.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00004.png b/tests/snapshots/stax/test_blind_sign_tx_0/00004.png
index 2898062..392165d 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00004.png and b/tests/snapshots/stax/test_blind_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00005.png b/tests/snapshots/stax/test_blind_sign_tx_0/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00005.png and b/tests/snapshots/stax/test_blind_sign_tx_0/00005.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_0/00006.png b/tests/snapshots/stax/test_blind_sign_tx_0/00006.png
deleted file mode 100644
index 501267e..0000000
Binary files a/tests/snapshots/stax/test_blind_sign_tx_0/00006.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00000.png b/tests/snapshots/stax/test_blind_sign_tx_1/00000.png
index 8696fba..9696ae1 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00000.png and b/tests/snapshots/stax/test_blind_sign_tx_1/00000.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00001.png b/tests/snapshots/stax/test_blind_sign_tx_1/00001.png
index 9696ae1..b374c97 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00001.png and b/tests/snapshots/stax/test_blind_sign_tx_1/00001.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00002.png b/tests/snapshots/stax/test_blind_sign_tx_1/00002.png
index 32e1819..59ed49d 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00002.png and b/tests/snapshots/stax/test_blind_sign_tx_1/00002.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00003.png b/tests/snapshots/stax/test_blind_sign_tx_1/00003.png
index 59ed49d..5c912f2 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00003.png and b/tests/snapshots/stax/test_blind_sign_tx_1/00003.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00004.png b/tests/snapshots/stax/test_blind_sign_tx_1/00004.png
index 2898062..392165d 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00004.png and b/tests/snapshots/stax/test_blind_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00005.png b/tests/snapshots/stax/test_blind_sign_tx_1/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00005.png and b/tests/snapshots/stax/test_blind_sign_tx_1/00005.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_1/00006.png b/tests/snapshots/stax/test_blind_sign_tx_1/00006.png
deleted file mode 100644
index 501267e..0000000
Binary files a/tests/snapshots/stax/test_blind_sign_tx_1/00006.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00000.png b/tests/snapshots/stax/test_blind_sign_tx_2/00000.png
index 8696fba..9696ae1 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00000.png and b/tests/snapshots/stax/test_blind_sign_tx_2/00000.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00001.png b/tests/snapshots/stax/test_blind_sign_tx_2/00001.png
index 9696ae1..b374c97 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00001.png and b/tests/snapshots/stax/test_blind_sign_tx_2/00001.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00002.png b/tests/snapshots/stax/test_blind_sign_tx_2/00002.png
index 32e1819..e3890bb 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00002.png and b/tests/snapshots/stax/test_blind_sign_tx_2/00002.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00003.png b/tests/snapshots/stax/test_blind_sign_tx_2/00003.png
index e3890bb..5c912f2 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00003.png and b/tests/snapshots/stax/test_blind_sign_tx_2/00003.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00004.png b/tests/snapshots/stax/test_blind_sign_tx_2/00004.png
index 2898062..392165d 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00004.png and b/tests/snapshots/stax/test_blind_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00005.png b/tests/snapshots/stax/test_blind_sign_tx_2/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00005.png and b/tests/snapshots/stax/test_blind_sign_tx_2/00005.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_2/00006.png b/tests/snapshots/stax/test_blind_sign_tx_2/00006.png
deleted file mode 100644
index 501267e..0000000
Binary files a/tests/snapshots/stax/test_blind_sign_tx_2/00006.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00000.png b/tests/snapshots/stax/test_blind_sign_tx_3/00000.png
index 8696fba..9696ae1 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00000.png and b/tests/snapshots/stax/test_blind_sign_tx_3/00000.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00001.png b/tests/snapshots/stax/test_blind_sign_tx_3/00001.png
index 9696ae1..b374c97 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00001.png and b/tests/snapshots/stax/test_blind_sign_tx_3/00001.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00002.png b/tests/snapshots/stax/test_blind_sign_tx_3/00002.png
index 32e1819..581eedd 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00002.png and b/tests/snapshots/stax/test_blind_sign_tx_3/00002.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00003.png b/tests/snapshots/stax/test_blind_sign_tx_3/00003.png
index 581eedd..5c912f2 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00003.png and b/tests/snapshots/stax/test_blind_sign_tx_3/00003.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00004.png b/tests/snapshots/stax/test_blind_sign_tx_3/00004.png
index 2898062..392165d 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00004.png and b/tests/snapshots/stax/test_blind_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00005.png b/tests/snapshots/stax/test_blind_sign_tx_3/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00005.png and b/tests/snapshots/stax/test_blind_sign_tx_3/00005.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_3/00006.png b/tests/snapshots/stax/test_blind_sign_tx_3/00006.png
deleted file mode 100644
index 501267e..0000000
Binary files a/tests/snapshots/stax/test_blind_sign_tx_3/00006.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00000.png b/tests/snapshots/stax/test_blind_sign_tx_4/00000.png
index 8696fba..9696ae1 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00000.png and b/tests/snapshots/stax/test_blind_sign_tx_4/00000.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00001.png b/tests/snapshots/stax/test_blind_sign_tx_4/00001.png
index 9696ae1..b374c97 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00001.png and b/tests/snapshots/stax/test_blind_sign_tx_4/00001.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00002.png b/tests/snapshots/stax/test_blind_sign_tx_4/00002.png
index 32e1819..1f9a0d0 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00002.png and b/tests/snapshots/stax/test_blind_sign_tx_4/00002.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00003.png b/tests/snapshots/stax/test_blind_sign_tx_4/00003.png
index 1f9a0d0..5c912f2 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00003.png and b/tests/snapshots/stax/test_blind_sign_tx_4/00003.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00004.png b/tests/snapshots/stax/test_blind_sign_tx_4/00004.png
index 2898062..392165d 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00004.png and b/tests/snapshots/stax/test_blind_sign_tx_4/00004.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00005.png b/tests/snapshots/stax/test_blind_sign_tx_4/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00005.png and b/tests/snapshots/stax/test_blind_sign_tx_4/00005.png differ
diff --git a/tests/snapshots/stax/test_blind_sign_tx_4/00006.png b/tests/snapshots/stax/test_blind_sign_tx_4/00006.png
deleted file mode 100644
index 501267e..0000000
Binary files a/tests/snapshots/stax/test_blind_sign_tx_4/00006.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00000.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00000.png
index 4b5c40c..0987aa4 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v1/00000.png and b/tests/snapshots/stax/test_clear_sign_deploy_v1/00000.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00001.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00001.png
index 9c8fbcf..cb470fc 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v1/00001.png and b/tests/snapshots/stax/test_clear_sign_deploy_v1/00001.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00002.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00002.png
index 0faf077..5f5dc7d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v1/00002.png and b/tests/snapshots/stax/test_clear_sign_deploy_v1/00002.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00003.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00003.png
index 0247374..392165d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v1/00003.png and b/tests/snapshots/stax/test_clear_sign_deploy_v1/00003.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00004.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00004.png
index 8696fba..501267e 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v1/00004.png and b/tests/snapshots/stax/test_clear_sign_deploy_v1/00004.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v1/00005.png b/tests/snapshots/stax/test_clear_sign_deploy_v1/00005.png
deleted file mode 100644
index 392165d..0000000
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v1/00005.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00000.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00000.png
index 4b5c40c..0987aa4 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v3/00000.png and b/tests/snapshots/stax/test_clear_sign_deploy_v3/00000.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00001.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00001.png
index 6d3ca45..c7d991a 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v3/00001.png and b/tests/snapshots/stax/test_clear_sign_deploy_v3/00001.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00002.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00002.png
index 0faf077..5f5dc7d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v3/00002.png and b/tests/snapshots/stax/test_clear_sign_deploy_v3/00002.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00003.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00003.png
index 0247374..392165d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v3/00003.png and b/tests/snapshots/stax/test_clear_sign_deploy_v3/00003.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00004.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00004.png
index 8696fba..501267e 100644
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v3/00004.png and b/tests/snapshots/stax/test_clear_sign_deploy_v3/00004.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_deploy_v3/00005.png b/tests/snapshots/stax/test_clear_sign_deploy_v3/00005.png
deleted file mode 100644
index 392165d..0000000
Binary files a/tests/snapshots/stax/test_clear_sign_deploy_v3/00005.png and /dev/null differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00000.png b/tests/snapshots/stax/test_clear_sign_tx_0/00000.png
index 4b5c40c..095f176 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_0/00000.png and b/tests/snapshots/stax/test_clear_sign_tx_0/00000.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00001.png b/tests/snapshots/stax/test_clear_sign_tx_0/00001.png
index 1b7bc6b..150b8e6 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_0/00001.png and b/tests/snapshots/stax/test_clear_sign_tx_0/00001.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00002.png b/tests/snapshots/stax/test_clear_sign_tx_0/00002.png
index dd8e9d3..18d6009 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_0/00002.png and b/tests/snapshots/stax/test_clear_sign_tx_0/00002.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00003.png b/tests/snapshots/stax/test_clear_sign_tx_0/00003.png
index 0247374..ebf5160 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_0/00003.png and b/tests/snapshots/stax/test_clear_sign_tx_0/00003.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00004.png b/tests/snapshots/stax/test_clear_sign_tx_0/00004.png
index 8696fba..392165d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_0/00004.png and b/tests/snapshots/stax/test_clear_sign_tx_0/00004.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_0/00005.png b/tests/snapshots/stax/test_clear_sign_tx_0/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_0/00005.png and b/tests/snapshots/stax/test_clear_sign_tx_0/00005.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00000.png b/tests/snapshots/stax/test_clear_sign_tx_1/00000.png
index 4b5c40c..095f176 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_1/00000.png and b/tests/snapshots/stax/test_clear_sign_tx_1/00000.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00001.png b/tests/snapshots/stax/test_clear_sign_tx_1/00001.png
index a418259..c22d0fc 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_1/00001.png and b/tests/snapshots/stax/test_clear_sign_tx_1/00001.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00003.png b/tests/snapshots/stax/test_clear_sign_tx_1/00003.png
index 0247374..ebf5160 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_1/00003.png and b/tests/snapshots/stax/test_clear_sign_tx_1/00003.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00004.png b/tests/snapshots/stax/test_clear_sign_tx_1/00004.png
index 8696fba..392165d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_1/00004.png and b/tests/snapshots/stax/test_clear_sign_tx_1/00004.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_1/00005.png b/tests/snapshots/stax/test_clear_sign_tx_1/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_1/00005.png and b/tests/snapshots/stax/test_clear_sign_tx_1/00005.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00000.png b/tests/snapshots/stax/test_clear_sign_tx_2/00000.png
index 4b5c40c..095f176 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_2/00000.png and b/tests/snapshots/stax/test_clear_sign_tx_2/00000.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00001.png b/tests/snapshots/stax/test_clear_sign_tx_2/00001.png
index a9202ed..9573036 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_2/00001.png and b/tests/snapshots/stax/test_clear_sign_tx_2/00001.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00002.png b/tests/snapshots/stax/test_clear_sign_tx_2/00002.png
index bc32d53..613ce5f 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_2/00002.png and b/tests/snapshots/stax/test_clear_sign_tx_2/00002.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00003.png b/tests/snapshots/stax/test_clear_sign_tx_2/00003.png
index 0247374..ebf5160 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_2/00003.png and b/tests/snapshots/stax/test_clear_sign_tx_2/00003.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00004.png b/tests/snapshots/stax/test_clear_sign_tx_2/00004.png
index 8696fba..392165d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_2/00004.png and b/tests/snapshots/stax/test_clear_sign_tx_2/00004.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_2/00005.png b/tests/snapshots/stax/test_clear_sign_tx_2/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_2/00005.png and b/tests/snapshots/stax/test_clear_sign_tx_2/00005.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00000.png b/tests/snapshots/stax/test_clear_sign_tx_3/00000.png
index 4b5c40c..095f176 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_3/00000.png and b/tests/snapshots/stax/test_clear_sign_tx_3/00000.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00001.png b/tests/snapshots/stax/test_clear_sign_tx_3/00001.png
index 2a95918..739b04a 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_3/00001.png and b/tests/snapshots/stax/test_clear_sign_tx_3/00001.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00003.png b/tests/snapshots/stax/test_clear_sign_tx_3/00003.png
index 0247374..ebf5160 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_3/00003.png and b/tests/snapshots/stax/test_clear_sign_tx_3/00003.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00004.png b/tests/snapshots/stax/test_clear_sign_tx_3/00004.png
index 8696fba..392165d 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_3/00004.png and b/tests/snapshots/stax/test_clear_sign_tx_3/00004.png differ
diff --git a/tests/snapshots/stax/test_clear_sign_tx_3/00005.png b/tests/snapshots/stax/test_clear_sign_tx_3/00005.png
index 392165d..501267e 100644
Binary files a/tests/snapshots/stax/test_clear_sign_tx_3/00005.png and b/tests/snapshots/stax/test_clear_sign_tx_3/00005.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_0/00001.png b/tests/snapshots/stax/test_sign_hash_0/00001.png
index 8c73d00..55de0df 100644
Binary files a/tests/snapshots/stax/test_sign_hash_0/00001.png and b/tests/snapshots/stax/test_sign_hash_0/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_0/00003.png b/tests/snapshots/stax/test_sign_hash_0/00003.png
index 8fa4d1a..e2ccbf3 100644
Binary files a/tests/snapshots/stax/test_sign_hash_0/00003.png and b/tests/snapshots/stax/test_sign_hash_0/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_0/00004.png b/tests/snapshots/stax/test_sign_hash_0/00004.png
index 501267e..cfee3ae 100644
Binary files a/tests/snapshots/stax/test_sign_hash_0/00004.png and b/tests/snapshots/stax/test_sign_hash_0/00004.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_1/00001.png b/tests/snapshots/stax/test_sign_hash_1/00001.png
index 8c73d00..55de0df 100644
Binary files a/tests/snapshots/stax/test_sign_hash_1/00001.png and b/tests/snapshots/stax/test_sign_hash_1/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_1/00003.png b/tests/snapshots/stax/test_sign_hash_1/00003.png
index 8fa4d1a..e2ccbf3 100644
Binary files a/tests/snapshots/stax/test_sign_hash_1/00003.png and b/tests/snapshots/stax/test_sign_hash_1/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_1/00004.png b/tests/snapshots/stax/test_sign_hash_1/00004.png
index 501267e..cfee3ae 100644
Binary files a/tests/snapshots/stax/test_sign_hash_1/00004.png and b/tests/snapshots/stax/test_sign_hash_1/00004.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_2/00001.png b/tests/snapshots/stax/test_sign_hash_2/00001.png
index 8c73d00..55de0df 100644
Binary files a/tests/snapshots/stax/test_sign_hash_2/00001.png and b/tests/snapshots/stax/test_sign_hash_2/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_2/00003.png b/tests/snapshots/stax/test_sign_hash_2/00003.png
index 8fa4d1a..e2ccbf3 100644
Binary files a/tests/snapshots/stax/test_sign_hash_2/00003.png and b/tests/snapshots/stax/test_sign_hash_2/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_2/00004.png b/tests/snapshots/stax/test_sign_hash_2/00004.png
index 501267e..cfee3ae 100644
Binary files a/tests/snapshots/stax/test_sign_hash_2/00004.png and b/tests/snapshots/stax/test_sign_hash_2/00004.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_3/00001.png b/tests/snapshots/stax/test_sign_hash_3/00001.png
index 8c73d00..55de0df 100644
Binary files a/tests/snapshots/stax/test_sign_hash_3/00001.png and b/tests/snapshots/stax/test_sign_hash_3/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_3/00003.png b/tests/snapshots/stax/test_sign_hash_3/00003.png
index 8fa4d1a..e2ccbf3 100644
Binary files a/tests/snapshots/stax/test_sign_hash_3/00003.png and b/tests/snapshots/stax/test_sign_hash_3/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_3/00004.png b/tests/snapshots/stax/test_sign_hash_3/00004.png
index 501267e..cfee3ae 100644
Binary files a/tests/snapshots/stax/test_sign_hash_3/00004.png and b/tests/snapshots/stax/test_sign_hash_3/00004.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_4/00001.png b/tests/snapshots/stax/test_sign_hash_4/00001.png
index 8c73d00..55de0df 100644
Binary files a/tests/snapshots/stax/test_sign_hash_4/00001.png and b/tests/snapshots/stax/test_sign_hash_4/00001.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_4/00003.png b/tests/snapshots/stax/test_sign_hash_4/00003.png
index 8fa4d1a..e2ccbf3 100644
Binary files a/tests/snapshots/stax/test_sign_hash_4/00003.png and b/tests/snapshots/stax/test_sign_hash_4/00003.png differ
diff --git a/tests/snapshots/stax/test_sign_hash_4/00004.png b/tests/snapshots/stax/test_sign_hash_4/00004.png
index 501267e..cfee3ae 100644
Binary files a/tests/snapshots/stax/test_sign_hash_4/00004.png and b/tests/snapshots/stax/test_sign_hash_4/00004.png differ
diff --git a/tests/test_app_mainmenu.py b/tests/test_app_mainmenu.py
index 038e17d..376ff0c 100644
--- a/tests/test_app_mainmenu.py
+++ b/tests/test_app_mainmenu.py
@@ -10,7 +10,8 @@ def test_app_mainmenu(firmware, navigator, test_name):
         instructions = [
             NavInsID.RIGHT_CLICK,
             NavInsID.RIGHT_CLICK,
-            NavInsID.RIGHT_CLICK
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
         ]
     else:
         instructions = [
diff --git a/tests/test_blind_sign_tx.py b/tests/test_blind_sign_tx.py
index 5e60828..6f94540 100644
--- a/tests/test_blind_sign_tx.py
+++ b/tests/test_blind_sign_tx.py
@@ -30,7 +30,16 @@ def get_setting_position(firmware: Firmware, setting_idx: int, per_page: int) ->
 def test_blind_sign_tx_0(firmware, backend, navigator, test_name):
 
     # Enable blind siging in settings
-    if not firmware.device.startswith("nano"):
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
         settings_per_page = 3 if firmware == Firmware.STAX else 2
         instructions = [
             NavInsID.USE_CASE_HOME_SETTINGS,
@@ -59,19 +68,13 @@ def test_blind_sign_tx_0(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.BOTH_CLICK,
+                                             [NavInsID.BOTH_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
         else:
             instructions = [
-                NavInsID.USE_CASE_STATUS_DISMISS,
                 NavInsID.CENTERED_FOOTER_TAP,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
@@ -106,8 +109,17 @@ def test_blind_sign_tx_0(firmware, backend, navigator, test_name):
 
 def test_blind_sign_tx_1(firmware, backend, navigator, test_name):
 
-    # Enable blind siging in settings
-    if not firmware.device.startswith("nano"):
+     # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
         settings_per_page = 3 if firmware == Firmware.STAX else 2
         instructions = [
             NavInsID.USE_CASE_HOME_SETTINGS,
@@ -136,19 +148,13 @@ def test_blind_sign_tx_1(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.BOTH_CLICK,
+                                             [NavInsID.BOTH_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
         else:
             instructions = [
-                NavInsID.USE_CASE_STATUS_DISMISS,
                 NavInsID.CENTERED_FOOTER_TAP,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
@@ -183,8 +189,17 @@ def test_blind_sign_tx_1(firmware, backend, navigator, test_name):
 
 def test_blind_sign_tx_2(firmware, backend, navigator, test_name):
 
-    # Enable blind siging in settings
-    if not firmware.device.startswith("nano"):
+     # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
         settings_per_page = 3 if firmware == Firmware.STAX else 2
         instructions = [
             NavInsID.USE_CASE_HOME_SETTINGS,
@@ -213,19 +228,13 @@ def test_blind_sign_tx_2(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.BOTH_CLICK,
+                                             [NavInsID.BOTH_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
         else:
             instructions = [
-                NavInsID.USE_CASE_STATUS_DISMISS,
                 NavInsID.CENTERED_FOOTER_TAP,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
@@ -260,8 +269,17 @@ def test_blind_sign_tx_2(firmware, backend, navigator, test_name):
 
 def test_blind_sign_tx_3(firmware, backend, navigator, test_name):
 
-    # Enable blind siging in settings
-    if not firmware.device.startswith("nano"):
+     # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
         settings_per_page = 3 if firmware == Firmware.STAX else 2
         instructions = [
             NavInsID.USE_CASE_HOME_SETTINGS,
@@ -290,19 +308,13 @@ def test_blind_sign_tx_3(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.BOTH_CLICK,
+                                             [NavInsID.BOTH_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
         else:
             instructions = [
-                NavInsID.USE_CASE_STATUS_DISMISS,
                 NavInsID.CENTERED_FOOTER_TAP,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
@@ -337,8 +349,17 @@ def test_blind_sign_tx_3(firmware, backend, navigator, test_name):
 
 def test_blind_sign_tx_4(firmware, backend, navigator, test_name):
 
-    # Enable blind siging in settings
-    if not firmware.device.startswith("nano"):
+     # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
         settings_per_page = 3 if firmware == Firmware.STAX else 2
         instructions = [
             NavInsID.USE_CASE_HOME_SETTINGS,
@@ -367,19 +388,13 @@ def test_blind_sign_tx_4(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.RIGHT_CLICK,
-                                              NavInsID.BOTH_CLICK,
+                                             [NavInsID.BOTH_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
         else:
             instructions = [
-                NavInsID.USE_CASE_STATUS_DISMISS,
                 NavInsID.CENTERED_FOOTER_TAP,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
                 NavInsID.SWIPE_CENTER_TO_LEFT,
diff --git a/tests/test_clear_sign_deploy.py b/tests/test_clear_sign_deploy.py
index 912b58a..8143c2a 100644
--- a/tests/test_clear_sign_deploy.py
+++ b/tests/test_clear_sign_deploy.py
@@ -37,13 +37,21 @@ def test_clear_sign_deploy_v3(firmware, backend, navigator, test_name):
                                                     ROOT_SCREENSHOT_PATH,
                                                     test_name)
         else:
-            instructions = [
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.USE_CASE_REVIEW_CONFIRM,
-                NavInsID.USE_CASE_STATUS_DISMISS
-            ]
+            if firmware.device == "stax":
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
+            else:
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                            test_name,
                                            instructions)
@@ -97,13 +105,21 @@ def test_clear_sign_deploy_v1(firmware, backend, navigator, test_name):
                                                     ROOT_SCREENSHOT_PATH,
                                                     test_name)
         else:
-            instructions = [
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.SWIPE_CENTER_TO_LEFT,
-                NavInsID.USE_CASE_REVIEW_CONFIRM,
-                NavInsID.USE_CASE_STATUS_DISMISS
-            ]
+            if firmware.device == "stax":
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
+            else:
+                instructions = [
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.SWIPE_CENTER_TO_LEFT,
+                    NavInsID.USE_CASE_REVIEW_CONFIRM,
+                    NavInsID.USE_CASE_STATUS_DISMISS
+                ]
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                            test_name,
                                            instructions)
diff --git a/tests/test_sign_hash.py b/tests/test_sign_hash.py
index 5da89f9..fc9af6b 100644
--- a/tests/test_sign_hash.py
+++ b/tests/test_sign_hash.py
@@ -3,16 +3,53 @@
 
 import json
 from application_client.response_unpacker import unpack_get_public_key_response, unpack_sign_tx_response, unpack_sign_hash_response, Errors
-from ragger.navigator import NavInsID
+from ragger.navigator import NavInsID, NavIns
 from utils import ROOT_SCREENSHOT_PATH, read_lines_from_file, call_external_binary
+from ragger.firmware import Firmware
 
 CHECK_SIGNATURE_BINARY_PATH = "./target/debug/check-signature"
 
+def get_setting_position(firmware: Firmware, setting_idx: int, per_page: int) -> tuple[int, int]:
+    if firmware == Firmware.STAX:
+        screen_height = 672  # px
+        screen_width = 400  # px
+        header_height = 88  # px
+        footer_height = 92  # px
+    else:
+        screen_height = 600  # px
+        screen_width = 480  # px
+        header_height = 96  # px
+        footer_height = 96  # px
+
+    index_in_page = setting_idx % per_page
+    usable_height = screen_height - (header_height + footer_height)
+    setting_height = usable_height // per_page
+    offset = (setting_height * index_in_page) + (setting_height // 2)
+    return screen_width // 2, header_height + offset
+
 # In those tests we check the behavior of the device when asked to sign a Tx (clear or blind signing)
 
 # In this test we send to the device a hash to sign and validate it on screen
 # We will ensure that the displayed information is correct by using screenshots comparison
 def test_sign_hash_0(firmware, backend, navigator, test_name):
+
+    # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
+        settings_per_page = 3 if firmware == Firmware.STAX else 2
+        instructions = [
+            NavInsID.USE_CASE_HOME_SETTINGS,
+            NavIns(NavInsID.TOUCH, get_setting_position(firmware, 0, settings_per_page)),
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
         
     # First we need to get the public key of the device in order to build the transaction    
     file_path = 'samples/apdu/dpath_0.dat'
@@ -35,7 +72,8 @@ def test_sign_hash_0(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
+                                             [NavInsID.BOTH_CLICK,
+                                              NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
@@ -78,6 +116,24 @@ def test_sign_hash_0(firmware, backend, navigator, test_name):
         assert(False)
 
 def test_sign_hash_1(firmware, backend, navigator, test_name):
+
+    # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
+        settings_per_page = 3 if firmware == Firmware.STAX else 2
+        instructions = [
+            NavInsID.USE_CASE_HOME_SETTINGS,
+            NavIns(NavInsID.TOUCH, get_setting_position(firmware, 0, settings_per_page)),
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
         
     # First we need to get the public key of the device in order to build the transaction    
     file_path = 'samples/apdu/dpath_0.dat'
@@ -100,7 +156,8 @@ def test_sign_hash_1(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
+                                             [NavInsID.BOTH_CLICK,
+                                              NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
@@ -143,6 +200,24 @@ def test_sign_hash_1(firmware, backend, navigator, test_name):
         assert(False)
 
 def test_sign_hash_2(firmware, backend, navigator, test_name):
+
+    # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
+        settings_per_page = 3 if firmware == Firmware.STAX else 2
+        instructions = [
+            NavInsID.USE_CASE_HOME_SETTINGS,
+            NavIns(NavInsID.TOUCH, get_setting_position(firmware, 0, settings_per_page)),
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
         
     # First we need to get the public key of the device in order to build the transaction    
     file_path = 'samples/apdu/dpath_0.dat'
@@ -165,7 +240,8 @@ def test_sign_hash_2(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
+                                             [NavInsID.BOTH_CLICK,
+                                              NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
@@ -208,6 +284,24 @@ def test_sign_hash_2(firmware, backend, navigator, test_name):
         assert(False)
 
 def test_sign_hash_3(firmware, backend, navigator, test_name):
+
+    # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
+        settings_per_page = 3 if firmware == Firmware.STAX else 2
+        instructions = [
+            NavInsID.USE_CASE_HOME_SETTINGS,
+            NavIns(NavInsID.TOUCH, get_setting_position(firmware, 0, settings_per_page)),
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
         
     # First we need to get the public key of the device in order to build the transaction    
     file_path = 'samples/apdu/dpath_0.dat'
@@ -230,7 +324,8 @@ def test_sign_hash_3(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
+                                             [NavInsID.BOTH_CLICK,
+                                              NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])
@@ -273,6 +368,24 @@ def test_sign_hash_3(firmware, backend, navigator, test_name):
         assert(False)
 
 def test_sign_hash_4(firmware, backend, navigator, test_name):
+
+    # Enable blind siging in settings
+    if firmware.device.startswith("nano"):
+
+        instructions = [
+            NavInsID.RIGHT_CLICK,
+            NavInsID.RIGHT_CLICK,
+            NavInsID.BOTH_CLICK,
+            NavInsID.BOTH_CLICK
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
+    else:
+        settings_per_page = 3 if firmware == Firmware.STAX else 2
+        instructions = [
+            NavInsID.USE_CASE_HOME_SETTINGS,
+            NavIns(NavInsID.TOUCH, get_setting_position(firmware, 0, settings_per_page)),
+        ]
+        navigator.navigate(instructions, screen_change_before_first_instruction=False)
         
     # First we need to get the public key of the device in order to build the transaction    
     file_path = 'samples/apdu/dpath_0.dat'
@@ -295,7 +408,8 @@ def test_sign_hash_4(firmware, backend, navigator, test_name):
         if firmware.device.startswith("nano"):
             navigator.navigate_and_compare(ROOT_SCREENSHOT_PATH,
                                              test_name,
-                                             [NavInsID.RIGHT_CLICK,
+                                             [NavInsID.BOTH_CLICK,
+                                              NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.RIGHT_CLICK,
                                               NavInsID.BOTH_CLICK])