diff --git a/app/Makefile b/app/Makefile
index 9f9cca7..7712899 100755
--- a/app/Makefile
+++ b/app/Makefile
@@ -76,13 +76,13 @@ ifeq ($(TARGET_NAME),TARGET_NANOX)
 DEFINES += SUBSTRATE_PARSER_FULL
 endif
 APPNAME = "Edgeware"
-APPPATH = "44'/747'"
+APPPATH = "44'/523'"
 
 else ifeq ($(COIN),DOT_XL)
 # XXL app configuration
 DEFINES += APP_STANDARD SUBSTRATE_PARSER_FULL
 APPNAME = "Edgeware XL"
-APPPATH = "44'/747'"
+APPPATH = "44'/523'"
 
 else
 define error_message
diff --git a/app/Makefile.version b/app/Makefile.version
index 3b9e86c..d68b666 100644
--- a/app/Makefile.version
+++ b/app/Makefile.version
@@ -3,4 +3,4 @@ APPVERSION_M=1
 # This is the `spec_version` field of `Runtime`
 APPVERSION_N=46
 # This is the patch version of this release
-APPVERSION_P=1
+APPVERSION_P=2
diff --git a/app/glyphs/icon_app.gif b/app/glyphs/icon_app.gif
index 280a47e..ca5d671 100644
Binary files a/app/glyphs/icon_app.gif and b/app/glyphs/icon_app.gif differ
diff --git a/app/nanos_icon.gif b/app/nanos_icon.gif
index 280a47e..ca5d671 100644
Binary files a/app/nanos_icon.gif and b/app/nanos_icon.gif differ
diff --git a/app/nanox_icon.gif b/app/nanox_icon.gif
index a4fcc74..00f4e18 100644
Binary files a/app/nanox_icon.gif and b/app/nanox_icon.gif differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00000.png b/tests_zemu/snapshots/s-mainmenu/00000.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00000.png and b/tests_zemu/snapshots/s-mainmenu/00000.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00001.png b/tests_zemu/snapshots/s-mainmenu/00001.png
index 27a6e33..0453bf0 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00001.png and b/tests_zemu/snapshots/s-mainmenu/00001.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00002.png b/tests_zemu/snapshots/s-mainmenu/00002.png
index 4e22c50..0a8d8d5 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00002.png and b/tests_zemu/snapshots/s-mainmenu/00002.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00003.png b/tests_zemu/snapshots/s-mainmenu/00003.png
index 27a6e33..0453bf0 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00003.png and b/tests_zemu/snapshots/s-mainmenu/00003.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00004.png b/tests_zemu/snapshots/s-mainmenu/00004.png
index 79d9011..42ac50a 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00004.png and b/tests_zemu/snapshots/s-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00005.png b/tests_zemu/snapshots/s-mainmenu/00005.png
index 8a57fc9..b656bc3 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00005.png and b/tests_zemu/snapshots/s-mainmenu/00005.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00006.png b/tests_zemu/snapshots/s-mainmenu/00006.png
index d389fce..0b26354 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00006.png and b/tests_zemu/snapshots/s-mainmenu/00006.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00009.png b/tests_zemu/snapshots/s-mainmenu/00009.png
index d389fce..0b26354 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00009.png and b/tests_zemu/snapshots/s-mainmenu/00009.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00010.png b/tests_zemu/snapshots/s-mainmenu/00010.png
index 8a57fc9..b656bc3 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00010.png and b/tests_zemu/snapshots/s-mainmenu/00010.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00011.png b/tests_zemu/snapshots/s-mainmenu/00011.png
index 79d9011..42ac50a 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00011.png and b/tests_zemu/snapshots/s-mainmenu/00011.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00012.png b/tests_zemu/snapshots/s-mainmenu/00012.png
index 27a6e33..0453bf0 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00012.png and b/tests_zemu/snapshots/s-mainmenu/00012.png differ
diff --git a/tests_zemu/snapshots/s-mainmenu/00013.png b/tests_zemu/snapshots/s-mainmenu/00013.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-mainmenu/00013.png and b/tests_zemu/snapshots/s-mainmenu/00013.png differ
diff --git a/tests_zemu/snapshots/s-show_address/00003.png b/tests_zemu/snapshots/s-show_address/00003.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-show_address/00003.png and b/tests_zemu/snapshots/s-show_address/00003.png differ
diff --git a/tests_zemu/snapshots/s-show_address_reject/00008.png b/tests_zemu/snapshots/s-show_address_reject/00008.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-show_address_reject/00008.png and b/tests_zemu/snapshots/s-show_address_reject/00008.png differ
diff --git a/tests_zemu/snapshots/s-show_address_reject_sr25519/00008.png b/tests_zemu/snapshots/s-show_address_reject_sr25519/00008.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-show_address_reject_sr25519/00008.png and b/tests_zemu/snapshots/s-show_address_reject_sr25519/00008.png differ
diff --git a/tests_zemu/snapshots/s-show_address_sr25519/00003.png b/tests_zemu/snapshots/s-show_address_sr25519/00003.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-show_address_sr25519/00003.png and b/tests_zemu/snapshots/s-show_address_sr25519/00003.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_expert/00012.png b/tests_zemu/snapshots/s-sign_basic_expert/00012.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_expert/00012.png and b/tests_zemu/snapshots/s-sign_basic_expert/00012.png differ
diff --git a/tests_zemu/snapshots/s-sign_basic_normal/00006.png b/tests_zemu/snapshots/s-sign_basic_normal/00006.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-sign_basic_normal/00006.png and b/tests_zemu/snapshots/s-sign_basic_normal/00006.png differ
diff --git a/tests_zemu/snapshots/s-sign_large_nomination/00007.png b/tests_zemu/snapshots/s-sign_large_nomination/00007.png
index f9903ba..660975e 100644
Binary files a/tests_zemu/snapshots/s-sign_large_nomination/00007.png and b/tests_zemu/snapshots/s-sign_large_nomination/00007.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00000.png b/tests_zemu/snapshots/x-mainmenu/00000.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00000.png and b/tests_zemu/snapshots/x-mainmenu/00000.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00004.png b/tests_zemu/snapshots/x-mainmenu/00004.png
index 05b5e01..ea9bd45 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00004.png and b/tests_zemu/snapshots/x-mainmenu/00004.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00011.png b/tests_zemu/snapshots/x-mainmenu/00011.png
index 05b5e01..ea9bd45 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00011.png and b/tests_zemu/snapshots/x-mainmenu/00011.png differ
diff --git a/tests_zemu/snapshots/x-mainmenu/00013.png b/tests_zemu/snapshots/x-mainmenu/00013.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-mainmenu/00013.png and b/tests_zemu/snapshots/x-mainmenu/00013.png differ
diff --git a/tests_zemu/snapshots/x-show_address/00000.png b/tests_zemu/snapshots/x-show_address/00000.png
index bd5d82e..81a5816 100644
Binary files a/tests_zemu/snapshots/x-show_address/00000.png and b/tests_zemu/snapshots/x-show_address/00000.png differ
diff --git a/tests_zemu/snapshots/x-show_address/00003.png b/tests_zemu/snapshots/x-show_address/00003.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-show_address/00003.png and b/tests_zemu/snapshots/x-show_address/00003.png differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00000.png b/tests_zemu/snapshots/x-show_address_reject/00000.png
index bd5d82e..81a5816 100644
Binary files a/tests_zemu/snapshots/x-show_address_reject/00000.png and b/tests_zemu/snapshots/x-show_address_reject/00000.png differ
diff --git a/tests_zemu/snapshots/x-show_address_reject/00008.png b/tests_zemu/snapshots/x-show_address_reject/00008.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-show_address_reject/00008.png and b/tests_zemu/snapshots/x-show_address_reject/00008.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_expert/00000.png b/tests_zemu/snapshots/x-sign_basic_expert/00000.png
index bd5d82e..81a5816 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_expert/00000.png and b/tests_zemu/snapshots/x-sign_basic_expert/00000.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_expert/00012.png b/tests_zemu/snapshots/x-sign_basic_expert/00012.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_expert/00012.png and b/tests_zemu/snapshots/x-sign_basic_expert/00012.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_normal/00000.png b/tests_zemu/snapshots/x-sign_basic_normal/00000.png
index bd5d82e..81a5816 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_normal/00000.png and b/tests_zemu/snapshots/x-sign_basic_normal/00000.png differ
diff --git a/tests_zemu/snapshots/x-sign_basic_normal/00006.png b/tests_zemu/snapshots/x-sign_basic_normal/00006.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-sign_basic_normal/00006.png and b/tests_zemu/snapshots/x-sign_basic_normal/00006.png differ
diff --git a/tests_zemu/snapshots/x-sign_large_nomination/00000.png b/tests_zemu/snapshots/x-sign_large_nomination/00000.png
index bd5d82e..81a5816 100644
Binary files a/tests_zemu/snapshots/x-sign_large_nomination/00000.png and b/tests_zemu/snapshots/x-sign_large_nomination/00000.png differ
diff --git a/tests_zemu/snapshots/x-sign_large_nomination/00006.png b/tests_zemu/snapshots/x-sign_large_nomination/00006.png
index 73fd129..b835a37 100644
Binary files a/tests_zemu/snapshots/x-sign_large_nomination/00006.png and b/tests_zemu/snapshots/x-sign_large_nomination/00006.png differ