diff --git a/apps/wallet-mobile/.storybook/storybook.requires.js b/apps/wallet-mobile/.storybook/storybook.requires.js
index 49cfb0666f..1a18920e22 100644
--- a/apps/wallet-mobile/.storybook/storybook.requires.js
+++ b/apps/wallet-mobile/.storybook/storybook.requires.js
@@ -181,6 +181,7 @@ const getStories = () => {
     "./src/features/SetupWallet/common/LearnMoreButton/LearnMoreButton.stories.tsx": require("../src/features/SetupWallet/common/LearnMoreButton/LearnMoreButton.stories.tsx"),
     "./src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx": require("../src/features/SetupWallet/common/LogoBanner/LogoBanner.stories.tsx"),
     "./src/features/SetupWallet/common/MnemonicInput/MnemonicInput.stories.tsx": require("../src/features/SetupWallet/common/MnemonicInput/MnemonicInput.stories.tsx"),
+    "./src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx": require("../src/features/SetupWallet/common/PreparingWallet/PreparingWallet.stories.tsx"),
     "./src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx": require("../src/features/SetupWallet/common/StepperProgress/StepperProgress.stories.tsx"),
     "./src/features/SetupWallet/common/TextInput/TextInput.stories.tsx": require("../src/features/SetupWallet/common/TextInput/TextInput.stories.tsx"),
     "./src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx": require("../src/features/SetupWallet/legacy/CheckNanoX/CheckNanoXScreen.stories.tsx"),
diff --git a/apps/wallet-mobile/src/AppNavigator.tsx b/apps/wallet-mobile/src/AppNavigator.tsx
index cfdfb3a24d..6876169c80 100644
--- a/apps/wallet-mobile/src/AppNavigator.tsx
+++ b/apps/wallet-mobile/src/AppNavigator.tsx
@@ -19,7 +19,6 @@ import {ModalScreen} from './components/Modal/ModalScreen'
 import {AgreementChangedNavigator, InitializationNavigator} from './features/Initialization'
 import {LegalAgreement, useLegalAgreement} from './features/Initialization/common'
 import {useDeepLinkWatcher} from './features/Links/common/useDeepLinkWatcher'
-import {AddWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {CONFIG} from './legacy/config'
 import {DeveloperScreen} from './legacy/DeveloperScreen'
 import {AppRoutes} from './navigation'
@@ -143,8 +142,6 @@ export const AppNavigator = () => {
                     </SearchProvider>
                   )}
                 </Stack.Screen>
-
-                <Stack.Screen name="new-wallet" component={AddWalletNavigator} />
               </Stack.Group>
 
               <Stack.Group screenOptions={{presentation: 'transparentModal'}}>
diff --git a/apps/wallet-mobile/src/WalletNavigator.tsx b/apps/wallet-mobile/src/WalletNavigator.tsx
index 633e85f10d..62cc39b1bf 100644
--- a/apps/wallet-mobile/src/WalletNavigator.tsx
+++ b/apps/wallet-mobile/src/WalletNavigator.tsx
@@ -14,6 +14,7 @@ import {useLinksRequestAction} from './features/Links/common/useLinksRequestActi
 import {useLinksShowActionResult} from './features/Links/common/useLinksShowActionResult'
 import {MenuNavigator} from './features/Menu'
 import {SettingsScreenNavigator} from './features/Settings'
+import {SetupWalletNavigator} from './features/SetupWallet/SetupWalletNavigator'
 import {
   ChooseBiometricLoginScreen,
   useShowBiometricsScreen,
@@ -154,10 +155,10 @@ export const WalletNavigator = () => {
   const isAuthOsSupported = useIsAuthOsSupported()
   const {showBiometricsScreen} = useShowBiometricsScreen()
   const walletManager = useWalletManager()
-  const hasWallets = useHasWallets(walletManager)
+  const {hasWallets} = useHasWallets(walletManager)
   const authSetting = useAuthSetting()
 
-  const shouldAskToUseAuthWithOs = !hasWallets && showBiometricsScreen && isAuthOsSupported && authSetting !== 'os'
+  const shouldAskToUseAuthWithOs = showBiometricsScreen && isAuthOsSupported && authSetting !== 'os'
 
   // initialRoute doesn't update the state of the navigator, only at first render
   // https://reactnavigation.org/docs/auth-flow/
@@ -182,7 +183,7 @@ export const WalletNavigator = () => {
         detachPreviousScreen: false /* https://github.com/react-navigation/react-navigation/issues/9883 */,
       }}
     >
-      {shouldAskToUseAuthWithOs && (
+      {!hasWallets && shouldAskToUseAuthWithOs && (
         <Stack.Screen //
           name="choose-biometric-login"
           options={{headerShown: false}}
@@ -190,6 +191,14 @@ export const WalletNavigator = () => {
         />
       )}
 
+      {!hasWallets && !shouldAskToUseAuthWithOs && (
+        <Stack.Screen //
+          name="setup-wallet"
+          options={{headerShown: false}}
+          component={SetupWalletNavigator}
+        />
+      )}
+
       <Stack.Screen
         name="wallet-selection"
         options={{title: strings.walletSelectionScreenHeader}}
diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx
index ce8d61b2a7..2ad6328de1 100644
--- a/apps/wallet-mobile/src/features/Menu/Menu.tsx
+++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx
@@ -187,7 +187,6 @@ const useNavigateTo = () => {
   const prefetchStakingInfo = usePrefetchStakingInfo(wallet)
 
   return {
-    allWallets: () => navigation.navigate('app-root', {screen: 'wallet-selection'}),
     catalystVoting: () => {
       prefetchStakingInfo()
 
diff --git a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
index 02adfb7833..c5a85ed95e 100644
--- a/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
+++ b/apps/wallet-mobile/src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 import {defineMessages, useIntl} from 'react-intl'
 import {ScrollView, StyleSheet, View, ViewProps} from 'react-native'
 import {SafeAreaView} from 'react-native-safe-area-context'
+import {useQueryClient} from 'react-query'
 
 import {
   Button,
@@ -15,7 +16,8 @@ import {
   TextInputProps,
 } from '../../../components'
 import {useWalletNavigation} from '../../../navigation'
-import {useRemoveWallet, useWalletName} from '../../../yoroi-wallets/hooks'
+import {useWalletManager} from '../../../wallet-manager/WalletManagerContext'
+import {hasWalletsKey, useRemoveWallet, useWalletName} from '../../../yoroi-wallets/hooks'
 import {useSelectedWallet} from '../../WalletManager/Context/SelectedWalletContext'
 
 export const RemoveWalletScreen = () => {
@@ -23,16 +25,30 @@ export const RemoveWalletScreen = () => {
   const styles = useStyles()
   const wallet = useSelectedWallet()
   const walletName = useWalletName(wallet)
+  const {resetToWalletSetup, resetToWalletSelection} = useWalletNavigation()
+  const walletManager = useWalletManager()
+  const queryClient = useQueryClient()
 
-  const {resetToWalletSelection} = useWalletNavigation()
-  const {removeWallet, isLoading} = useRemoveWallet(wallet.id, {
-    onSuccess: () => resetToWalletSelection(),
+  const {removeWallet, isLoading: isRemoveWalletLoading} = useRemoveWallet(wallet.id, {
+    onSuccess: async () => {
+      queryClient.invalidateQueries({queryKey: [hasWalletsKey]})
+
+      const walletMetas = await walletManager.listWallets()
+      const hasWallets = walletMetas.length > 0
+
+      if (hasWallets) {
+        resetToWalletSelection()
+        return
+      }
+
+      resetToWalletSetup()
+    },
   })
 
   const [hasMnemonicWrittenDown, setHasMnemonicWrittenDown] = React.useState(false)
   const [typedWalletName, setTypedWalletName] = React.useState('')
 
-  const disabled = isLoading || (!wallet.isHW && !hasMnemonicWrittenDown) || walletName !== typedWalletName
+  const disabled = isRemoveWalletLoading || (!wallet.isHW && !hasMnemonicWrittenDown) || walletName !== typedWalletName
 
   return (
     <SafeAreaView edges={['left', 'right', 'bottom']} style={styles.container}>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx b/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
index 8bda996c4c..9b3243c0c0 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/SetupWalletNavigator.tsx
@@ -20,7 +20,7 @@ import {RestoreWalletDetailsScreen} from './useCases/RestoreWallet/RestoreWallet
 import {RestoreWalletScreen} from './useCases/RestoreWallet/RestoreWalletScreen'
 
 const Stack = createStackNavigator<WalletInitRoutes>()
-export const AddWalletNavigator = () => {
+export const SetupWalletNavigator = () => {
   const strings = useStrings()
   const {theme} = useTheme()
 
@@ -37,7 +37,7 @@ export const AddWalletNavigator = () => {
       <Stack.Screen
         name="setup-wallet-choose-setup-type"
         component={ChooseSetupTypeScreen}
-        options={{title: strings.addNewWalletTitle}}
+        options={{title: strings.addNewWalletTitle, headerLeft: () => null}}
       />
 
       <Stack.Screen
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx
index 5ea1651040..549de6695a 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseBiometricLogin/ChooseBiometricLoginScreen.tsx
@@ -1,4 +1,3 @@
-import {useNavigation} from '@react-navigation/native'
 import {parseBoolean, useAsyncStorage} from '@yoroi/common'
 import {useSetupWallet} from '@yoroi/setup-wallet'
 import {useTheme} from '@yoroi/theme'
@@ -10,6 +9,7 @@ import {useQuery, UseQueryOptions} from 'react-query'
 
 import {Button} from '../../../../components'
 import {Space} from '../../../../components/Space/Space'
+import {useWalletNavigation} from '../../../../navigation'
 import {useEnableAuthWithOs} from '../../../../yoroi-wallets/auth'
 import * as HASKELL_SHELLEY from '../../../../yoroi-wallets/cardano/constants/mainnet/constants'
 import {useStrings} from '../../common/useStrings'
@@ -20,12 +20,11 @@ export const ChooseBiometricLoginScreen = () => {
   const strings = useStrings()
   const storage = useAsyncStorage()
   const {walletImplementationIdChanged} = useSetupWallet()
+  const {resetToWalletSetup} = useWalletNavigation()
 
   const navigate = () => {
     walletImplementationIdChanged(HASKELL_SHELLEY.WALLET_IMPLEMENTATION_ID)
-    navigation.navigate('new-wallet', {
-      screen: 'setup-wallet-choose-setup-type',
-    })
+    resetToWalletSetup()
   }
 
   const {enableAuthWithOs, isLoading} = useEnableAuthWithOs({
@@ -39,8 +38,6 @@ export const ChooseBiometricLoginScreen = () => {
     storage.setItem(chooseBiometricLoginScreenShownKey, JSON.stringify(false))
   }
 
-  const navigation = useNavigation()
-
   return (
     <SafeAreaView edges={['left', 'right', 'top', 'bottom']} style={styles.root}>
       <View style={styles.content}>
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
index 554fffd980..99c02e95fc 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/ChooseSetupType/ChooseSetupTypeScreen.tsx
@@ -21,7 +21,12 @@ import {RestoreWallet} from '../../illustrations/RestoreWallet'
 export const ChooseSetupTypeScreen = () => {
   const {styles} = useStyles()
   const strings = useStrings()
-  const {networkIdChanged, setUpTypeChanged, useUSBChanged: USBChanged} = useSetupWallet()
+  const {
+    walletImplementationIdChanged,
+    networkIdChanged,
+    setUpTypeChanged,
+    useUSBChanged: USBChanged,
+  } = useSetupWallet()
   const [isModalOpen, setIsModalOpen] = React.useState(false)
   const {track} = useMetrics()
 
@@ -34,6 +39,7 @@ export const ChooseSetupTypeScreen = () => {
   const navigation = useNavigation<WalletInitRouteNavigation>()
 
   const handleCreate = () => {
+    walletImplementationIdChanged(HASKELL_SHELLEY.WALLET_IMPLEMENTATION_ID)
     setUpTypeChanged('create')
 
     if (isProduction()) {
@@ -47,6 +53,7 @@ export const ChooseSetupTypeScreen = () => {
   }
 
   const handleRestore = () => {
+    walletImplementationIdChanged(HASKELL_SHELLEY.WALLET_IMPLEMENTATION_ID)
     setUpTypeChanged('restore')
 
     if (isProduction()) {
@@ -65,6 +72,7 @@ export const ChooseSetupTypeScreen = () => {
 
   const navigateHw = () => {
     setIsModalOpen(false)
+    walletImplementationIdChanged(HASKELL_SHELLEY.WALLET_IMPLEMENTATION_ID)
     setUpTypeChanged('hw')
 
     if (isProduction()) {
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
index c0d52b12f2..3019e249af 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/CreateWallet/WalletDetailsScreen.tsx
@@ -69,7 +69,7 @@ export const WalletDetailsScreen = () => {
   const {styles} = useStyles()
   const {HEIGHT_MODAL_NAME_PASSWORD, HEIGHT_MODAL_CHECKSUM} = useSizeModal()
   const {openModal, closeModal} = useModal()
-  const {navigateToTxHistory} = useWalletNavigation()
+  const {resetToTxHistory} = useWalletNavigation()
   const strings = useStrings()
   const walletManager = useWalletManager()
   const {walletNames} = useWalletNames(walletManager)
@@ -118,7 +118,7 @@ export const WalletDetailsScreen = () => {
     onSuccess: ([wallet, walletMeta]) => {
       selectWalletMeta(walletMeta)
       selectWallet(wallet)
-      navigateToTxHistory()
+      resetToTxHistory()
     },
     onError: (error) => {
       InteractionManager.runAfterInteractions(() => {
diff --git a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
index 19c0efeb5a..05d0666a41 100644
--- a/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
+++ b/apps/wallet-mobile/src/features/SetupWallet/useCases/RestoreWallet/RestoreWalletDetailsScreen.tsx
@@ -7,7 +7,6 @@ import * as React from 'react'
 import {useIntl} from 'react-intl'
 import {
   InteractionManager,
-  Keyboard,
   Linking,
   ScrollView,
   StyleSheet,
@@ -71,7 +70,7 @@ export const RestoreWalletDetailsScreen = () => {
   const {HEIGHT_MODAL_NAME_PASSWORD, HEIGHT_MODAL_CHECKSUM} = useSizeModal()
   const {openModal, closeModal} = useModal()
   const strings = useStrings()
-  const {navigateToTxHistory} = useWalletNavigation()
+  const {resetToTxHistory} = useWalletNavigation()
   const walletManager = useWalletManager()
   const {track} = useMetrics()
   const {walletNames} = useWalletNames(walletManager)
@@ -107,7 +106,7 @@ export const RestoreWalletDetailsScreen = () => {
     onSuccess: ([wallet, walletMeta]) => {
       selectWalletMeta(walletMeta)
       selectWallet(wallet)
-      navigateToTxHistory()
+      resetToTxHistory()
     },
     onError: (error) => {
       InteractionManager.runAfterInteractions(() => {
@@ -163,7 +162,6 @@ export const RestoreWalletDetailsScreen = () => {
   )
 
   const showModalTipsPassword = () => {
-    Keyboard.dismiss()
     openModal(
       strings.walletDetailsModalTitle,
       <View style={styles.modal}>
@@ -202,7 +200,6 @@ export const RestoreWalletDetailsScreen = () => {
   }
 
   const showModalTipsPlateNumber = () => {
-    Keyboard.dismiss()
     openModal(
       strings.walletDetailsModalTitle,
       <View style={styles.modal}>
diff --git a/apps/wallet-mobile/src/features/WalletManager/SelectWalletFromList/SelectWalletFromListScreen.tsx b/apps/wallet-mobile/src/features/WalletManager/SelectWalletFromList/SelectWalletFromListScreen.tsx
index b16eeb996e..cbee877ed1 100644
--- a/apps/wallet-mobile/src/features/WalletManager/SelectWalletFromList/SelectWalletFromListScreen.tsx
+++ b/apps/wallet-mobile/src/features/WalletManager/SelectWalletFromList/SelectWalletFromListScreen.tsx
@@ -16,7 +16,6 @@ import {useMetrics} from '../../../metrics/metricsManager'
 import {useWalletNavigation} from '../../../navigation'
 import {WalletMeta} from '../../../wallet-manager/types'
 import {useWalletManager} from '../../../wallet-manager/WalletManagerContext'
-import * as HASKELL_SHELLEY from '../../../yoroi-wallets/cardano/constants/mainnet/constants'
 import {InvalidState} from '../../../yoroi-wallets/cardano/errors'
 import {isJormungandr} from '../../../yoroi-wallets/cardano/networks'
 import {useOpenWallet, useWalletMetas} from '../../../yoroi-wallets/hooks'
@@ -146,20 +145,16 @@ const SupportTicketLink = () => {
 }
 
 const AddWalletButton = () => {
-  const navigation = useNavigation()
   const strings = useStrings()
   const {styles} = useStyles()
-  const {walletImplementationIdChanged, reset: resetSetupWallet} = useSetupWallet()
+  const {reset: resetSetupWallet} = useSetupWallet()
+  const {resetToWalletSetup} = useWalletNavigation()
 
   return (
     <Button
       onPress={() => {
-        resetSetupWallet()
-        walletImplementationIdChanged(HASKELL_SHELLEY.WALLET_IMPLEMENTATION_ID)
-
-        navigation.navigate('new-wallet', {
-          screen: 'setup-wallet-choose-setup-type',
-        })
+        resetSetupWallet() // reset state
+        resetToWalletSetup() // navigates to screen
       }}
       title={strings.addWalletButton}
       style={styles.topButton}
diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json
index ccddceb2e1..bfe1191ae6 100644
--- a/apps/wallet-mobile/src/i18n/locales/en-US.json
+++ b/apps/wallet-mobile/src/i18n/locales/en-US.json
@@ -829,7 +829,6 @@
   "links.trusted.paymentRequested.description": "A request from a trusted app has been made that requires your approval. While this source is recognized and generally considered safe, we advise you to review the details in the transaction screen carefully before submitting any transaction.",
   "links.untrusted.paymentRequested.title": "Payment requested",
   "links.untrusted.paymentRequested.description": "A request from an untrusted app has been made. Engaging with this request could pose potential security risk to your wallet. Do not proceed without verifying the authenticity of the request. If you didn't start this action, please cancel it.",
-  "menu.allWallets": "All Wallets",
   "menu.appSettings": "App Settings",
   "menu.catalystVoting": "Catalyst Voting",
   "menu.governanceCentre": "Governance centre",
diff --git a/apps/wallet-mobile/src/navigation.tsx b/apps/wallet-mobile/src/navigation.tsx
index 7fbafd1a7a..fb4ce91dc2 100644
--- a/apps/wallet-mobile/src/navigation.tsx
+++ b/apps/wallet-mobile/src/navigation.tsx
@@ -102,6 +102,7 @@ export type WalletTabRoutes = {
 
 export type WalletStackRoutes = {
   'choose-biometric-login': undefined
+  'setup-wallet': undefined
   'wallet-selection': undefined
   'exchange-result': undefined
   'main-wallet-routes': NavigatorScreenParams<WalletTabRoutes>
@@ -118,7 +119,6 @@ export type WalletInitRoutes = {
   'setup-wallet-create-choose-network': undefined
   'setup-wallet-restore-choose-network': undefined
   'setup-wallet-restore-choose-mnemonic-type': undefined
-  'initial-setup-wallet-choose-setup-type': undefined
   'setup-wallet-details-form': undefined
   'setup-wallet-restore-form': undefined
   'setup-wallet-restore-details': undefined
@@ -305,7 +305,6 @@ export type AppRoutes = {
   'first-run': NavigatorScreenParams<FirstRunRoutes>
   developer: undefined
   storybook: undefined
-  'new-wallet': NavigatorScreenParams<WalletInitRoutes>
   'app-root': NavigatorScreenParams<WalletStackRoutes>
   'custom-pin-auth': undefined
   'exchange-result': undefined
@@ -413,6 +412,27 @@ export const useWalletNavigation = () => {
       })
     },
 
+    resetToWalletSetup: () => {
+      navigation.reset({
+        index: 0,
+        routes: [
+          {
+            name: 'app-root',
+            state: {
+              routes: [
+                {
+                  name: 'setup-wallet',
+                  state: {
+                    routes: [{name: 'setup-wallet-choose-setup-type'}],
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      })
+    },
+
     resetToWalletSelection: () => {
       navigation.reset({
         index: 0,
diff --git a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
index 467545fad7..4013aa7a39 100644
--- a/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
+++ b/apps/wallet-mobile/src/yoroi-wallets/hooks/index.ts
@@ -695,12 +695,13 @@ export const useWalletMetas = (walletManager: WalletManager, options?: UseQueryO
   }
 }
 
+export const hasWalletsKey = 'hasWallets'
 export const useHasWallets = (
   walletManager: WalletManager,
   options?: UseQueryOptions<Array<WalletMeta>, Error, boolean>,
 ) => {
   const query = useQuery({
-    queryKey: ['walletMetas'],
+    queryKey: [hasWalletsKey],
     queryFn: async () => walletManager.listWallets(),
     select: (walletMetas) => walletMetas.length > 0,
     suspense: true,
@@ -709,7 +710,10 @@ export const useHasWallets = (
 
   if (query.data == null) throw new Error('invalid state')
 
-  return query.data
+  return {
+    ...query,
+    hasWallets: query.data,
+  }
 }
 
 export const useRemoveWallet = (id: YoroiWallet['id'], options: UseMutationOptions<void, Error, void> = {}) => {
diff --git a/apps/wallet-mobile/translations/messages/src/AppNavigator.json b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
index 79455e774c..78a8905c5b 100644
--- a/apps/wallet-mobile/translations/messages/src/AppNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/AppNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Enter PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 189,
+      "line": 186,
       "column": 17,
-      "index": 6488
+      "index": 6326
     },
     "end": {
-      "line": 192,
+      "line": 189,
       "column": 3,
-      "index": 6578
+      "index": 6416
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Set PIN",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 193,
+      "line": 190,
       "column": 18,
-      "index": 6598
+      "index": 6436
     },
     "end": {
-      "line": 196,
+      "line": 193,
       "column": 3,
-      "index": 6696
+      "index": 6534
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Auth with OS changes",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 197,
+      "line": 194,
       "column": 25,
-      "index": 6723
+      "index": 6561
     },
     "end": {
-      "line": 200,
+      "line": 197,
       "column": 3,
-      "index": 6837
+      "index": 6675
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Auth with OS changed detected",
     "file": "src/AppNavigator.tsx",
     "start": {
-      "line": 201,
+      "line": 198,
       "column": 27,
-      "index": 6866
+      "index": 6704
     },
     "end": {
-      "line": 204,
+      "line": 201,
       "column": 3,
-      "index": 6987
+      "index": 6825
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
index 94e3d8a57c..12cefeeebd 100644
--- a/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/WalletNavigator.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!Transactions",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 230,
+      "line": 242,
       "column": 22,
-      "index": 8222
+      "index": 8560
     },
     "end": {
-      "line": 233,
+      "line": 245,
       "column": 3,
-      "index": 8325
+      "index": 8663
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!Send",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 234,
+      "line": 246,
       "column": 14,
-      "index": 8341
+      "index": 8679
     },
     "end": {
-      "line": 237,
+      "line": 249,
       "column": 3,
-      "index": 8440
+      "index": 8778
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Receive",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 238,
+      "line": 250,
       "column": 17,
-      "index": 8459
+      "index": 8797
     },
     "end": {
-      "line": 241,
+      "line": 253,
       "column": 3,
-      "index": 8564
+      "index": 8902
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Dashboard",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 242,
+      "line": 254,
       "column": 19,
-      "index": 8585
+      "index": 8923
     },
     "end": {
-      "line": 245,
+      "line": 257,
       "column": 3,
-      "index": 8682
+      "index": 9020
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Delegate",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 246,
+      "line": 258,
       "column": 18,
-      "index": 8702
+      "index": 9040
     },
     "end": {
-      "line": 249,
+      "line": 261,
       "column": 3,
-      "index": 8797
+      "index": 9135
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Wallet",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 250,
+      "line": 262,
       "column": 16,
-      "index": 8815
+      "index": 9153
     },
     "end": {
-      "line": 253,
+      "line": 265,
       "column": 3,
-      "index": 8913
+      "index": 9251
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!Staking",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 254,
+      "line": 266,
       "column": 17,
-      "index": 8932
+      "index": 9270
     },
     "end": {
-      "line": 257,
+      "line": 269,
       "column": 3,
-      "index": 8997
+      "index": 9335
     }
   },
   {
@@ -109,14 +109,14 @@
     "defaultMessage": "!!!NFT Gallery",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 258,
+      "line": 270,
       "column": 14,
-      "index": 9013
+      "index": 9351
     },
     "end": {
-      "line": 261,
+      "line": 273,
       "column": 3,
-      "index": 9107
+      "index": 9445
     }
   },
   {
@@ -124,14 +124,14 @@
     "defaultMessage": "!!!Menu",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 262,
+      "line": 274,
       "column": 14,
-      "index": 9123
+      "index": 9461
     },
     "end": {
-      "line": 265,
+      "line": 277,
       "column": 3,
-      "index": 9175
+      "index": 9513
     }
   },
   {
@@ -139,14 +139,14 @@
     "defaultMessage": "!!!My wallets",
     "file": "src/WalletNavigator.tsx",
     "start": {
-      "line": 266,
+      "line": 278,
       "column": 31,
-      "index": 9208
+      "index": 9546
     },
     "end": {
-      "line": 269,
+      "line": 281,
       "column": 3,
-      "index": 9317
+      "index": 9655
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/AddWallet/AddWalletNavigator.json b/apps/wallet-mobile/translations/messages/src/features/AddWallet/AddWalletNavigator.json
index 1adc8b4ad7..14f83dae2a 100644
--- a/apps/wallet-mobile/translations/messages/src/features/AddWallet/AddWalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/AddWallet/AddWalletNavigator.json
@@ -2,7 +2,7 @@
   {
     "id": "components.walletinit.walletinitscreen.title",
     "defaultMessage": "!!!Add wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 140,
       "column": 18,
@@ -17,7 +17,7 @@
   {
     "id": "components.walletinit.createwallet.createwalletscreen.title",
     "defaultMessage": "!!!Create a new wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 144,
       "column": 21,
@@ -32,7 +32,7 @@
   {
     "id": "components.walletinit.restorewallet.restorewalletscreen.title",
     "defaultMessage": "!!!Restore wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 148,
       "column": 22,
@@ -47,7 +47,7 @@
   {
     "id": "components.walletinit.importreadonlywalletscreen.title",
     "defaultMessage": "!!!Read-only Wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 152,
       "column": 23,
@@ -62,7 +62,7 @@
   {
     "id": "components.walletinit.savereadonlywalletscreen.title",
     "defaultMessage": "!!!Verify read-only wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 156,
       "column": 27,
@@ -77,7 +77,7 @@
   {
     "id": "components.walletinit.createwallet.mnemonicshowscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 160,
       "column": 21,
@@ -92,7 +92,7 @@
   {
     "id": "components.walletinit.createwallet.mnemoniccheckscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 164,
       "column": 22,
@@ -107,7 +107,7 @@
   {
     "id": "components.walletinit.verifyrestoredwallet.title",
     "defaultMessage": "!!!Verify restored wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 168,
       "column": 29,
@@ -122,7 +122,7 @@
   {
     "id": "components.walletinit.restorewallet.walletcredentialsscreen.title",
     "defaultMessage": "!!!Wallet credentials",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 172,
       "column": 26,
@@ -137,7 +137,7 @@
   {
     "id": "components.walletinit.connectnanox.connectnanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 176,
       "column": 21,
@@ -152,7 +152,7 @@
   {
     "id": "components.walletinit.connectnanox.checknanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 180,
       "column": 19,
@@ -167,7 +167,7 @@
   {
     "id": "components.walletinit.connectnanox.savenanoxscreen.title",
     "defaultMessage": "!!!Save wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 184,
       "column": 18,
diff --git a/apps/wallet-mobile/translations/messages/src/features/AddWallet/WalletInitNavigator.json b/apps/wallet-mobile/translations/messages/src/features/AddWallet/WalletInitNavigator.json
index 05e8196153..6f9aaf17f1 100644
--- a/apps/wallet-mobile/translations/messages/src/features/AddWallet/WalletInitNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/AddWallet/WalletInitNavigator.json
@@ -2,7 +2,7 @@
   {
     "id": "components.walletinit.walletinitscreen.title",
     "defaultMessage": "!!!Add wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 140,
       "column": 18,
@@ -17,7 +17,7 @@
   {
     "id": "components.walletinit.createwallet.createwalletscreen.title",
     "defaultMessage": "!!!Create a new wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 144,
       "column": 21,
@@ -32,7 +32,7 @@
   {
     "id": "components.walletinit.restorewallet.restorewalletscreen.title",
     "defaultMessage": "!!!Restore wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 148,
       "column": 22,
@@ -47,7 +47,7 @@
   {
     "id": "components.walletinit.importreadonlywalletscreen.title",
     "defaultMessage": "!!!Read-only Wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 152,
       "column": 23,
@@ -62,7 +62,7 @@
   {
     "id": "components.walletinit.savereadonlywalletscreen.title",
     "defaultMessage": "!!!Verify read-only wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 156,
       "column": 27,
@@ -77,7 +77,7 @@
   {
     "id": "components.walletinit.createwallet.mnemonicshowscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 160,
       "column": 21,
@@ -92,7 +92,7 @@
   {
     "id": "components.walletinit.createwallet.mnemoniccheckscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 164,
       "column": 22,
@@ -107,7 +107,7 @@
   {
     "id": "components.walletinit.verifyrestoredwallet.title",
     "defaultMessage": "!!!Verify restored wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 168,
       "column": 29,
@@ -122,7 +122,7 @@
   {
     "id": "components.walletinit.restorewallet.walletcredentialsscreen.title",
     "defaultMessage": "!!!Wallet credentials",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 172,
       "column": 26,
@@ -137,7 +137,7 @@
   {
     "id": "components.walletinit.connectnanox.connectnanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 176,
       "column": 21,
@@ -152,7 +152,7 @@
   {
     "id": "components.walletinit.connectnanox.checknanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 180,
       "column": 19,
@@ -167,7 +167,7 @@
   {
     "id": "components.walletinit.connectnanox.savenanoxscreen.title",
     "defaultMessage": "!!!Save wallet",
-    "file": "src/features/AddWallet/AddWalletNavigator.tsx",
+    "file": "src/features/AddWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 184,
       "column": 18,
diff --git a/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json b/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
index ffc44d75ff..dce35ac1c4 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Settings/RemoveWallet/RemoveWalletScreen.json
@@ -4,14 +4,14 @@
     "defaultMessage": "!!!If you wish to permanently delete the wallet make sure you have written down the mnemonic.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 110,
+      "line": 126,
       "column": 25,
-      "index": 3480
+      "index": 4034
     },
     "end": {
-      "line": 113,
+      "line": 129,
       "column": 3,
-      "index": 3674
+      "index": 4228
     }
   },
   {
@@ -19,14 +19,14 @@
     "defaultMessage": "!!!To confirm this operation type the wallet name below.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 114,
+      "line": 130,
       "column": 25,
-      "index": 3701
+      "index": 4255
     },
     "end": {
-      "line": 117,
+      "line": 133,
       "column": 3,
-      "index": 3858
+      "index": 4412
     }
   },
   {
@@ -34,14 +34,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 118,
+      "line": 134,
       "column": 14,
-      "index": 3874
+      "index": 4428
     },
     "end": {
-      "line": 121,
+      "line": 137,
       "column": 3,
-      "index": 3978
+      "index": 4532
     }
   },
   {
@@ -49,14 +49,14 @@
     "defaultMessage": "!!!Wallet name",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 122,
+      "line": 138,
       "column": 19,
-      "index": 3999
+      "index": 4553
     },
     "end": {
-      "line": 125,
+      "line": 141,
       "column": 3,
-      "index": 4108
+      "index": 4662
     }
   },
   {
@@ -64,14 +64,14 @@
     "defaultMessage": "!!!Wallet name does not match",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 126,
+      "line": 142,
       "column": 27,
-      "index": 4137
+      "index": 4691
     },
     "end": {
-      "line": 129,
+      "line": 145,
       "column": 3,
-      "index": 4269
+      "index": 4823
     }
   },
   {
@@ -79,14 +79,14 @@
     "defaultMessage": "!!!Remove wallet",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 130,
+      "line": 146,
       "column": 10,
-      "index": 4281
+      "index": 4835
     },
     "end": {
-      "line": 133,
+      "line": 149,
       "column": 3,
-      "index": 4383
+      "index": 4937
     }
   },
   {
@@ -94,14 +94,14 @@
     "defaultMessage": "!!!I have written down mnemonic of this wallet and understand that I cannot recover the wallet without it.",
     "file": "src/features/Settings/RemoveWallet/RemoveWalletScreen.tsx",
     "start": {
-      "line": 134,
+      "line": 150,
       "column": 26,
-      "index": 4411
+      "index": 4965
     },
     "end": {
-      "line": 138,
+      "line": 154,
       "column": 3,
-      "index": 4625
+      "index": 5179
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/AddWalletNavigator.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/AddWalletNavigator.json
index 032002c79c..cea69f19aa 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/AddWalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/AddWalletNavigator.json
@@ -2,7 +2,7 @@
   {
     "id": "components.walletinit.walletinitscreen.title",
     "defaultMessage": "!!!Add wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 132,
       "column": 18,
@@ -17,7 +17,7 @@
   {
     "id": "components.walletinit.createwallet.createwalletscreen.title",
     "defaultMessage": "!!!Create a new wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 136,
       "column": 21,
@@ -32,7 +32,7 @@
   {
     "id": "components.walletinit.restorewallet.restorewalletscreen.title",
     "defaultMessage": "!!!Restore wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 140,
       "column": 22,
@@ -47,7 +47,7 @@
   {
     "id": "components.walletinit.importreadonlywalletscreen.title",
     "defaultMessage": "!!!Read-only Wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 144,
       "column": 23,
@@ -62,7 +62,7 @@
   {
     "id": "components.walletinit.savereadonlywalletscreen.title",
     "defaultMessage": "!!!Verify read-only wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 148,
       "column": 27,
@@ -77,7 +77,7 @@
   {
     "id": "components.walletinit.createwallet.mnemonicshowscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 152,
       "column": 21,
@@ -92,7 +92,7 @@
   {
     "id": "components.walletinit.createwallet.mnemoniccheckscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 156,
       "column": 22,
@@ -107,7 +107,7 @@
   {
     "id": "components.walletinit.verifyrestoredwallet.title",
     "defaultMessage": "!!!Verify restored wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 160,
       "column": 29,
@@ -122,7 +122,7 @@
   {
     "id": "components.walletinit.restorewallet.walletcredentialsscreen.title",
     "defaultMessage": "!!!Wallet credentials",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 164,
       "column": 26,
@@ -137,7 +137,7 @@
   {
     "id": "components.walletinit.connectnanox.connectnanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 168,
       "column": 21,
@@ -152,7 +152,7 @@
   {
     "id": "components.walletinit.connectnanox.checknanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 172,
       "column": 19,
@@ -167,7 +167,7 @@
   {
     "id": "components.walletinit.connectnanox.savenanoxscreen.title",
     "defaultMessage": "!!!Save wallet",
-    "file": "src/features/SetupWallet/AddWalletNavigator.tsx",
+    "file": "src/features/SetupWallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 176,
       "column": 18,
diff --git a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json
index 75ef2f0236..080944aec3 100644
--- a/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/SetupWallet/SetupWalletNavigator.json
@@ -6,12 +6,12 @@
     "start": {
       "line": 138,
       "column": 21,
-      "index": 4825
+      "index": 4851
     },
     "end": {
       "line": 141,
       "column": 3,
-      "index": 4927
+      "index": 4953
     }
   },
   {
@@ -21,12 +21,12 @@
     "start": {
       "line": 142,
       "column": 21,
-      "index": 4950
+      "index": 4976
     },
     "end": {
       "line": 145,
       "column": 3,
-      "index": 5066
+      "index": 5092
     }
   },
   {
@@ -36,12 +36,12 @@
     "start": {
       "line": 146,
       "column": 22,
-      "index": 5090
+      "index": 5116
     },
     "end": {
       "line": 149,
       "column": 3,
-      "index": 5209
+      "index": 5235
     }
   },
   {
@@ -51,12 +51,12 @@
     "start": {
       "line": 150,
       "column": 23,
-      "index": 5234
+      "index": 5260
     },
     "end": {
       "line": 153,
       "column": 3,
-      "index": 5348
+      "index": 5374
     }
   },
   {
@@ -66,12 +66,12 @@
     "start": {
       "line": 154,
       "column": 27,
-      "index": 5377
+      "index": 5403
     },
     "end": {
       "line": 157,
       "column": 3,
-      "index": 5496
+      "index": 5522
     }
   },
   {
@@ -81,12 +81,12 @@
     "start": {
       "line": 158,
       "column": 21,
-      "index": 5519
+      "index": 5545
     },
     "end": {
       "line": 161,
       "column": 3,
-      "index": 5637
+      "index": 5663
     }
   },
   {
@@ -96,12 +96,12 @@
     "start": {
       "line": 162,
       "column": 22,
-      "index": 5661
+      "index": 5687
     },
     "end": {
       "line": 165,
       "column": 3,
-      "index": 5780
+      "index": 5806
     }
   },
   {
@@ -111,12 +111,12 @@
     "start": {
       "line": 166,
       "column": 29,
-      "index": 5811
+      "index": 5837
     },
     "end": {
       "line": 169,
       "column": 3,
-      "index": 5925
+      "index": 5951
     }
   },
   {
@@ -126,12 +126,12 @@
     "start": {
       "line": 170,
       "column": 26,
-      "index": 5953
+      "index": 5979
     },
     "end": {
       "line": 173,
       "column": 3,
-      "index": 6080
+      "index": 6106
     }
   },
   {
@@ -141,12 +141,12 @@
     "start": {
       "line": 174,
       "column": 21,
-      "index": 6103
+      "index": 6129
     },
     "end": {
       "line": 177,
       "column": 3,
-      "index": 6230
+      "index": 6256
     }
   },
   {
@@ -156,12 +156,12 @@
     "start": {
       "line": 178,
       "column": 19,
-      "index": 6251
+      "index": 6277
     },
     "end": {
       "line": 181,
       "column": 3,
-      "index": 6376
+      "index": 6402
     }
   },
   {
@@ -171,12 +171,12 @@
     "start": {
       "line": 182,
       "column": 18,
-      "index": 6396
+      "index": 6422
     },
     "end": {
       "line": 185,
       "column": 3,
-      "index": 6507
+      "index": 6533
     }
   }
 ]
\ No newline at end of file
diff --git a/apps/wallet-mobile/translations/messages/src/features/Wallet/AddWalletNavigator.json b/apps/wallet-mobile/translations/messages/src/features/Wallet/AddWalletNavigator.json
index e6d6e0f2d0..6722a6745f 100644
--- a/apps/wallet-mobile/translations/messages/src/features/Wallet/AddWalletNavigator.json
+++ b/apps/wallet-mobile/translations/messages/src/features/Wallet/AddWalletNavigator.json
@@ -2,7 +2,7 @@
   {
     "id": "components.walletinit.walletinitscreen.title",
     "defaultMessage": "!!!Add wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 132,
       "column": 18,
@@ -17,7 +17,7 @@
   {
     "id": "components.walletinit.createwallet.createwalletscreen.title",
     "defaultMessage": "!!!Create a new wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 136,
       "column": 21,
@@ -32,7 +32,7 @@
   {
     "id": "components.walletinit.restorewallet.restorewalletscreen.title",
     "defaultMessage": "!!!Restore wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 140,
       "column": 22,
@@ -47,7 +47,7 @@
   {
     "id": "components.walletinit.importreadonlywalletscreen.title",
     "defaultMessage": "!!!Read-only Wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 144,
       "column": 23,
@@ -62,7 +62,7 @@
   {
     "id": "components.walletinit.savereadonlywalletscreen.title",
     "defaultMessage": "!!!Verify read-only wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 148,
       "column": 27,
@@ -77,7 +77,7 @@
   {
     "id": "components.walletinit.createwallet.mnemonicshowscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 152,
       "column": 21,
@@ -92,7 +92,7 @@
   {
     "id": "components.walletinit.createwallet.mnemoniccheckscreen.title",
     "defaultMessage": "!!!Recovery phrase",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 156,
       "column": 22,
@@ -107,7 +107,7 @@
   {
     "id": "components.walletinit.verifyrestoredwallet.title",
     "defaultMessage": "!!!Verify restored wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 160,
       "column": 29,
@@ -122,7 +122,7 @@
   {
     "id": "components.walletinit.restorewallet.walletcredentialsscreen.title",
     "defaultMessage": "!!!Wallet credentials",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 164,
       "column": 26,
@@ -137,7 +137,7 @@
   {
     "id": "components.walletinit.connectnanox.connectnanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 168,
       "column": 21,
@@ -152,7 +152,7 @@
   {
     "id": "components.walletinit.connectnanox.checknanoxscreen.title",
     "defaultMessage": "!!!Connect to Ledger Device",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 172,
       "column": 19,
@@ -167,7 +167,7 @@
   {
     "id": "components.walletinit.connectnanox.savenanoxscreen.title",
     "defaultMessage": "!!!Save wallet",
-    "file": "src/features/Wallet/AddWalletNavigator.tsx",
+    "file": "src/features/Wallet/SetupWalletNavigator.tsx",
     "start": {
       "line": 176,
       "column": 18,