diff --git a/lib_nbgl/src/nbgl_layout.c b/lib_nbgl/src/nbgl_layout.c
index 235af5efc..702e10db8 100644
--- a/lib_nbgl/src/nbgl_layout.c
+++ b/lib_nbgl/src/nbgl_layout.c
@@ -2817,7 +2817,7 @@ int nbgl_layoutAddExtendedFooter(nbgl_layout_t *layout, const nbgl_layoutFooter_
         default:
             return -2;
     }
-#ifndef TARGET_STAX
+#if 1
     // add swipable feature for navigation
     if ((footerDesc->type == FOOTER_NAV) || (footerDesc->type == FOOTER_TEXT_AND_NAV)) {
         addSwipeInternal(layoutInt,
diff --git a/lib_nbgl/src/nbgl_page.c b/lib_nbgl/src/nbgl_page.c
index 4db978475..94d7dcd9a 100644
--- a/lib_nbgl/src/nbgl_page.c
+++ b/lib_nbgl/src/nbgl_page.c
@@ -553,7 +553,7 @@ nbgl_page_t *nbgl_pageDrawGenericContentExt(nbgl_layoutTouchCallback_t       onA
                     footerDesc.navigation.tuneId            = nav->tuneId;
                 }
                 else {
-                    footerDesc.type                              = FOOTER_TEXT_AND_NAV;
+                    footerDesc.type                              = FOOTER_NAV;
                     footerDesc.textAndNav.text                   = nav->navWithButtons.quitText;
                     footerDesc.textAndNav.tuneId                 = nav->tuneId;
                     footerDesc.textAndNav.token                  = nav->quitToken;
diff --git a/lib_nbgl/src/nbgl_use_case.c b/lib_nbgl/src/nbgl_use_case.c
index 11281b897..59d2e8fea 100644
--- a/lib_nbgl/src/nbgl_use_case.c
+++ b/lib_nbgl/src/nbgl_use_case.c
@@ -336,12 +336,13 @@ static void prepareNavInfo(bool isReview, uint8_t nbPages, const char *rejectTex
     }
     else {
         navInfo.quitToken = REJECT_TOKEN;
-#ifdef TARGET_STAX
+        // #ifdef TARGET_STAX
+#if 0
         navInfo.navType                  = NAV_WITH_TAP;
         navInfo.navWithTap.nextPageToken = NEXT_TOKEN;
         navInfo.navWithTap.quitText      = rejectText;
         navInfo.navWithTap.backToken     = BACK_TOKEN;
-#else   // TARGET_STAX
+#else  // TARGET_STAX
         UNUSED(rejectText);
         navInfo.navType                 = NAV_WITH_BUTTONS;
         navInfo.navWithButtons.quitText = "Reject";