diff --git a/Makefile b/Makefile
index c1075806..3b8f5483 100755
--- a/Makefile
+++ b/Makefile
@@ -33,10 +33,10 @@ DEFINES   += APPVERSION=\"$(APPVERSION)\"
 COIN = xrp
 
 #prepare hsm generation
-ifeq ($(TARGET_NAME),TARGET_NANOX)
-ICONNAME=img/nanox_app_$(COIN).gif
-else
+ifeq ($(TARGET_NAME),TARGET_NANOS)
 ICONNAME=img/nanos_app_$(COIN).gif
+else
+ICONNAME=img/nanox_app_$(COIN).gif
 endif
 
 
@@ -66,28 +66,30 @@ DEFINES   += U2F_PROXY_MAGIC=\"XRP\"
 DEFINES   += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL=""
 
 ifeq ($(TARGET_NAME),TARGET_NANOX)
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=300
 DEFINES       += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000
 DEFINES       += HAVE_BLE_APDU # basic ledger apdu transport over BLE
+endif
 
+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
-else
-DEFINES   += IO_SEPROXYHAL_BUFFER_SIZE_B=128
 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
 else
         DEFINES   += PRINTF\(...\)=
diff --git a/src/limitations.h b/src/limitations.h
index 965e17e2..c54e14ca 100644
--- a/src/limitations.h
+++ b/src/limitations.h
@@ -32,7 +32,7 @@
 // Hardware dependent limits
 //   Ledger Nano X has 30K RAM
 //   Ledger Nano S has 4K RAM
-#if defined(TARGET_NANOX)
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 
 #define MAX_FIELD_COUNT        60
 #define MAX_FIELD_LEN          1024
diff --git a/src/ui/ux.h b/src/ui/ux.h
index eae1c2ef..6ebc8b03 100644
--- a/src/ui/ux.h
+++ b/src/ui/ux.h
@@ -18,7 +18,7 @@
 #ifndef LEDGER_APP_XRP_UX_H
 #define LEDGER_APP_XRP_UX_H
 
-#if defined(TARGET_NANOX)
+#if defined(TARGET_NANOX) || defined(TARGET_NANOS2)
 #define DEV_SCREEN_H 64
 #elif defined(TARGET_NANOS)
 #define DEV_SCREEN_H 32