diff --git a/Makefile.genericwallet b/Makefile.genericwallet
index acd77b2..37a4979 100755
--- a/Makefile.genericwallet
+++ b/Makefile.genericwallet
@@ -86,6 +86,10 @@ else ifeq ($(CHAIN),musicoin)
 APP_LOAD_PARAMS += --path "44'/184'"
 DEFINES += CHAINID_UPCASE=\"MUSICOIN\" CHAINID_COINNAME=\"MUSIC\" CHAIN_KIND=CHAIN_KIND_MUSICOIN CHAIN_ID=7762959
 APPNAME = "Musicoin"
+else ifeq ($(CHAIN),callisto)
+APP_LOAD_PARAMS += --path "44'/820'"
+DEFINES += CHAINID_UPCASE=\"CALLISTO\" CHAINID_COINNAME=\"CLO\" CHAIN_KIND=CHAIN_KIND_CALLISTO CHAIN_ID=820
+APPNAME = "Callisto"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
 $(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd)
diff --git a/blue_app_callisto.gif b/blue_app_callisto.gif
new file mode 100644
index 0000000..9b5607b
Binary files /dev/null and b/blue_app_callisto.gif differ
diff --git a/glyphs/blue_badge_callisto.gif b/glyphs/blue_badge_callisto.gif
new file mode 100644
index 0000000..9b61398
Binary files /dev/null and b/glyphs/blue_badge_callisto.gif differ
diff --git a/glyphs/nanos_badge_callisto.gif b/glyphs/nanos_badge_callisto.gif
new file mode 100644
index 0000000..25a0cdd
Binary files /dev/null and b/glyphs/nanos_badge_callisto.gif differ
diff --git a/nanos_app_callisto.gif b/nanos_app_callisto.gif
new file mode 100644
index 0000000..c0d449a
Binary files /dev/null and b/nanos_app_callisto.gif differ
diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h
index 4332e73..f14a1bb 100644
--- a/src_genericwallet/chainConfig.h
+++ b/src_genericwallet/chainConfig.h
@@ -15,7 +15,8 @@ typedef enum chain_kind_e {
 	CHAIN_KIND_KUSD,
 	CHAIN_KIND_PIRL,
 	CHAIN_KIND_AKROMA,
-	CHAIN_KIND_MUSICOIN
+	CHAIN_KIND_MUSICOIN,
+	CHAIN_KIND_CALLISTO
 } chain_kind_t;
 
 typedef struct chain_config_s {
diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c
index a0f6867..45eaefd 100644
--- a/src_genericwallet/main.c
+++ b/src_genericwallet/main.c
@@ -1293,6 +1293,9 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength
           case CHAIN_KIND_MUSICOIN:
             numTokens = NUM_TOKENS_MUSICOIN;
             break;
+          case CHAIN_KIND_CALLISTO:
+            numTokens = NUM_TOKENS_CALLISTO;
+            break;
         }
         for (i=0; i<numTokens; i++) {
             tokenDefinition_t *currentToken = NULL;
@@ -1330,6 +1333,9 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer, uint16_t dataLength
               case CHAIN_KIND_MUSICOIN:
                 currentToken = PIC(&TOKENS_MUSICOIN[i]);
                 break;
+              case CHAIN_KIND_CALLISTO:
+                currentToken = PIC(&TOKENS_CALLISTO[i]);
+                break;
             } 
             if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
                 dataPresent = false;
diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c
index 457e2ce..163b9df 100644
--- a/src_genericwallet/tokens.c
+++ b/src_genericwallet/tokens.c
@@ -723,3 +723,5 @@ const tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN] = {};
 const tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD] = {};
 
 const tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN] = {};
+
+const tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO] = {};
diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h
index 5416dcb..ac26422 100644
--- a/src_genericwallet/tokens.h
+++ b/src_genericwallet/tokens.h
@@ -34,6 +34,7 @@ typedef struct tokenDefinition_t {
 #define NUM_TOKENS_WANCHAIN 0
 #define NUM_TOKENS_KUSD 0
 #define NUM_TOKENS_MUSICOIN 0
+#define NUM_TOKENS_CALLISTO 0
 
 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
 extern tokenDefinition_t const TOKENS_ETHEREUM[NUM_TOKENS_ETHEREUM];
@@ -46,3 +47,4 @@ extern tokenDefinition_t const TOKENS_EXPANSE[NUM_TOKENS_EXPANSE];
 extern tokenDefinition_t const TOKENS_WANCHAIN[NUM_TOKENS_WANCHAIN];
 extern tokenDefinition_t const TOKENS_KUSD[NUM_TOKENS_KUSD];
 extern tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN];
+extern tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO];