diff --git a/Makefile b/Makefile
index a7805a0..e878102 100755
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,10 @@ else ifeq ($(CHAIN),ethergem)
 APP_LOAD_PARAMS += --path "44'/1987'"
 DEFINES += CHAINID_UPCASE=\"ETHERGEM\" CHAINID_COINNAME=\"EGEM\" CHAIN_KIND=CHAIN_KIND_ETHERGEM CHAIN_ID=1987
 APPNAME = "EtherGem"
+else ifeq ($(CHAIN),atheios)
+APP_LOAD_PARAMS += --path "44'/1620'"
+DEFINES += CHAINID_UPCASE=\"ATHEIOS\" CHAINID_COINNAME=\"ATH\" CHAIN_KIND=CHAIN_KIND_ATHEIOS CHAIN_ID=1620
+APPNAME = "Atheios"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
 $(error Unsupported CHAIN - use ethereum, ethereum_classic, expanse, poa, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, callisto, ethersocial, ellaism, pirl, akroma, ether1, ethergem)
diff --git a/blue_app_atheios.gif b/blue_app_atheios.gif
new file mode 100644
index 0000000..c3d5c4e
Binary files /dev/null and b/blue_app_atheios.gif differ
diff --git a/glyphs/blue_badge_atheios.gif b/glyphs/blue_badge_atheios.gif
new file mode 100644
index 0000000..5174214
Binary files /dev/null and b/glyphs/blue_badge_atheios.gif differ
diff --git a/glyphs/nanos_badge_atheios.gif b/glyphs/nanos_badge_atheios.gif
new file mode 100644
index 0000000..e7447fa
Binary files /dev/null and b/glyphs/nanos_badge_atheios.gif differ
diff --git a/nanos_app_atheios.gif b/nanos_app_atheios.gif
new file mode 100644
index 0000000..590a37a
Binary files /dev/null and b/nanos_app_atheios.gif differ
diff --git a/src_genericwallet/chainConfig.h b/src_genericwallet/chainConfig.h
index f0c717b..79c1636 100644
--- a/src_genericwallet/chainConfig.h
+++ b/src_genericwallet/chainConfig.h
@@ -20,7 +20,8 @@ typedef enum chain_kind_e {
 	CHAIN_KIND_ETHERSOCIAL,
 	CHAIN_KIND_ELLAISM,
 	CHAIN_KIND_ETHER1,
-	CHAIN_KIND_ETHERGEM
+	CHAIN_KIND_ETHERGEM,
+	CHAIN_KIND_ATHEIOS
 } chain_kind_t;
 
 typedef struct chain_config_s {
diff --git a/src_genericwallet/main.c b/src_genericwallet/main.c
index cbf82ac..132903a 100644
--- a/src_genericwallet/main.c
+++ b/src_genericwallet/main.c
@@ -1558,6 +1558,9 @@ tokenDefinition_t* getKnownToken() {
         case CHAIN_KIND_ETHERGEM:
             numTokens = NUM_TOKENS_ETHERGEM;
             break;
+        case CHAIN_KIND_ATHEIOS:
+            numTokens = NUM_TOKENS_ATHEIOS;
+            break;
     }
     for (i=0; i<numTokens; i++) {            
         switch(chainConfig->kind) {
@@ -1609,6 +1612,9 @@ tokenDefinition_t* getKnownToken() {
             case CHAIN_KIND_ETHERGEM:
                 currentToken = PIC(&TOKENS_ETHERGEM[i]);
                 break;
+            case CHAIN_KIND_ATHEIOS:
+                currentToken = PIC(&TOKENS_ATHEIOS[i]);
+                break;
         } 
         if (os_memcmp(currentToken->address, tmpContent.txContent.destination, 20) == 0) {
             return currentToken;
diff --git a/src_genericwallet/tokens.c b/src_genericwallet/tokens.c
index bc838c0..c9a898a 100644
--- a/src_genericwallet/tokens.c
+++ b/src_genericwallet/tokens.c
@@ -735,3 +735,5 @@ const tokenDefinition_t const TOKENS_MUSICOIN[NUM_TOKENS_MUSICOIN] = {};
 const tokenDefinition_t const TOKENS_CALLISTO[NUM_TOKENS_CALLISTO] = {};
 
 const tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM] = {};
+
+const tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS] = {};
diff --git a/src_genericwallet/tokens.h b/src_genericwallet/tokens.h
index 9f59dbc..6ab3082 100644
--- a/src_genericwallet/tokens.h
+++ b/src_genericwallet/tokens.h
@@ -39,6 +39,7 @@ typedef struct tokenDefinition_t {
 #define NUM_TOKENS_MUSICOIN 0
 #define NUM_TOKENS_CALLISTO 0
 #define NUM_TOKENS_ETHERGEM 0
+#define NUM_TOKENS_ATHEIOS 0
 
 extern tokenDefinition_t const TOKENS_AKROMA[NUM_TOKENS_AKROMA];
 extern tokenDefinition_t const TOKENS_ELLAISM[NUM_TOKENS_ELLAISM];
@@ -56,3 +57,4 @@ 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];
 extern tokenDefinition_t const TOKENS_ETHERGEM[NUM_TOKENS_ETHERGEM];
+extern tokenDefinition_t const TOKENS_ATHEIOS[NUM_TOKENS_ATHEIOS];