diff --git a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
index deb95bd48555..13caa0c5dc82 100644
--- a/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
+++ b/ui/components/app/snaps/snap-ui-address/__snapshots__/snap-ui-address.test.tsx.snap
@@ -172,7 +172,7 @@ exports[`SnapUIAddress renders Ethereum address 1`] = `
           <rect
             fill="#F29602"
             height="32"
-            transform="translate(-2.81750896228304 4.951916544006229) rotate(230.4 16 16)"
+            transform="translate(-2.8175089622830405 4.951916544006229) rotate(230.4 16 16)"
             width="32"
             x="0"
             y="0"
@@ -476,7 +476,7 @@ exports[`SnapUIAddress renders legacy Ethereum address 1`] = `
           <rect
             fill="#F29602"
             height="32"
-            transform="translate(-2.81750896228304 4.951916544006229) rotate(230.4 16 16)"
+            transform="translate(-2.8175089622830405 4.951916544006229) rotate(230.4 16 16)"
             width="32"
             x="0"
             y="0"
diff --git a/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap b/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap
index b4a4836db2d6..0f4049b0c4e6 100644
--- a/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap
+++ b/ui/components/multichain/connect-accounts-modal/__snapshots__/connect-accounts-modal.test.tsx.snap
@@ -159,7 +159,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
                                 <rect
                                   fill="#FA4300"
                                   height="32"
-                                  transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
+                                  transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
                                   width="32"
                                   x="0"
                                   y="0"
@@ -202,7 +202,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
                                 <rect
                                   fill="#FA4300"
                                   height="32"
-                                  transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
+                                  transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
                                   width="32"
                                   x="0"
                                   y="0"
@@ -261,7 +261,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
                         <rect
                           fill="#FA4300"
                           height="32"
-                          transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
+                          transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
                           width="32"
                           x="0"
                           y="0"
@@ -304,7 +304,7 @@ exports[`Connect More Accounts Modal should render correctly 1`] = `
                         <rect
                           fill="#FA4300"
                           height="32"
-                          transform="translate(-1.712066926084717 -0.6920409130150889) rotate(264.3 16 16)"
+                          transform="translate(-1.712066926084717 -0.6920409130150887) rotate(264.3 16 16)"
                           width="32"
                           x="0"
                           y="0"
diff --git a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
index 5230656202d3..e90c797844a6 100644
--- a/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-original/__snapshots__/signature-request-original.test.js.snap
@@ -40,7 +40,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
           <div
             class="confirm-page-container-navigation__navtext"
           >
-            0
+            1
              
             of
              
@@ -54,7 +54,7 @@ exports[`SignatureRequestOriginal should match snapshot 1`] = `
         </div>
         <div
           class="confirm-page-container-navigation__container"
-          style="visibility: initial;"
+          style="visibility: hidden;"
         >
           <button
             class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
index fcf0bb30d8a3..63f215934a52 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request-siwe/__snapshots__/signature-request-siwe.test.js.snap
@@ -40,7 +40,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
           <div
             class="confirm-page-container-navigation__navtext"
           >
-            0
+            1
              
             of
              
@@ -54,7 +54,7 @@ exports[`SignatureRequestSIWE (Sign in with Ethereum) should match snapshot 1`]
         </div>
         <div
           class="confirm-page-container-navigation__container"
-          style="visibility: initial;"
+          style="visibility: hidden;"
         >
           <button
             class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js
index f8f1a67b8cbc..99c37b07f317 100644
--- a/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js
+++ b/ui/pages/confirmations/components/signature-request-siwe/signature-request-siwe.test.js
@@ -192,6 +192,10 @@ describe('SignatureRequestSIWE (Sign in with Ethereum)', () => {
             },
           ],
           unapprovedPersonalMsgCount: 2,
+          pendingApprovals: {
+            test1: { type: ApprovalType.PersonalSign },
+            test2: { type: ApprovalType.PersonalSign },
+          },
         },
       });
 
diff --git a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
index 943f8699b9aa..340e55fec5f3 100644
--- a/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
+++ b/ui/pages/confirmations/components/signature-request/__snapshots__/signature-request.test.js.snap
@@ -37,11 +37,11 @@ exports[`Signature Request Component render should match snapshot when we are us
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
-          0
+          1
         </div>
         <div
           class="confirm-page-container-navigation__longtext"
@@ -810,11 +810,11 @@ exports[`Signature Request Component render should match snapshot when we want t
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
-          0
+          1
         </div>
         <div
           class="confirm-page-container-navigation__longtext"
diff --git a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
index 9ec3f2ac08d2..8fbb99891d01 100644
--- a/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
+++ b/ui/pages/confirmations/confirm-send-ether/__snapshots__/confirm-send-ether.test.js.snap
@@ -8,7 +8,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
   >
     <div
       class="confirm-page-container-navigation"
-      style="display: flex;"
+      style="display: none;"
     >
       <div
         class="confirm-page-container-navigation__container"
@@ -38,11 +38,11 @@ exports[`ConfirmSendEther should render correct information for for confirm send
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
-          2
+          1
         </div>
         <div
           class="confirm-page-container-navigation__longtext"
@@ -52,7 +52,7 @@ exports[`ConfirmSendEther should render correct information for for confirm send
       </div>
       <div
         class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
+        style="visibility: hidden;"
       >
         <button
           class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
index 9dc64fcc57eb..824326bc3b2e 100644
--- a/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
+++ b/ui/pages/confirmations/confirm-signature-request/__snapshots__/index.test.js.snap
@@ -37,7 +37,7 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] =
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
@@ -51,7 +51,7 @@ exports[`Confirm Signature Request Component render should match snapshot 1`] =
       </div>
       <div
         class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
+        style="visibility: hidden;"
       >
         <button
           class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
index 5cdbdd5de6a5..28045194b316 100644
--- a/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
+++ b/ui/pages/confirmations/confirm-transaction-base/__snapshots__/confirm-transaction-base.test.js.snap
@@ -38,7 +38,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
         <div
           class="confirm-page-container-navigation__navtext"
         >
-          0
+          1
            
           of
            
@@ -52,7 +52,7 @@ exports[`Confirm Transaction Base should match snapshot 1`] = `
       </div>
       <div
         class="confirm-page-container-navigation__container"
-        style="visibility: initial;"
+        style="visibility: hidden;"
       >
         <button
           class="confirm-page-container-navigation__arrow"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
index d29769f0ca7f..27baa7f5cb79 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/add-ethereum-chain.test.js.snap
@@ -7,7 +7,7 @@ exports[`add-ethereum-chain confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h3
         class="box box--md:margin-4 box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h3 typography--weight-bold typography--style-normal typography--align-center typography--color-text-default"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap
index aacd67bc4ad8..3d1f090c3b23 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-named-snap-account.test.js.snap
@@ -5,9 +5,63 @@ exports[`create-named-snap-account confirmation matches snapshot 1`] = `
   <div
     class="confirmation-page"
   >
+    <div
+      class="mm-box"
+      style="width: 100%;"
+    >
+      <div
+        class="mm-box mm-box--padding-3 mm-box--display-flex mm-box--flex-direction-row mm-box--justify-content-space-between mm-box--align-items-center mm-box--background-color-background-default"
+        style="z-index: 2;"
+      >
+        <div
+          class="mm-box mm-box--display-flex mm-box--align-items-center"
+        >
+          <button
+            aria-label="Previous Confirmation"
+            class="mm-box mm-button-icon mm-button-icon--size-sm mm-button-icon--disabled confirm_nav__left_btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
+            data-testid="confirm-nav__previous-confirmation"
+            disabled=""
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+              style="mask-image: url('./images/icons/arrow-left.svg');"
+            />
+          </button>
+          <p
+            class="mm-box mm-text mm-text--body-sm mm-box--margin-inline-2 mm-box--color-text-alternative"
+          >
+            1
+             of 
+            2
+          </p>
+          <button
+            aria-label="Next Confirmation"
+            class="mm-box mm-button-icon mm-button-icon--size-sm confirm_nav__right_btn mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-icon-alternative mm-box--background-color-background-alternative mm-box--rounded-full"
+            data-testid="confirm-nav__next-confirmation"
+          >
+            <span
+              class="mm-box mm-icon mm-icon--size-sm mm-box--display-inline-block mm-box--color-inherit"
+              style="mask-image: url('./images/icons/arrow-right.svg');"
+            />
+          </button>
+        </div>
+        <button
+          class="mm-box mm-text mm-button-base mm-button-base--size-md confirm_nav__reject_all mm-button-primary mm-text--body-md-medium mm-text--font-weight-normal mm-box--padding-0 mm-box--padding-right-3 mm-box--padding-left-3 mm-box--display-inline-flex mm-box--justify-content-center mm-box--align-items-center mm-box--color-primary-inverse mm-box--background-color-primary-default mm-box--rounded-xl"
+          data-testid="confirm-nav__reject-all"
+          data-theme="light"
+          type="secondary"
+        >
+          <span
+            class="mm-box mm-icon mm-icon--size-sm mm-box--margin-inline-end-1 mm-box--display-inline-block mm-box--color-inherit"
+            style="mask-image: url('./images/icons/close.svg');"
+          />
+          Reject all
+        </button>
+      </div>
+    </div>
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box name-snap-account-page mm-box--padding-4"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
index 850025310848..3b65da3f25be 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/create-snap-account.test.js.snap
@@ -7,7 +7,7 @@ exports[`create-snap-account confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box create-snap-account-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap
index 3ddae9288742..d577cb0ce95f 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/error.test.js.snap
@@ -7,7 +7,7 @@ exports[`error template matches the snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h2
         class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-normal typography--style-normal typography--color-text-default"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
index 317071e6be26..1673efaa6631 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/remove-snap-account.test.js.snap
@@ -7,7 +7,7 @@ exports[`remove-snap-account confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box remove-snap-account-page mm-box--margin-bottom-0 mm-box--display-flex mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap
index b4230e3a824f..2bb01a78a6b0 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/snap-account-redirect.test.js.snap
@@ -7,7 +7,7 @@ exports[`snap-account-redirect confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <div
         class="mm-box create-snap-account-page mm-box--flex-direction-column mm-box--align-items-center mm-box--width-full mm-box--height-full mm-box--border-style-none"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap
index 3d99fcdffc56..875b142831a5 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/success.test.js.snap
@@ -7,7 +7,7 @@ exports[`success template matches the snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h2
         class="box box--margin-top-1 box--margin-bottom-1 box--flex-direction-row typography typography--h2 typography--weight-normal typography--style-normal typography--color-text-default"
diff --git a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
index 6d6b37f6e6d8..8bf1adbf278b 100644
--- a/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
+++ b/ui/pages/confirmations/confirmation/templates/__snapshots__/switch-ethereum-chain.test.js.snap
@@ -7,7 +7,7 @@ exports[`switch-ethereum-chain confirmation should match snapshot 1`] = `
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h3
         class="box box--md:margin-2 box--margin-top-1 box--margin-bottom-1 box--sm:padding-4 box--lg:padding-4 box--flex-direction-row typography typography--h3 typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
@@ -99,7 +99,7 @@ exports[`switch-ethereum-chain confirmation should show alert if there are pendi
   >
     <div
       class="mm-box confirmation-page__content mm-box--padding-4"
-      style="margin-top: 0px; overflow-y: auto;"
+      style="overflow-y: auto;"
     >
       <h3
         class="box box--md:margin-2 box--margin-top-1 box--margin-bottom-1 box--sm:padding-4 box--lg:padding-4 box--flex-direction-row typography typography--h3 typography--weight-normal typography--style-normal typography--align-center typography--color-text-default"
diff --git a/ui/pages/confirmations/hooks/syncConfirmPath.test.ts b/ui/pages/confirmations/hooks/syncConfirmPath.test.ts
index 9fd64f37ad9d..eb01018a22c5 100644
--- a/ui/pages/confirmations/hooks/syncConfirmPath.test.ts
+++ b/ui/pages/confirmations/hooks/syncConfirmPath.test.ts
@@ -1,3 +1,4 @@
+import { ApprovalType } from '@metamask/controller-utils';
 import mockState from '../../../../test/data/mock-state.json';
 import { unapprovedPersonalSignMsg } from '../../../../test/data/confirmations/personal_sign';
 import { renderHookWithConfirmContextProvider } from '../../../../test/lib/confirmations/render-helpers';
@@ -10,11 +11,24 @@ jest.mock('react-router-dom', () => ({
   useHistory: () => ({ replace: mockHistoryReplace }),
 }));
 
+const STATE_MOCK = {
+  ...mockState,
+  metamask: {
+    ...mockState.metamask,
+    pendingApprovals: {
+      [unapprovedPersonalSignMsg.id]: {
+        id: unapprovedPersonalSignMsg.id,
+        type: ApprovalType.PersonalSign,
+      },
+    },
+  },
+};
+
 describe('syncConfirmPath', () => {
   it('should execute correctly', () => {
     const result = renderHookWithConfirmContextProvider(
       () => syncConfirmPath(unapprovedPersonalSignMsg),
-      mockState,
+      STATE_MOCK,
     );
     expect(result).toBeDefined();
   });
@@ -23,7 +37,7 @@ describe('syncConfirmPath', () => {
     mockHistoryReplace.mockClear();
     renderHookWithConfirmContextProvider(
       () => syncConfirmPath(unapprovedPersonalSignMsg),
-      mockState,
+      STATE_MOCK,
     );
     expect(mockHistoryReplace).toHaveBeenCalled();
   });
diff --git a/ui/pages/confirmations/hooks/syncConfirmPath.ts b/ui/pages/confirmations/hooks/syncConfirmPath.ts
index 546a967d58ee..dc66fc0b1451 100644
--- a/ui/pages/confirmations/hooks/syncConfirmPath.ts
+++ b/ui/pages/confirmations/hooks/syncConfirmPath.ts
@@ -7,16 +7,17 @@ import { useConfirmationNavigation } from './useConfirmationNavigation';
 const syncConfirmPath = (currentConfirmation?: Confirmation) => {
   const { navigateToId } = useConfirmationNavigation();
   const { id: paramId } = useParams<{ id: string }>();
+  const confirmationId = currentConfirmation?.id;
 
   useEffect(() => {
-    if (!currentConfirmation) {
+    if (!confirmationId) {
       return;
     }
 
     if (!paramId) {
-      navigateToId(currentConfirmation.id);
+      navigateToId(confirmationId);
     }
-  }, [currentConfirmation, paramId, navigateToId]);
+  }, [confirmationId, paramId, navigateToId]);
 };
 
 export default syncConfirmPath;
diff --git a/ui/pages/confirmations/hooks/useConfirmationNavigation.ts b/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
index 983d556c5c8e..667d6437d767 100644
--- a/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
+++ b/ui/pages/confirmations/hooks/useConfirmationNavigation.ts
@@ -2,16 +2,20 @@ import { useCallback } from 'react';
 import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import { ApprovalType } from '@metamask/controller-utils';
+import { isEqual } from 'lodash';
 import { pendingConfirmationsSortedSelector } from '../selectors';
 import { TEMPLATED_CONFIRMATION_APPROVAL_TYPES } from '../confirmation/templates';
 import {
   CONFIRM_TRANSACTION_ROUTE,
-  SIGNATURE_REQUEST_PATH,
+  CONFIRMATION_V_NEXT_ROUTE,
 } from '../../../helpers/constants/routes';
-import { isCorrectSignatureApprovalType } from '../../../../shared/lib/confirmation.utils';
 
 export function useConfirmationNavigation() {
-  const pendingConfirmations = useSelector(pendingConfirmationsSortedSelector);
+  const pendingConfirmations = useSelector(
+    pendingConfirmationsSortedSelector,
+    isEqual,
+  );
+
   const history = useHistory();
 
   const getIndex = useCallback(
@@ -44,19 +48,11 @@ export function useConfirmationNavigation() {
       );
 
       if (isTemplate) {
-        history.replace(`/confirmation/${nextConfirmation.id}`);
+        history.replace(`/${CONFIRMATION_V_NEXT_ROUTE}/${nextConfirmation.id}`);
         return;
       }
 
-      let route = `${CONFIRM_TRANSACTION_ROUTE}/${nextConfirmation.id}`;
-
-      if (
-        isCorrectSignatureApprovalType(nextConfirmation.type as ApprovalType)
-      ) {
-        route += SIGNATURE_REQUEST_PATH;
-      }
-
-      history.replace(route);
+      history.replace(`${CONFIRM_TRANSACTION_ROUTE}/${nextConfirmation.id}`);
     },
     [pendingConfirmations, history],
   );
diff --git a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
index bc44e728df86..9d8fe0947ee3 100644
--- a/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
+++ b/ui/pages/confirmations/token-allowance/__snapshots__/token-allowance.test.js.snap
@@ -40,11 +40,11 @@ exports[`TokenAllowancePage when mounted should match snapshot 1`] = `
           <div
             class="confirm-page-container-navigation__navtext"
           >
-            0
+            1
              
             of
              
-            0
+            1
           </div>
           <div
             class="confirm-page-container-navigation__longtext"
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 2baaa1a0c931..968753cf7a77 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -1058,7 +1058,7 @@ export function getIsNonStandardEthChain(state) {
 }
 
 export function getPreferences({ metamask }) {
-  return metamask.preferences;
+  return metamask.preferences ?? {};
 }
 
 export function getSendInputCurrencySwitched({ appState }) {