diff --git a/Makefile b/Makefile
index 0ac9f7b7..a5eafddf 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,11 @@ else ifeq ($(COIN),dash)
 DEFINES   += BIP44_COIN_TYPE=5 BIP44_COIN_TYPE_2=5 COIN_P2PKH_VERSION=76 COIN_P2SH_VERSION=16 COIN_FAMILY=1 COIN_COINID=\"DarkCoin\" COIN_COINID_HEADER=\"DASH\" COIN_COINID_NAME=\"Dash\" COIN_COINID_SHORT=\"DASH\" COIN_KIND=COIN_KIND_DASH
 APPNAME ="Dash"
 APP_LOAD_PARAMS += --path $(APP_PATH)
+else ifeq ($(COIN),blocx)
+# Blocx
+DEFINES   += BIP44_COIN_TYPE=5 BIP44_COIN_TYPE_2=5 COIN_P2PKH_VERSION=25 COIN_P2SH_VERSION=26 COIN_FAMILY=1 COIN_COINID=\"DarkCoin\" COIN_COINID_HEADER=\"BLOCX\" COIN_COINID_NAME=\"BLOCX\" COIN_COINID_SHORT=\"BLOCX\" COIN_KIND=COIN_KIND_BLOCX
+APPNAME ="BLOCX."
+APP_LOAD_PARAMS += --path "44'/5'/950'"
 else ifeq ($(COIN),zcash)
 # Zcash (deprecated, code before the NU5 hard fork)
 $(error the zcash variant is deprecated and no longer functional since the NU5 hard fork)
@@ -191,7 +196,7 @@ APPNAME ="Hydra"
 APP_LOAD_PARAMS += --path "44'/609'"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
-$(error Unsupported COIN - use bitcoin_testnet, bitcoin, bitcoin_cash, bitcoin_gold, litecoin, dogecoin, dash, zcash, horizen, komodo, stratis, peercoin, pivx, viacoin, vertcoin, stealth, digibyte, bitcoin_private, firo, gamecredits, zclassic, xsn, nix, lbry, resistance, ravencoin, hydra, hydra_testnet, xrhodium)
+$(error Unsupported COIN - use bitcoin_testnet, bitcoin, bitcoin_cash, bitcoin_gold, litecoin, dogecoin, dash, blocx, zcash, horizen, komodo, stratis, peercoin, pivx, viacoin, vertcoin, stealth, digibyte, bitcoin_private, firo, gamecredits, zclassic, xsn, nix, lbry, resistance, ravencoin, hydra, hydra_testnet, xrhodium)
 endif
 endif
 
@@ -324,11 +329,11 @@ dep/%.d: %.c Makefile
 ifeq ($(TARGET_NAME),TARGET_NANOS)
 
 listvariants:
-	@echo VARIANTS COIN bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold litecoin dogecoin dash horizen komodo stratis peercoin pivx viacoin vertcoin stealth digibyte bitcoin_private firo gamecredits zclassic xsn nix lbry ravencoin resistance hydra hydra_testnet xrhodium
+	@echo VARIANTS COIN bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold litecoin dogecoin dash blocx horizen komodo stratis peercoin pivx viacoin vertcoin stealth digibyte bitcoin_private firo gamecredits zclassic xsn nix lbry ravencoin resistance hydra hydra_testnet xrhodium
 
 else
 
 listvariants:
-	@echo VARIANTS COIN bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold litecoin dogecoin dash horizen komodo stratis peercoin pivx viacoin vertcoin stealth digibyte bitcoin_private firo gamecredits zclassic xsn nix lbry ravencoin hydra hydra_testnet xrhodium
+	@echo VARIANTS COIN bitcoin_testnet_legacy bitcoin_legacy bitcoin_cash bitcoin_gold litecoin dogecoin dash blocx horizen komodo stratis peercoin pivx viacoin vertcoin stealth digibyte bitcoin_private firo gamecredits zclassic xsn nix lbry ravencoin hydra hydra_testnet xrhodium
 
 endif
diff --git a/glyphs/blocx_64px.gif b/glyphs/blocx_64px.gif
new file mode 100644
index 00000000..9177ba5c
Binary files /dev/null and b/glyphs/blocx_64px.gif differ
diff --git a/glyphs/nanos_badge_blocx.gif b/glyphs/nanos_badge_blocx.gif
new file mode 100644
index 00000000..13c389e9
Binary files /dev/null and b/glyphs/nanos_badge_blocx.gif differ
diff --git a/icons/blocx.png b/icons/blocx.png
new file mode 100644
index 00000000..8725dad6
Binary files /dev/null and b/icons/blocx.png differ
diff --git a/icons/nanos_app_blocx.gif b/icons/nanos_app_blocx.gif
new file mode 100644
index 00000000..61210b0c
Binary files /dev/null and b/icons/nanos_app_blocx.gif differ
diff --git a/icons/nanox_app_blocx.gif b/icons/nanox_app_blocx.gif
new file mode 100644
index 00000000..89099f37
Binary files /dev/null and b/icons/nanox_app_blocx.gif differ
diff --git a/icons/stax_app_blocx.gif b/icons/stax_app_blocx.gif
new file mode 100644
index 00000000..f695b452
Binary files /dev/null and b/icons/stax_app_blocx.gif differ
diff --git a/include/btchip_context.h b/include/btchip_context.h
index 562fbd65..026daa57 100644
--- a/include/btchip_context.h
+++ b/include/btchip_context.h
@@ -267,6 +267,7 @@ typedef enum btchip_coin_kind_e {
     COIN_KIND_LITECOIN,
     COIN_KIND_DOGE,
     COIN_KIND_DASH,
+    COIN_KIND_BLOCX,
     COIN_KIND_ZCASH,
     COIN_KIND_KOMODO,
     COIN_KIND_RFU,