diff --git a/Makefile b/Makefile
index 02e600a..f4aaa4a 100755
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,21 @@ DEFINES += HAVE_ETH2
 APPNAME = "Eth Ropsten"
 DEFINES_LIB=
 APP_LOAD_FLAGS=--appFlags 0xa40
+else ifeq ($(CHAIN),goerli)
+APP_LOAD_PARAMS += --path "44'/60'"
+DEFINES += CHAINID_UPCASE=\"ETHEREUM\" CHAINID_COINNAME=\"ETH\" CHAIN_KIND=CHAIN_KIND_ETHEREUM CHAIN_ID=5
+# Starkware integration
+APP_LOAD_PARAMS += --path "2645'/579218131'"
+DEFINES += HAVE_STARKWARE
+# Keep for Starkware Goerli tests
+DEFINES += HAVE_TOKENS_EXTRA_LIST
+DEFINES += STARK_BIP32_PATH_0=0x80000A55 STARK_BIP32_PATH_1=0xA2862AD3
+# Allow to derive ETH 2 public keys
+APP_LOAD_PARAMS += --path "12381/3600" --curve bls12381g1
+DEFINES += HAVE_ETH2
+APPNAME = "Eth Goerli"
+DEFINES_LIB=
+APP_LOAD_FLAGS=--appFlags 0xa40
 else ifeq ($(CHAIN),ellaism)
 APP_LOAD_PARAMS += --path "44'/163'"
 DEFINES += CHAINID_UPCASE=\"ELLA\" CHAINID_COINNAME=\"ELLA\" CHAIN_KIND=CHAIN_KIND_ELLAISM CHAIN_ID=64
@@ -213,7 +228,7 @@ DEFINES += CHAINID_UPCASE=\"SONGBIRD\" CHAINID_COINNAME=\"SGB\" CHAIN_KIND=CHAIN
 APPNAME = "Songbird"
 else
 ifeq ($(filter clean,$(MAKECMDGOALS)),)
-$(error Unsupported CHAIN - use ethereum, ropsten, ethereum_classic, expanse, poa, artis_sigma1, artis_tau1, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc, hpb, tomochain, tobalaba, dexon, volta, ewc, webchain, thundercore, bsc, songbird)
+$(error Unsupported CHAIN - use ethereum, ropsten, goerli, ethereum_classic, expanse, poa, artis_sigma1, artis_tau1, rsk, rsk_testnet, ubiq, wanchain, kusd, musicoin, pirl, akroma, atheios, callisto, ethersocial, ellaism, ether1, ethergem, gochain, mix, reosc, hpb, tomochain, tobalaba, dexon, volta, ewc, webchain, thundercore, bsc, songbird)
 endif
 endif
 
@@ -384,4 +399,4 @@ include $(BOLOS_SDK)/Makefile.rules
 dep/%.d: %.c Makefile
 
 listvariants:
-	@echo VARIANTS CHAIN ethereum ropsten ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc hpb tomochain dexon volta ewc thundercore bsc songbird
+	@echo VARIANTS CHAIN ethereum ropsten goerli ethereum_classic expanse poa rsk rsk_testnet ubiq wanchain pirl akroma atheios callisto ethersocial ether1 gochain musicoin ethergem mix ellaism reosc hpb tomochain dexon volta ewc thundercore bsc songbird
diff --git a/icons/blue_app_goerli.gif b/icons/blue_app_goerli.gif
new file mode 100644
index 0000000..c3d5c4e
Binary files /dev/null and b/icons/blue_app_goerli.gif differ
diff --git a/icons/goerli.png b/icons/goerli.png
new file mode 100755
index 0000000..60e111c
Binary files /dev/null and b/icons/goerli.png differ
diff --git a/icons/nanos_app_goerli.gif b/icons/nanos_app_goerli.gif
new file mode 100644
index 0000000..8f8fa31
Binary files /dev/null and b/icons/nanos_app_goerli.gif differ
diff --git a/icons/nanox_app_goerli.gif b/icons/nanox_app_goerli.gif
new file mode 100644
index 0000000..d70e8a7
Binary files /dev/null and b/icons/nanox_app_goerli.gif differ
diff --git a/src/tokens.c b/src/tokens.c
index cdf7d24..c4d25d9 100644
--- a/src/tokens.c
+++ b/src/tokens.c
@@ -21,6 +21,7 @@
 
 const tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA] = {
 
+    // Ropsten DeversiFi tokens
     {{0x4c, 0x5f, 0x66, 0x59, 0x61, 0x97, 0xa8, 0x6f, 0xb3, 0x0a,
       0x24, 0x35, 0xe2, 0xef, 0x4d, 0xdc, 0xb3, 0x93, 0x42, 0xc9},
      "tUSDT ",
@@ -37,6 +38,23 @@ const tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA] = {
       0x53, 0x3c, 0xd6, 0xa2, 0x1e, 0x3e, 0x59, 0xbe, 0x32, 0x4a},
      "tBTC ",
      18},
+    // Goerli DeversiFi tokens
+    {{0xd9, 0x97, 0xa8, 0x63, 0x46, 0xe7, 0x65, 0x18, 0xe6, 0x92,
+      0x25, 0x56, 0xf3, 0x4d, 0x76, 0x61, 0x30, 0xc0, 0xbb, 0xfd},
+     "tUSDT ",
+     6},
+    {{0xc1, 0xd5, 0x79, 0xeb, 0xff, 0x7c, 0x0f, 0x6c, 0xfd, 0x9a,
+      0xd5, 0xfb, 0x26, 0x7f, 0xec, 0x73, 0xbe, 0x70, 0xc8, 0xf7},
+     "tBTC ",
+     18},
+    {{0xa8, 0xf3, 0x14, 0x4f, 0xea, 0x2c, 0x37, 0x5a, 0xd0, 0x58,
+      0xec, 0x12, 0x09, 0x9a, 0x5a, 0x21, 0xa2, 0x6f, 0xe9, 0x96},
+     "tDVF ",
+     18},
+    {{0x4c, 0xda, 0xbe, 0xc1, 0x2a, 0x39, 0x7f, 0xb6, 0xef, 0xaf,
+      0x46, 0x13, 0xd5, 0xdf, 0xd7, 0x9b, 0x30, 0x9a, 0xe9, 0xfa},
+     "tXDVF ",
+     18},
 
 };
 
diff --git a/src/tokens.h b/src/tokens.h
index c3ea404..3d0d4d4 100644
--- a/src/tokens.h
+++ b/src/tokens.h
@@ -34,7 +34,7 @@ typedef struct tokenDefinition_t {
 
 #ifdef HAVE_TOKENS_EXTRA_LIST
 
-#define NUM_TOKENS_EXTRA 4
+#define NUM_TOKENS_EXTRA 8
 
 extern tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA];