diff --git a/.github/workflows/guidelines_enforcer.yml b/.github/workflows/guidelines_enforcer.yml
index 32cfd201..3aa0962e 100644
--- a/.github/workflows/guidelines_enforcer.yml
+++ b/.github/workflows/guidelines_enforcer.yml
@@ -17,3 +17,5 @@ jobs:
   guidelines_enforcer:
     name: Call Ledger guidelines_enforcer
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1
+    with:
+        run_for_devices: '["nanos", "nanox", "nanosp"]'
diff --git a/Makefile b/Makefile
index dbb733d3..92a2af77 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ WORDS = "abandon abandon abandon abandon abandon abandon abandon abandon abandon
 PIN = 5555
 
 SPECULOS_MODEL_SWITCH=nanos
-NANO_ICON_GIF=nanos_icon.gif
+NANO_ICON_GIF=icon_fio_nanos.gif
 BOLOS_SDK_DIRECTORY=/opt/nanos-secure-sdk
 TARGET_NAME=TARGET_NANOS
 TEST_DEVICE=nanos
@@ -37,7 +37,7 @@ SPECULOS_SDK_STRING= --sdk 2.1
 ifeq ($(TARGET_DEVICE), NANO_X)
     $(info Targeting NanoX)
     SPECULOS_MODEL_SWITCH=nanox
-    NANO_ICON_GIF=nanox_icon.gif
+    NANO_ICON_GIF=icon_fio_nanox.gif
     BOLOS_SDK_DIRECTORY=/opt/nanox-secure-sdk
     TARGET_NAME=TARGET_NANOX
     TEST_DEVICE=nanox
@@ -46,13 +46,23 @@ endif
 ifeq ($(TARGET_DEVICE), NANO_SP)
     $(info Targeting NanoSPlus)
     SPECULOS_MODEL_SWITCH=nanosp
-    NANO_ICON_GIF=nanox_icon.gif
+    NANO_ICON_GIF=icon_fio_nanox.gif
     BOLOS_SDK_DIRECTORY=/opt/nanosplus-secure-sdk
     TARGET_NAME=TARGET_NANOS2
     TEST_DEVICE=nanosp
     SPECULOS_SDK_STRING=
 endif
 
+ifeq ($(TARGET_DEVICE), STAX)
+    $(info Targeting STAX)
+    SPECULOS_MODEL_SWITCH=stax
+    NANO_ICON_GIF=icon_fio_stax.png
+    BOLOS_SDK_DIRECTORY=/opt/stax-secure-sdk
+    TARGET_NAME=TARGET_STAX
+    TEST_DEVICE=stax
+    SPECULOS_SDK_STRING=
+endif
+
 
 ifeq ($(BOLOS_SDK),)
 include $(CURDIR)/MakefileContainer.mk
diff --git a/MakefileLocal.mk b/MakefileLocal.mk
index f3ee1c63..0e8cf43a 100644
--- a/MakefileLocal.mk
+++ b/MakefileLocal.mk
@@ -37,7 +37,11 @@ APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)
 ifeq ($(TARGET_NAME),TARGET_NANOS)
 	ICONNAME=icon_fio_nanos.gif
 else
-	ICONNAME=icon_fio_nanox.gif
+	ifeq ($(TARGET_NAME),TARGET_STAX)
+		ICONNAME=icon_fio_stax.png
+	else
+		ICONNAME=icon_fio_nanox.gif
+	endif
 endif
 
 ############
@@ -179,7 +183,7 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile
 
 listvariants:
-	@echo VARIANTS COIN fio
+	@echo VARIANTS COIN FIO
 	
 ##############
 #   Style    #
diff --git a/MakefileSpeculos.mk b/MakefileSpeculos.mk
index 060b4f83..885f4551 100644
--- a/MakefileSpeculos.mk
+++ b/MakefileSpeculos.mk
@@ -15,7 +15,7 @@
 #  limitations under the License.
 #*******************************************************************************
 
-SPECULOS_IMAGE = speculos:sha-d6dee99
+SPECULOS_IMAGE = speculos:sha-6a34680
 	
 define run_announce
 	@perl -e 'use Time::HiRes; use POSIX; $$ts = sprintf qq[%f], Time::HiRes::time(); ($$f) = $$ts =~ m~(\....)~; printf qq[%s%s %s make: %s\n], POSIX::strftime("%H:%M:%S", gmtime), $$f, q[-] x 126, $$ARGV[0];' "$(1)"
diff --git a/icon_fio_stax.png b/icon_fio_stax.png
new file mode 100644
index 00000000..e4cdc734
Binary files /dev/null and b/icon_fio_stax.png differ
diff --git a/icon_fio_stax_large.png b/icon_fio_stax_large.png
new file mode 100644
index 00000000..5bc3a5d7
Binary files /dev/null and b/icon_fio_stax_large.png differ
diff --git a/test-integration/speculos-buttons-and-snapshots.js b/test-integration/speculos-buttons-and-snapshots.js
index 718a2ece..ee2cfe04 100644
--- a/test-integration/speculos-buttons-and-snapshots.js
+++ b/test-integration/speculos-buttons-and-snapshots.js
@@ -8,13 +8,13 @@ const fioWaitingForCommandsSHA = {
 
 const fioWarningDevelSHA = {
     "nanos": "sha256:df7553b0b614d9d3ff0dcb5facde9e1e7e308e2691be9669d206a241f958a999",
-    "nanox": "sha256:2bb665c41bcb7e7abda8fc30255f28b35144d26997f314074290eb24b23e37fa", //TODO?
+    "nanox": "sha256:2bb665c41bcb7e7abda8fc30255f28b35144d26997f314074290eb24b23e37fa", 
     "nanosp": "sha256:2bb665c41bcb7e7abda8fc30255f28b35144d26997f314074290eb24b23e37fa",
 } 
 
 const fioThreeDotsSHA = {
     "nanos": "sha256:77d4d2651ac7327eee85219c9d25da7b40cf476fad1a67e7eeacb74b37221efe",
-    "nanox": "sha256:c650a1475392bdc2ff484341c43bb3aa532ea5262ddb9331f219a24314bc014f", //TODO?
+    "nanox": "sha256:c650a1475392bdc2ff484341c43bb3aa532ea5262ddb9331f219a24314bc014f", 
     "nanosp": "sha256:c650a1475392bdc2ff484341c43bb3aa532ea5262ddb9331f219a24314bc014f",
 }