diff --git a/Makefile b/Makefile
index d1bb5a45..4af33d28 100644
--- a/Makefile
+++ b/Makefile
@@ -94,14 +94,14 @@ APP_SOURCE_FILES += ${BOLOS_SDK}/lib_standard_app/crypto_helpers.c
 
 DEFINES += UNUSED\(x\)=\(void\)x
 
-WITH_U2F=0
+WITH_U2F?=0
 ifneq ($(WITH_U2F),0)
     DEFINES         += HAVE_U2F HAVE_IO_U2F
     DEFINES         += U2F_PROXY_MAGIC=\"~SOL\"
 		SDK_SOURCE_PATH += lib_u2f
 endif
 
-WITH_LIBSOL=1
+WITH_LIBSOL?=1
 ifneq ($(WITH_LIBSOL),0)
     SOURCE_FILES += $(filter-out %_test.c,$(wildcard libsol/*.c))
     CFLAGS       += -Ilibsol/include
diff --git a/src/main.c b/src/main.c
index 8bf3458d..cdd3a13e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -175,7 +175,7 @@ void nv_app_state_init() {
     if (N_storage.initialized != 0x01) {
         internalStorage_t storage;
         storage.settings.allow_blind_sign = BlindSignDisabled;
-#if defined(TARGET_NANOX) || defined(TARGET_NANOS2) || defined(TARGET_STAX) || defined(TARGET_FLEX)
+#if !defined(TARGET_NANOS)
         storage.settings.pubkey_display = PubkeyDisplayLong;
 #else
         storage.settings.pubkey_display = PubkeyDisplayShort;
diff --git a/src/ui/sign_message_nbgl.c b/src/ui/sign_message_nbgl.c
index f31a5a93..80388e4a 100644
--- a/src/ui/sign_message_nbgl.c
+++ b/src/ui/sign_message_nbgl.c
@@ -113,7 +113,7 @@ void start_sign_tx_ui(size_t num_summary_steps) {
                        &C_icon_solana_64x64,
                        "Review transaction",
                        NULL,
-                       "Sign transaction on\nSolana network?",
+                       "Sign transaction on Solana network?",
                        review_choice);
 }
 
@@ -143,7 +143,7 @@ void start_sign_offchain_message_ui(bool is_ascii, size_t num_summary_steps) {
                        &C_icon_solana_64x64,
                        "Review off-chain\nmessage",
                        NULL,
-                       "Sign off-chain\nmessage on Solana\nnetwork?",
+                       "Sign off-chain message on Solana network?",
                        review_choice);
 }
 #endif
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_ok_2/00004.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_ok_2/00004.png
index f51f7917..c46fb9d0 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_ok_2/00004.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_ok_2/00004.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_refused_2/00004.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_refused_2/00004.png
index f51f7917..c46fb9d0 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_refused_2/00004.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_expert_refused_2/00004.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_ok/00002.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_ok/00002.png
index 32fce071..2dd7c3ed 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_ok/00002.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_ok/00002.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_refused/00002.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_refused/00002.png
index 32fce071..2dd7c3ed 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_refused/00002.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_ascii_refused/00002.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_ok_3/00003.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_ok_3/00003.png
index 816b61de..bc78f697 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_ok_3/00003.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_ok_3/00003.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_refused_3/00003.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_refused_3/00003.png
index 816b61de..bc78f697 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_refused_3/00003.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_expert_refused_3/00003.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_ok_2/00002.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_ok_2/00002.png
index 32fce071..2dd7c3ed 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_ok_2/00002.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_ok_2/00002.png differ
diff --git a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_refused_2/00002.png b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_refused_2/00002.png
index 32fce071..2dd7c3ed 100644
Binary files a/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_refused_2/00002.png and b/tests/python/snapshots/flex/test_ledger_sign_offchain_message_utf8_refused_2/00002.png differ
diff --git a/tests/python/test_solana.py b/tests/python/test_solana.py
index 6c62a099..f71a724e 100644
--- a/tests/python/test_solana.py
+++ b/tests/python/test_solana.py
@@ -4,12 +4,12 @@
 from .apps.solana import SolanaClient, ErrorType
 from .apps.solana_cmd_builder import SystemInstructionTransfer, Message, verify_signature, OffchainMessage
 from .apps.solana_utils import FOREIGN_PUBLIC_KEY, FOREIGN_PUBLIC_KEY_2, AMOUNT, AMOUNT_2, SOL_PACKED_DERIVATION_PATH, SOL_PACKED_DERIVATION_PATH_2, ROOT_SCREENSHOT_PATH
-from .apps.solana_utils import enable_blind_signing, enable_short_public_key, enable_expert_mode
+from .apps.solana_utils import enable_blind_signing, enable_expert_mode
 
 
 class TestGetPublicKey:
 
-    def test_solana_get_public_key_ok(self, backend, scenario_navigator, navigator, test_name):
+    def test_solana_get_public_key_ok(self, backend, scenario_navigator):
         sol = SolanaClient(backend)
         from_public_key = sol.get_public_key(SOL_PACKED_DERIVATION_PATH)
 
@@ -19,7 +19,7 @@ def test_solana_get_public_key_ok(self, backend, scenario_navigator, navigator,
         assert sol.get_async_response().data == from_public_key
 
 
-    def test_solana_get_public_key_refused(self, backend, scenario_navigator, test_name):
+    def test_solana_get_public_key_refused(self, backend, scenario_navigator):
         sol = SolanaClient(backend)
         with sol.send_public_key_with_confirm(SOL_PACKED_DERIVATION_PATH):
             backend.raise_policy = RaisePolicy.RAISE_NOTHING