diff --git a/Makefile b/Makefile
index bcff942c..f33fdf77 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,13 @@ $(error Environment variable BOLOS_SDK is not set)
 endif
 include $(BOLOS_SDK)/Makefile.defines
 
-ifeq ($(BAKING_APP),Y)
+ifeq ($(APP),)
+APP=tezos_wallet
+endif
+
+ifeq ($(APP),tezos_baking)
 APPNAME = "Tezos Baking"
-else
+else ifeq ($(APP),tezos_wallet)
 APPNAME = "Tezos Wallet"
 endif
 APP_LOAD_PARAMS=--appFlags 0 --curve ed25519 --curve secp256k1 --curve prime256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS)
@@ -59,15 +63,21 @@ DEFINES   += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(AP
 ##############
 #  Compiler  #
 ##############
+ifneq ($(BOLOS_ENV),)
 GCCPATH   := $(BOLOS_ENV)/gcc-arm-none-eabi-5_3-2016q1/bin/
 CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin/
+endif
+
 CC       := $(CLANGPATH)clang
 
-ifeq ($(BAKING_APP),)
+ifeq ($(APP),tezos_wallet)
 CFLAGS   += -O3 -Os -Wall -Wextra
-endif
-ifeq ($(BAKING_APP),Y)
+else ifeq ($(APP),tezos_baking)
 CFLAGS   += -DBAKING_APP -O3 -Os -Wall -Wextra
+else
+ifeq ($(filter clean,$(MAKECMDGOALS)),)
+$(error Unsupported APP - use tezos_wallet, tezos_baking)
+endif
 endif
 
 AS     := $(GCCPATH)arm-none-eabi-gcc
@@ -84,7 +94,7 @@ APP_SOURCE_PATH  += src
 SDK_SOURCE_PATH  += lib_stusb lib_stusb_impl
 
 ### U2F support (wallet app only)
-ifeq ($(BAKING_APP),)
+ifeq ($(APP), tezos_wallet)
 SDK_SOURCE_PATH  += lib_u2f lib_stusb_impl
 
 DEFINES   += USB_SEGMENT_SIZE=64
@@ -107,3 +117,6 @@ include $(BOLOS_SDK)/Makefile.rules
 
 #add dependency on custom makefile filename
 dep/%.d: %.c Makefile
+
+listvariants:
+	@echo VARIANTS APP tezos_wallet tezos_baking
diff --git a/tezos_baking.png b/tezos_baking.png
new file mode 100644
index 00000000..9f41169b
Binary files /dev/null and b/tezos_baking.png differ
diff --git a/tezos_wallet.png b/tezos_wallet.png
new file mode 100644
index 00000000..6f94e6c9
Binary files /dev/null and b/tezos_wallet.png differ