diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index ba6121a1..8df02263 100644
--- a/src_nbgl/ui_approve_tx.c
+++ b/src_nbgl/ui_approve_tx.c
@@ -19,7 +19,7 @@ static nbgl_layoutTagValue_t tlv;
 // these buffers are used as circular
 static char title_buffer[MAX_PLUGIN_ITEMS_PER_SCREEN][TAG_MAX_LEN];
 static char msg_buffer[MAX_PLUGIN_ITEMS_PER_SCREEN][VALUE_MAX_LEN];
-
+static char transaction_type[100];
 static nbgl_layoutTagValueList_t useCaseTagValueList;
 static nbgl_pageInfoLongPress_t infoLongPress;
 
@@ -192,7 +192,7 @@ static void reviewContinueCommon(void) {
   useCaseTagValueList.smallCaseForValue = false;
   useCaseTagValueList.wrapping = false;
   infoLongPress.icon = &ICONGLYPH;
-  infoLongPress.text = "Review transaction";
+  infoLongPress.text = tx_approval_context.fromPlugin ? transaction_type : "Review transaction";
   infoLongPress.longPressText = "Hold to sign";
   nbgl_useCaseStaticReview(&useCaseTagValueList, &infoLongPress, "Reject transaction", reviewChoice);
 }
@@ -201,10 +201,8 @@ static void reviewContinueCommon(void) {
 static void buildFirstPage(void) {
   if (tx_approval_context.fromPlugin) {
     plugin_ui_get_id();
-    strcpy(title_buffer[0], strings.common.fullAddress);
-    strcpy(msg_buffer[0], strings.common.fullAmount);
-    SPRINTF(msg_buffer[1], "Review %s\ntransaction:\n%s",title_buffer[0], msg_buffer[0]);
-    nbgl_useCaseReviewStart(&ICONGLYPH, msg_buffer[1], NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion);
+    SPRINTF(transaction_type, "Review %s\ntransaction:\n%s", strings.common.fullAddress,strings.common.fullAmount);
+    nbgl_useCaseReviewStart(&ICONGLYPH, transaction_type, NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion);
   } else {
     nbgl_useCaseReviewStart(&ICONGLYPH, "Review transaction", NULL, "Reject transaction", reviewContinue, rejectTransactionQuestion);
   }
diff --git a/src_nbgl/ui_sign_message.c b/src_nbgl/ui_sign_message.c
index 8d75f9fa..e87d07c7 100644
--- a/src_nbgl/ui_sign_message.c
+++ b/src_nbgl/ui_sign_message.c
@@ -63,7 +63,7 @@ static bool nav_callback(uint8_t page, nbgl_pageContent_t *content) {
     } else {
         eip191MessageIdx = 0;
         // the last page must contain a long press button
-        content->type = INFO_LONG_PRESS, content->infoLongPress.icon = NULL;
+        content->type = INFO_LONG_PRESS, content->infoLongPress.icon = &C_Message_64px;
         content->infoLongPress.text = "Sign Message?";
         content->infoLongPress.longPressText = "Hold to sign";
         state = UI_191_NBGL_SIGN_DISPLAYED;