diff --git a/Makefile.defines b/Makefile.defines
index 7675ae400..1400a4e1b 100644
--- a/Makefile.defines
+++ b/Makefile.defines
@@ -172,8 +172,8 @@ LDFLAGS  += -L$(BOLOS_SDK)/arch/st33k1/lib/
 AFLAGS   += -mcpu=cortex-m35p+nodsp -mthumb
 endif
 
-NO_UI ?= 0
-ifeq ($(NO_UI), 0)
+DISABLE_UI ?= 0
+ifeq ($(DISABLE_UI),0)
 ifeq ($(TARGET_NAME),TARGET_STAX)
 DEFINES += HAVE_BAGL_FONT_INTER_REGULAR_24PX
 DEFINES += HAVE_BAGL_FONT_INTER_SEMIBOLD_24PX
diff --git a/Makefile.rules b/Makefile.rules
index 5d06dc155..ed8f8db51 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -16,14 +16,12 @@
 #*******************************************************************************
 
 # temporary redef, to ensure wider compliance of the SDK with pre-1.6 apps
-ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOS TARGET_NANOX TARGET_NANOS2))
-ifeq ($(NO_UI), 0)
-SDK_SOURCE_PATH += lib_bagl lib_ux
-endif
-else ifeq ($(TARGET_NAME),TARGET_STAX)
-ifeq ($(NO_UI), 0)
-SDK_SOURCE_PATH += lib_nbgl lib_ux_stax
-endif
+ifeq ($(DISABLE_UI),0)
+    ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOS TARGET_NANOX TARGET_NANOS2))
+        SDK_SOURCE_PATH += lib_bagl lib_ux
+    else ifeq ($(TARGET_NAME),TARGET_STAX)
+        SDK_SOURCE_PATH += lib_nbgl lib_ux_stax
+    endif
 endif
 
 # adding the correct target header to sources
diff --git a/Makefile.standard_app b/Makefile.standard_app
index 3e5ada452..668585fd5 100644
--- a/Makefile.standard_app
+++ b/Makefile.standard_app
@@ -86,20 +86,13 @@ ifeq ($(DISABLE_STANDARD_APP_DEFINES), 1)
     DISABLE_STANDARD_USB = 1
     DISABLE_STANDARD_WEBUSB = 1
     DISABLE_STANDARD_BAGL_UX_FLOW = 1
+    DISABLE_STANDARD_SEPROXYHAL = 1
 endif
 
 ifneq ($(DISABLE_STANDARD_SNPRINTF), 1)
     DEFINES += HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
 endif
 
-ifneq ($(DEBUG), 0)
-    # Since the PRINTF implementation uses the USB code
-    ifneq ($(TARGET_NAME),TARGET_NANOS)
-        DISABLE_STANDARD_USB = 0
-    endif
-    DISABLE_SEPROXYHAL = 0
-endif
-
 ifneq ($(DISABLE_STANDARD_USB), 1)
     DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 HAVE_USB_APDU
     DEFINES += USB_SEGMENT_SIZE=64
@@ -119,7 +112,7 @@ ifneq ($(TARGET_NAME), TARGET_STAX)
 endif
 endif
 
-ifneq ($(DISABLE_SEPROXYHAL), 1)
+ifneq ($(DISABLE_STANDARD_SEPROXYHAL), 1)
     DEFINES += OS_IO_SEPROXYHAL
 endif