diff --git a/Makefile b/Makefile
index 595785c..af240bb 100644
--- a/Makefile
+++ b/Makefile
@@ -37,10 +37,10 @@ endif
 
 ifeq ($(TARGET_NAME),TARGET_BLUE)
 ICONNAME = images/icon_monero_blue.gif
-else ifeq ($(TARGET_NAME),TARGET_NANOX)
-ICONNAME = images/icon_pgp_nanox.gif
-else
+else ifeq ($(TARGET_NAME),TARGET_NANOS)
 ICONNAME = images/icon_pgp.gif
+else
+ICONNAME = images/icon_pgp_nanox.gif
 endif
 
 APPVERSION_M:=1
@@ -57,14 +57,13 @@ DEFINES   += SPEC_VERSION=$(SPECVERSION)
 DEFINES   += GPG_MULTISLOT=$(GPG_MULTISLOT)
 #DEFINES   += GPG_LOG
 
-
-ifeq ($(TARGET_NAME),TARGET_NANOX)
-DEFINES   += UI_NANO_X
-DEFINES   += GPG_SHAKE256
-else ifeq ($(TARGET_NAME),TARGET_BLUE)
+ifeq ($(TARGET_NAME),TARGET_BLUE)
 DEFINES   += UI_BLUE
-else
+else ifeq ($(TARGET_NAME),TARGET_NANOS)
 DEFINES   += UI_NANO_S
+else
+DEFINES   += UI_NANO_X
+DEFINES   += GPG_SHAKE256
 endif
 
 
@@ -126,33 +125,32 @@ SOURCE_PATH   += $(BOLOS_SDK)/lib_cxng/src/cx_pkcs1.c
 SOURCE_PATH   += $(BOLOS_SDK)/lib_cxng/src/cx_utils.c
 # RSA - End
 
-
 ifeq ($(TARGET_NAME),TARGET_NANOX)
-# DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
-# DEFINES       += HAVE_BLE_APDU # basic ledger apdu transport over BLE
+DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
+DEFINES       += HAVE_BLE_APDU # basic ledger apdu transport over BLE
+endif
 
-DEFINES           += IO_SEPROXYHAL_BUFFER_SIZE_B=300
+ifeq ($(TARGET_NAME),TARGET_NANOS)
+DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=128
+else
+DEFINES       += IO_SEPROXYHAL_BUFFER_SIZE_B=300
 DEFINES       += HAVE_GLO096
 DEFINES       += HAVE_BAGL BAGL_WIDTH=128 BAGL_HEIGHT=64
 DEFINES       += HAVE_BAGL_ELLIPSIS # long label truncation feature
 DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX
 DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX
 DEFINES       += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX
-DEFINES           += HAVE_UX_FLOW
-DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
-DEFINES       += HAVE_BLE_APDU # basic ledger apdu transport over BLE
-else
-DEFINES           += IO_SEPROXYHAL_BUFFER_SIZE_B=128
+DEFINES       += HAVE_UX_FLOW
 endif
 
 # Enabling debug PRINTF
 DEBUG = 0
 ifneq ($(DEBUG),0)
 
-        ifeq ($(TARGET_NAME),TARGET_NANOX)
-                DEFINES   += HAVE_PRINTF PRINTF=mcu_usb_printf
-        else
+        ifeq ($(TARGET_NAME),TARGET_NANOS)
                 DEFINES   += HAVE_PRINTF PRINTF=screen_printf
+        else
+                DEFINES   += HAVE_PRINTF PRINTF=mcu_usb_printf
         endif
 	DEFINES += PLINE="PRINTF(\"FILE:%s..LINE:%d\n\",__FILE__,__LINE__)"
 else
@@ -197,9 +195,8 @@ include $(BOLOS_SDK)/Makefile.glyphs
 ### variables processed by the common makefile.rules of the SDK to grab source files and include dirs
 APP_SOURCE_PATH  += src
 SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl
-#SDK_SOURCE_PATH  += lib_u2f
-ifeq ($(TARGET_NAME),TARGET_NANOX)
 SDK_SOURCE_PATH  += lib_ux
+ifeq ($(TARGET_NAME),TARGET_NANOX)
 SDK_SOURCE_PATH  += lib_blewbxx lib_blewbxx_impl
 endif
 
diff --git a/Makefile.rules b/Makefile.rules
index 5e88ec7..bd7377e 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -16,10 +16,10 @@
 #*******************************************************************************
 
 # temporary redef, to ensure wider compliance of the SDK with pre-1.6 apps
-ifeq ($(TARGET_NAME),TARGET_NANOX)
-SDK_SOURCE_PATH += lib_bagl
-else
+ifeq ($(TARGET_NAME),TARGET_NANOS)
 SDK_SOURCE_PATH += lib_ux
+else
+SDK_SOURCE_PATH += lib_bagl
 endif
 
 #Make the SDK modified SDK sources prioritar to the original ones
diff --git a/src/gpg_gen.c b/src/gpg_gen.c
index eba93c0..4cd97ac 100644
--- a/src/gpg_gen.c
+++ b/src/gpg_gen.c
@@ -133,7 +133,7 @@ int gpg_apdu_gen() {
         break;
       case 4096 / 8:
         // temporary removal for nano X
-#ifdef TARGET_NANOX
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2)
         THROW(SW_WRONG_DATA);
         break;
 #else
diff --git a/src/gpg_nvram.c b/src/gpg_nvram.c
index 1c81d1f..040e04a 100644
--- a/src/gpg_nvram.c
+++ b/src/gpg_nvram.c
@@ -19,7 +19,7 @@
 #include "gpg_api.h"
 #include "gpg_vars.h"
 
-#ifdef TARGET_NANOX
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 const gpg_nv_state_t N_state_pic;
 #else
 gpg_nv_state_t N_state_pic;
diff --git a/src/gpg_ram.c b/src/gpg_ram.c
index fabf38d..6a7b16b 100644
--- a/src/gpg_ram.c
+++ b/src/gpg_ram.c
@@ -20,7 +20,7 @@
 #include "gpg_vars.h"
 #include "os_io_seproxyhal.h"
 
-#ifdef TARGET_NANOX
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 #include "ux.h"
 ux_state_t        G_ux;
 bolos_ux_params_t G_ux_params;
diff --git a/src/gpg_vars.h b/src/gpg_vars.h
index cb81923..4b0e33c 100644
--- a/src/gpg_vars.h
+++ b/src/gpg_vars.h
@@ -34,7 +34,7 @@ extern const unsigned char C_OID_cv25519[10];
 
 extern gpg_v_state_t G_gpg_vstate;
 
-#ifdef TARGET_NANOX
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 extern const gpg_nv_state_t N_state_pic;
 #define N_gpg_pstate ((volatile gpg_nv_state_t *)PIC(&N_state_pic))
 #else
diff --git a/src/sdk/usbd_impl.c b/src/sdk/usbd_impl.c
index 384f490..96662fc 100644
--- a/src/sdk/usbd_impl.c
+++ b/src/sdk/usbd_impl.c
@@ -182,7 +182,7 @@ static uint8_t const USBD_PRODUCT_FS_STRING[] = {
   'W', 0,
   '2', 0,
 };
-#elif defined(TARGET_NANOX)
+#elif defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 #ifndef HAVE_LEGACY_PID
 #define USBD_PID                      0x4000
 #else // HAVE_LEGACY_PID