diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index eaf7bf6..8b48cdc 100644
--- a/src_nbgl/ui_approve_tx.c
+++ b/src_nbgl/ui_approve_tx.c
@@ -55,12 +55,16 @@ static const nbgl_icon_details_t *get_tx_icon(void) {
     const nbgl_icon_details_t *icon = NULL;
 
     if (tx_approval_context.fromPlugin && (pluginType == EXTERNAL)) {
-        if (caller_app && caller_app->name) {
-            if ((strlen(strings.common.toAddress) == strlen(caller_app->name)) &&
-                (strcmp(strings.common.toAddress, caller_app->name) == 0)) {
+        if ((caller_app != NULL) && (caller_app->name != NULL)) {
+            if (strcmp(strings.common.toAddress, caller_app->name) == 0) {
                 icon = get_app_icon(true);
             }
         }
+        // icon is NULL in this case
+        // Check with Alex if this is expected or a bug
+    } else if ((caller_app != NULL) && !tx_approval_context.fromPlugin) {
+        // Clone case
+        icon = get_app_icon(true);
     } else {
         uint64_t chain_id = get_tx_chain_id();
         if (chain_id == chainConfig->chainId) {
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png
index 2fa6f1c..238e381 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00000.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png
index bcc9dce..618815b 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00001.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png
index 681a3c6..40f6cef 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png
index 9fa70e5..e4d7d81 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png b/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png
index 6987f4b..83689ec 100644
Binary files a/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png and b/tests/ragger/snapshots/flex/test_clone_thundercore/00005.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png
index b22161f..1e18d3d 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00000.png differ
diff --git a/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png b/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png
index c19f513..997705c 100644
Binary files a/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png and b/tests/ragger/snapshots/stax/test_clone_thundercore/00003.png differ