diff --git a/firmware/ethereum.c b/firmware/ethereum.c
index a023ab325a..857f2f9a42 100644
--- a/firmware/ethereum.c
+++ b/firmware/ethereum.c
@@ -257,7 +257,7 @@ static void layoutEthereumConfirmTx(const uint8_t *to, const uint8_t *value, uin
 		strlcpy(_to3, "", sizeof(_to3));
 	}
 
-	layoutDialogSwipe(DIALOG_ICON_QUESTION,
+	layoutDialogSwipe(&bmp_icon_question,
 		"Cancel",
 		"Confirm",
 		NULL,
diff --git a/firmware/fsm.c b/firmware/fsm.c
index e72e38a531..c54439b3d4 100644
--- a/firmware/fsm.c
+++ b/firmware/fsm.c
@@ -672,7 +672,8 @@ void fsm_msgEthereumGetAddress(EthereumGetAddress *msg)
 
 	resp->address.size = 20;
 
-	if (!ecdsa_get_ethereum_pubkeyhash(node->public_key, resp->address.bytes)) return;
+	if (!hdnode_get_ethereum_pubkeyhash(node, resp->address.bytes))
+		return;
 
 	if (msg->has_show_display && msg->show_display) {
 		char desc[16];
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index 9a8df5a4bb..f4ed55377d 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit 9a8df5a4bb5de3b1ebaa28591c2ae0a5bb39348e
+Subproject commit f4ed55377d67b48a94c219313faa3035186369cb