diff --git a/src_nbgl/ui_approve_tx.c b/src_nbgl/ui_approve_tx.c
index 8b48cdc..6b8b8ea 100644
--- a/src_nbgl/ui_approve_tx.c
+++ b/src_nbgl/ui_approve_tx.c
@@ -51,7 +51,7 @@ static void reviewChoice(bool confirm) {
     }
 }
 
-static const nbgl_icon_details_t *get_tx_icon(void) {
+const nbgl_icon_details_t *get_tx_icon(void) {
     const nbgl_icon_details_t *icon = NULL;
 
     if (tx_approval_context.fromPlugin && (pluginType == EXTERNAL)) {
diff --git a/src_nbgl/ui_confirm_parameter_selector.c b/src_nbgl/ui_confirm_parameter_selector.c
index f9e06e9..e4dca60 100644
--- a/src_nbgl/ui_confirm_parameter_selector.c
+++ b/src_nbgl/ui_confirm_parameter_selector.c
@@ -4,30 +4,25 @@
 #include "network.h"
 
 typedef enum { PARAMETER_CONFIRMATION, SELECTOR_CONFIRMATION } e_confirmation_type;
+static nbgl_contentTagValue_t pair;
+static nbgl_contentTagValueList_t pairsList;
 
-enum {
-    TOKEN_APPROVE = FIRST_USER_TOKEN,
-};
-
-static void reviewReject(void) {
-    io_seproxyhal_touch_data_cancel(NULL);
-}
-
-static void long_press_cb(int token, uint8_t index, int page) {
-    UNUSED(index);
-    UNUSED(page);
-    if (token == TOKEN_APPROVE) {
+static void reviewChoice(bool confirm) {
+    if (confirm) {
         io_seproxyhal_touch_data_ok(NULL);
+    } else {
+        io_seproxyhal_touch_data_cancel(NULL);
     }
 }
 
 static void buildScreen(e_confirmation_type confirm_type) {
-    static nbgl_genericContents_t contents = {0};
-    static nbgl_content_t contentsList[3] = {0};
-    static nbgl_contentTagValue_t pair = {0};
-    uint8_t nbContents = 0;
     uint32_t buf_size = SHARED_BUFFER_SIZE / 2;
+    nbgl_operationType_t op = TYPE_TRANSACTION;
 
+    pair.item = (confirm_type == PARAMETER_CONFIRMATION) ? "Parameter" : "Selector";
+    pair.value = strings.tmp.tmp;
+    pairsList.nbPairs = 1;
+    pairsList.pairs = &pair;
     snprintf(g_stax_shared_buffer,
              buf_size,
              "Verify %s",
@@ -38,37 +33,16 @@ static void buildScreen(e_confirmation_type confirm_type) {
              "Confirm %s",
              (confirm_type == PARAMETER_CONFIRMATION) ? "parameter" : "selector");
 
-    pair.item = (confirm_type == PARAMETER_CONFIRMATION) ? "Parameter" : "Selector";
-    pair.value = strings.tmp.tmp;
-
-    // Title page
-    contentsList[nbContents].type = CENTERED_INFO;
-    contentsList[nbContents].content.centeredInfo.text1 = g_stax_shared_buffer;
-    contentsList[nbContents].content.centeredInfo.icon = get_app_icon(true);
-    contentsList[nbContents].content.centeredInfo.style = LARGE_CASE_INFO;
-    nbContents++;
-
-    // Values to be reviewed
-    contentsList[nbContents].type = TAG_VALUE_LIST;
-    contentsList[nbContents].content.tagValueList.pairs = &pair;
-    contentsList[nbContents].content.tagValueList.nbPairs = 1;
-    nbContents++;
-
-    // Approval screen
-    contentsList[nbContents].type = INFO_LONG_PRESS;
-    contentsList[nbContents].content.infoLongPress.text = g_stax_shared_buffer + buf_size;
-    contentsList[nbContents].content.infoLongPress.icon = get_app_icon(true);
-    contentsList[nbContents].content.infoLongPress.longPressText = "Hold to confirm";
-    contentsList[nbContents].content.infoLongPress.longPressToken = TOKEN_APPROVE;
-    contentsList[nbContents].content.infoLongPress.tuneId = NB_TUNES;
-    contentsList[nbContents].contentActionCallback = long_press_cb;
-    nbContents++;
-
-    contents.callbackCallNeeded = false;
-    contents.contentsList = contentsList;
-    contents.nbContents = nbContents;
-
-    nbgl_useCaseGenericReview(&contents, REJECT_BUTTON, reviewReject);
+    if (tmpContent.txContent.dataPresent) {
+        op |= BLIND_OPERATION;
+    }
+    nbgl_useCaseReview(op,
+                       &pairsList,
+                       get_tx_icon(),
+                       g_stax_shared_buffer,
+                       NULL,
+                       g_stax_shared_buffer + buf_size,
+                       reviewChoice);
 }
 
 void ui_confirm_parameter(void) {
diff --git a/src_nbgl/ui_nbgl.h b/src_nbgl/ui_nbgl.h
index 668b51a..d983311 100644
--- a/src_nbgl/ui_nbgl.h
+++ b/src_nbgl/ui_nbgl.h
@@ -11,6 +11,7 @@ extern char g_stax_shared_buffer[SHARED_BUFFER_SIZE];
 extern nbgl_page_t* pageContext;
 
 const nbgl_icon_details_t* get_app_icon(bool caller_icon);
+const nbgl_icon_details_t* get_tx_icon(void);
 
 void ui_idle(void);