diff --git a/docs/specifications/activities/class-diagram.md b/docs/specifications/activities/class-diagram.md
index f57bd6fe6c3..458c32e6c9f 100644
--- a/docs/specifications/activities/class-diagram.md
+++ b/docs/specifications/activities/class-diagram.md
@@ -63,7 +63,7 @@ classDiagram
     class Subject {
         - type: "address" | "account"
         - address?: string
-        - account?: IAccountState
+        - account?: IWalletState
     }
     class Activity Direction {
         <<Enum>>
diff --git a/packages/desktop/components/AccountActivity.svelte b/packages/desktop/components/AccountActivity.svelte
index 616dacc00b3..9a55972a7da 100644
--- a/packages/desktop/components/AccountActivity.svelte
+++ b/packages/desktop/components/AccountActivity.svelte
@@ -5,7 +5,7 @@
         activityFilter,
         activitySearchTerm,
         queriedActivities,
-        selectedAccountActivities,
+        selectedWalletActivities,
         setAsyncStatusOfAccountActivities,
     } from '@core/wallet'
     import { ActivityTile, Text, TextInput, TogglableButton, FontWeight } from '@ui'
@@ -22,7 +22,7 @@
     $: if (searchActive && inputElement) inputElement.focus()
     $: searchValue = searchActive ? searchValue.toLowerCase() : ''
     $: setAsyncStatusOfAccountActivities($time)
-    $: if (searchActive && $selectedAccountActivities) {
+    $: if (searchActive && $selectedWalletActivities) {
         debounce(() => {
             $activitySearchTerm = searchValue
         })()
@@ -46,7 +46,7 @@
 
     $: $activityFilter, $activitySearchTerm, scrollToTop()
     $: isEmptyBecauseOfFilter =
-        $selectedAccountActivities.filter((_activity) => !_activity.isHidden).length > 0 &&
+        $selectedWalletActivities.filter((_activity) => !_activity.isHidden).length > 0 &&
         activityListWithTitles.length === 0
 
     function scrollToTop(): void {
diff --git a/packages/desktop/components/AccountSummary.svelte b/packages/desktop/components/AccountSummary.svelte
index 536a4b24c72..dabca0bd6d5 100644
--- a/packages/desktop/components/AccountSummary.svelte
+++ b/packages/desktop/components/AccountSummary.svelte
@@ -5,7 +5,7 @@
 
     import { localize } from '@core/i18n'
     import { nodeInfo } from '@core/network'
-    import { selectedAccountAssets } from '@core/wallet'
+    import { selectedWalletAssets } from '@core/wallet'
     import { activeProfile } from '@core/profile'
 
     $: fomattedNetworkName = $nodeInfo?.protocol.networkName
@@ -13,7 +13,7 @@
         .map((word) => word[0].toUpperCase() + word.substring(1))
         .join(' ')
 
-    $: ({ baseCoin } = $selectedAccountAssets[$activeProfile?.network.id])
+    $: ({ baseCoin } = $selectedWalletAssets[$activeProfile?.network.id])
 </script>
 
 <account-summary class="block relative space-y-4">
diff --git a/packages/desktop/components/AccountSwitcher.svelte b/packages/desktop/components/AccountSwitcher.svelte
index 6d3f737cde3..3a7f999e137 100644
--- a/packages/desktop/components/AccountSwitcher.svelte
+++ b/packages/desktop/components/AccountSwitcher.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { AccountLabel, Icon, Modal } from '@ui'
-    import { AccountSwitcherModal } from '@components'
-    import { selectedAccount } from '@core/account/stores'
+    import { WalletSwitcherModal } from '@components'
+    import { selectedWallet } from '@core/wallet/stores'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
     let modal: Modal
@@ -19,12 +19,12 @@
 <svelte:window on:click={onOutsideClick} />
 <account-switcher>
     <button type="button" on:click={onButtonClick} class="flex flex-row justify-center items-center space-x-2">
-        <AccountLabel account={$selectedAccount} />
+        <AccountLabel account={$selectedWallet} />
         <icon-container class:rotate={isModalOpened}>
             <Icon height="18" width="18" icon={IconEnum.ChevronDown} classes="text-gray-800 dark:text-white" />
         </icon-container>
     </button>
-    <AccountSwitcherModal bind:modal />
+    <WalletSwitcherModal bind:modal />
 </account-switcher>
 
 <style lang="scss">
diff --git a/packages/desktop/components/ProposalCard.svelte b/packages/desktop/components/ProposalCard.svelte
index e03c0c5f4aa..480d82bbde6 100644
--- a/packages/desktop/components/ProposalCard.svelte
+++ b/packages/desktop/components/ProposalCard.svelte
@@ -11,7 +11,7 @@
 
     import { ProposalStatus } from '@contexts/governance/enums'
     import { IProposal } from '@contexts/governance/interfaces'
-    import { participationOverviewForSelectedAccount, selectedProposalId } from '@contexts/governance/stores'
+    import { participationOverviewForSelectedWallet, selectedProposalId } from '@contexts/governance/stores'
     import { isVotingForProposal } from '@contexts/governance/utils'
 
     import { Icon } from '@auxiliary/icon/enums'
@@ -20,7 +20,7 @@
 
     let hasVoted = false
 
-    $: $participationOverviewForSelectedAccount, setHasVoted()
+    $: $participationOverviewForSelectedWallet, setHasVoted()
     $: dark = $appSettings.darkMode
 
     function setHasVoted(): void {
diff --git a/packages/desktop/components/Proposals.svelte b/packages/desktop/components/Proposals.svelte
index 56cb36f0142..ee131002f83 100644
--- a/packages/desktop/components/Proposals.svelte
+++ b/packages/desktop/components/Proposals.svelte
@@ -5,10 +5,10 @@
 
     import { localize } from '@core/i18n'
 
-    import { proposalFilter, registeredProposalsForSelectedAccount } from '@contexts/governance/stores'
+    import { proposalFilter, registeredProposalsForSelectedWallet } from '@contexts/governance/stores'
     import { isVisibleProposal, sortProposals } from '@contexts/governance/utils'
 
-    $: proposals = Object.values($registeredProposalsForSelectedAccount)
+    $: proposals = Object.values($registeredProposalsForSelectedWallet)
 
     let searchTerm = ''
 
diff --git a/packages/desktop/components/ProposalsDetails.svelte b/packages/desktop/components/ProposalsDetails.svelte
index 9d56f96bbb1..e47ead74ea1 100644
--- a/packages/desktop/components/ProposalsDetails.svelte
+++ b/packages/desktop/components/ProposalsDetails.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { Button, KeyValueBox, Text, Modal, MeatballMenuButton, ButtonSize, FontWeight, MenuItem } from '@ui'
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { activeProfileId } from '@core/profile'
     import {
@@ -9,8 +9,8 @@
         getNumberOfTotalProposals,
         getNumberOfVotedProposals,
         getNumberOfVotingProposals,
-        participationOverviewForSelectedAccount,
-        registeredProposalsForSelectedAccount,
+        participationOverviewForSelectedWallet,
+        registeredProposalsForSelectedWallet,
         updateParticipationOverview,
         IProposalsDetails,
     } from '@contexts/governance'
@@ -25,9 +25,9 @@
         votedProposals: null,
     }
 
-    $: isOverviewLoaded = !!$participationOverviewForSelectedAccount
-    $: $registeredProposalsForSelectedAccount, $participationOverviewForSelectedAccount, updateProposalsDetails()
-    $: $selectedAccount, void setParticipationOverview()
+    $: isOverviewLoaded = !!$participationOverviewForSelectedWallet
+    $: $registeredProposalsForSelectedWallet, $participationOverviewForSelectedWallet, updateProposalsDetails()
+    $: $selectedWallet, void setParticipationOverview()
 
     function updateProposalsDetails(): void {
         if ($activeProfileId) {
@@ -42,7 +42,7 @@
 
     async function setParticipationOverview(): Promise<void> {
         if (!isOverviewLoaded || getNumberOfVotedProposals() === 0) {
-            await updateParticipationOverview($selectedAccount.index)
+            await updateParticipationOverview($selectedWallet.id)
         }
     }
 
diff --git a/packages/desktop/components/VestingSchedule.svelte b/packages/desktop/components/VestingSchedule.svelte
index c2bea8200ce..608c0e71409 100644
--- a/packages/desktop/components/VestingSchedule.svelte
+++ b/packages/desktop/components/VestingSchedule.svelte
@@ -3,7 +3,7 @@
     import { IVestingPayout, VestingOutputStatus } from '@contexts/vesting'
     import { getFormattedTimeStamp, localize } from '@core/i18n'
     import { activeProfile } from '@core/profile'
-    import { formatTokenAmountBestMatch, selectedAccountAssets } from '@core/wallet'
+    import { formatTokenAmountBestMatch, selectedWalletAssets } from '@core/wallet'
     import { Pill, Text, TextType, Tooltip } from '@ui'
 
     export let payouts: IVestingPayout[] = []
@@ -13,7 +13,7 @@
 
     $: columnsAmount = calculateOptimalColumns(payouts.length)
     $: remainingSpaces = calculateRemainingGridSpaces(payouts.length, columnsAmount)
-    $: baseCoin = ($selectedAccountAssets?.[$activeProfile?.network?.id] ?? {}).baseCoin
+    $: baseCoin = ($selectedWalletAssets?.[$activeProfile?.network?.id] ?? {}).baseCoin
 
     const MAX_GRID_COLUMNS = 14
 
diff --git a/packages/desktop/components/VotingPower.svelte b/packages/desktop/components/VotingPower.svelte
index b298093aac9..d2db006ff86 100644
--- a/packages/desktop/components/VotingPower.svelte
+++ b/packages/desktop/components/VotingPower.svelte
@@ -2,23 +2,23 @@
     import { Button, Text } from '@ui'
     import { ButtonSize, FontWeight, TextType } from '@ui/enums'
 
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
-    import { formatTokenAmountBestMatch, visibleSelectedAccountAssets } from '@core/wallet'
+    import { formatTokenAmountBestMatch, visibleSelectedWalletAssets } from '@core/wallet'
     import { openPopup, PopupId } from '@auxiliary/popup'
     import { activeProfile } from '@core/profile'
 
-    const asset = $visibleSelectedAccountAssets?.[$activeProfile?.network.id]?.baseCoin
+    const asset = $visibleSelectedWalletAssets?.[$activeProfile?.network.id]?.baseCoin
 
-    $: votingPower = parseInt($selectedAccount?.votingPower, 10)
-    $: maxVotingPower = parseInt($selectedAccount?.balances?.baseCoin?.available) + votingPower
+    $: votingPower = parseInt($selectedWallet?.votingPower, 10)
+    $: maxVotingPower = parseInt($selectedWallet?.balances?.baseCoin?.available) + votingPower
     $: formattedVotingPower = formatTokenAmountBestMatch(votingPower, asset?.metadata)
     $: formattedMaxVotingPower = formatTokenAmountBestMatch(maxVotingPower, asset?.metadata)
     $: hasTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress ||
-        $selectedAccount?.hasVotingTransactionInProgress ||
-        $selectedAccount?.hasConsolidatingOutputsTransactionInProgress ||
-        $selectedAccount?.isTransferring
+        $selectedWallet?.hasVotingPowerTransactionInProgress ||
+        $selectedWallet?.hasVotingTransactionInProgress ||
+        $selectedWallet?.hasConsolidatingOutputsTransactionInProgress ||
+        $selectedWallet?.isTransferring
 
     function onManageVotingPowerClick(): void {
         openPopup({
diff --git a/packages/desktop/components/buttons/menu-buttons/AccountActionsButton.svelte b/packages/desktop/components/buttons/menu-buttons/AccountActionsButton.svelte
index c96d3f3386f..03eb4801298 100644
--- a/packages/desktop/components/buttons/menu-buttons/AccountActionsButton.svelte
+++ b/packages/desktop/components/buttons/menu-buttons/AccountActionsButton.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { AccountActionsMenu } from '@components'
+    import { WalletActionsMenu } from '@components'
     import { Modal, MeatballMenuButton } from '@ui'
 
     let modal: Modal
@@ -7,5 +7,5 @@
 
 <account-actions-button class="block relative">
     <MeatballMenuButton onClick={modal?.toggle} />
-    <AccountActionsMenu bind:modal position={{ right: '0' }} classes="mt-1.5" />
+    <WalletActionsMenu bind:modal position={{ right: '0' }} classes="mt-1.5" />
 </account-actions-button>
diff --git a/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte b/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
index 10435635925..cd34a528133 100644
--- a/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
+++ b/packages/desktop/components/buttons/popup-buttons/MintNativeTokenButton.svelte
@@ -1,18 +1,19 @@
 <script lang="ts">
     import { OnboardingButton } from '@ui'
 
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { resetMintTokenDetails } from '@core/wallet'
 
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { TextHintVariant } from 'shared/components/enums'
 
-    $: hasAliases = $selectedAccount.balances?.aliases.length > 0
+    // TODO(2.0) Should this be checking if it has accounts?
+    $: hasAccounts = $selectedWallet.balances?.accounts.length > 0
 
     function onMintNativeTokenClick(): void {
         resetMintTokenDetails()
-        if (hasAliases) {
+        if (hasAccounts) {
             openPopup({
                 id: PopupId.MintNativeTokenForm,
             })
diff --git a/packages/desktop/components/menu-buttons/ProposalDetailsButton.svelte b/packages/desktop/components/menu-buttons/ProposalDetailsButton.svelte
index fadbb9d846c..8ff5b366e78 100644
--- a/packages/desktop/components/menu-buttons/ProposalDetailsButton.svelte
+++ b/packages/desktop/components/menu-buttons/ProposalDetailsButton.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { Modal, MenuItem, MeatballMenuButton, MenuItemVariant } from '@ui'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
     import { IProposal } from '@contexts/governance'
-    import { participationOverviewForSelectedAccount } from '@contexts/governance/stores'
+    import { participationOverviewForSelectedWallet } from '@contexts/governance/stores'
     import { isVotingForSelectedProposal } from '@contexts/governance/utils'
     import { Icon } from '@auxiliary/icon'
     import { openPopup, PopupId } from '@auxiliary/popup'
@@ -17,8 +17,8 @@
     let isVotingForProposal: boolean
     let isBusy = true // starts in a busy state because data needs to be fetched before displaying selectable options
 
-    $: isTransferring = $selectedAccount?.isTransferring
-    $: isTransferring, $participationOverviewForSelectedAccount, void updateIsVoting() // vote/stop vote changes the isTransferring value. Relying on this requires less updates than relying on proposalsState
+    $: isTransferring = $selectedWallet?.isTransferring
+    $: isTransferring, $participationOverviewForSelectedWallet, void updateIsVoting() // vote/stop vote changes the isTransferring value. Relying on this requires less updates than relying on proposalsState
     $: isBusy = isVotingForProposal === undefined
 
     $: buttons = [
diff --git a/packages/desktop/components/modals/AccountActionsMenu.svelte b/packages/desktop/components/modals/WalletActionsMenu.svelte
similarity index 74%
rename from packages/desktop/components/modals/AccountActionsMenu.svelte
rename to packages/desktop/components/modals/WalletActionsMenu.svelte
index 691e11a08bf..23e8e6a7f8c 100644
--- a/packages/desktop/components/modals/AccountActionsMenu.svelte
+++ b/packages/desktop/components/modals/WalletActionsMenu.svelte
@@ -1,23 +1,23 @@
 <script lang="ts">
     import { MenuItem, MenuItemVariant, Modal, ToggleHiddenAccountMenuItem } from '@ui'
 
-    import { selectedAccount } from '@core/account/stores'
     import { localize } from '@core/i18n'
-    import { activeAccounts, activeProfile, isActiveLedgerProfile, visibleActiveAccounts } from '@core/profile/stores'
-    import { deleteAccount } from '@core/profile-manager/actions'
+    import { activeProfile, isActiveLedgerProfile } from '@core/profile/stores'
 
     import { Icon } from '@auxiliary/icon/enums'
     import { openPopup, PopupId } from '@auxiliary/popup'
-    import { profileManager } from '@core/profile-manager'
     import { checkOrConnectLedger } from '@core/ledger'
     import { showAppNotification } from '@auxiliary/notification'
     import { handleError } from '@core/error/handlers'
     import { NetworkId } from '@core/network/enums'
+    import { selectedWallet } from '@core/wallet/stores'
+    import { activeProfileSecretManager } from '@core/secret-manager'
+    import { deleteWallet } from '@core/profile'
 
     export let modal: Modal = undefined
 
-    const showDeleteAccount =
-        $selectedAccount?.index === $activeAccounts?.length - 1 && $visibleActiveAccounts?.length > 1
+    const showDeleteAccount = true // TODO(2.0) Is there anything preventing us from deleting any account ?
+     // $selectedWallet?.id === $activeWallets?.length - 1 && $visibleActiveWallets?.length > 1
 
     function onCustomiseAccountClick(): void {
         openPopup({ id: PopupId.ManageAccount })
@@ -38,10 +38,13 @@
         const ADDRESS_INDEX = 0
         checkOrConnectLedger(() => {
             try {
-                if ($profileManager && $selectedAccount && $isActiveLedgerProfile) {
-                    $profileManager.generateEd25519Address($selectedAccount.index, ADDRESS_INDEX, {
-                        internal: false,
-                        ledgerNanoPrompt: true,
+                if ($activeProfileSecretManager && $selectedWallet && $isActiveLedgerProfile) {
+                    $activeProfileSecretManager.generateEd25519Addresses({
+                        accountIndex: ADDRESS_INDEX, // TODO(2.0) This shouldn't be named accountIndex
+                        options: {
+                            internal: false,
+                            ledgerNanoPrompt: true,
+                        }
                     })
                     showAppNotification({
                         type: 'info',
@@ -61,8 +64,8 @@
         openPopup({
             id: PopupId.DeleteAccount,
             props: {
-                account: selectedAccount,
-                deleteAccount,
+                account: selectedWallet,
+                deleteWallet,
             },
         })
         modal?.close()
diff --git a/packages/desktop/components/modals/AccountSwitcherModal.svelte b/packages/desktop/components/modals/WalletSwitcherModal.svelte
similarity index 64%
rename from packages/desktop/components/modals/AccountSwitcherModal.svelte
rename to packages/desktop/components/modals/WalletSwitcherModal.svelte
index 30e3bd27070..fa5e892fed3 100644
--- a/packages/desktop/components/modals/AccountSwitcherModal.svelte
+++ b/packages/desktop/components/modals/WalletSwitcherModal.svelte
@@ -1,43 +1,43 @@
 <script lang="ts">
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { openPopup, PopupId } from '@auxiliary/popup'
-    import { sumBalanceForAccounts } from '@core/account'
-    import { selectedAccount } from '@core/account/stores'
+    import { sumBalanceForWallets } from '@core/wallet'
+    import { selectedWallet } from '@core/wallet/stores'
     import { formatCurrency, localize } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
-    import { activeProfile, getBaseToken, visibleActiveAccounts } from '@core/profile'
-    import { formatTokenAmountBestMatch, selectedAccountAssets } from '@core/wallet'
-    import { AccountSwitcherMenuItem, FontWeight, Icon, Modal, Text, TextType } from '@ui'
+    import { activeProfile, getBaseToken, visibleActiveWallets } from '@core/profile'
+    import { formatTokenAmountBestMatch, selectedWalletAssets } from '@core/wallet'
+    import { WalletSwitcherMenuItem, FontWeight, Icon, Modal, Text, TextType } from '@ui'
     import { tick } from 'svelte'
 
     export let modal: Modal = undefined
 
-    $: totalBalance = sumBalanceForAccounts($visibleActiveAccounts)
-    $: ({ baseCoin } = $selectedAccountAssets[$activeProfile?.network.id])
+    $: totalBalance = sumBalanceForWallets($visibleActiveWallets)
+    $: ({ baseCoin } = $selectedWalletAssets[$activeProfile?.network.id])
 
-    async function scrollToSelectedAccount(): Promise<void> {
+    async function scrollToSelectedWallet(): Promise<void> {
         await tick()
-        const element = document.getElementById(`account-${$selectedAccount.index}`)
+        const element = document.getElementById(`account-${$selectedWallet.id}`)
         element?.scrollIntoView({ behavior: 'auto' })
     }
 
-    function onCreateAccountClick(): void {
+    function oncreateWalletClick(): void {
         modal?.close()
-        openPopup({ id: PopupId.CreateAccount })
+        openPopup({ id: PopupId.createWallet })
     }
 </script>
 
 <Modal
     bind:this={modal}
-    on:open={scrollToSelectedAccount}
+    on:open={scrollToSelectedWallet}
     classes="transform -translate-x-1/2"
     size="large"
     position={{ top: '30px', left: '50%' }}
 >
     <account-list-container class="block p-4">
         <account-list class="flex flex-col space-y-1 max-h-96 scrollable-y">
-            {#each $visibleActiveAccounts as account}
-                <AccountSwitcherMenuItem id="account-{account.index}" {account} onClick={modal?.close} />
+            {#each $visibleActiveWallets as wallet}
+                <WalletSwitcherMenuItem id="account-{wallet.id}" {wallet} onClick={modal?.close} />
             {/each}
         </account-list>
     </account-list-container>
@@ -45,7 +45,7 @@
     <button
         type="button"
         class=" flex flex-row justify-between w-full p-8 hover:bg-gray-50 dark:hover:bg-gray-800"
-        on:click={onCreateAccountClick}
+        on:click={oncreateWalletClick}
     >
         <div class="flex flex-row items-center text-right space-x-4">
             <Icon icon={IconEnum.Plus} height="12" width="12" classes="text-blue-500" />
diff --git a/packages/desktop/components/modals/index.js b/packages/desktop/components/modals/index.js
index 9a7b60fbecb..829bd110aad 100644
--- a/packages/desktop/components/modals/index.js
+++ b/packages/desktop/components/modals/index.js
@@ -1,4 +1,4 @@
-export { default as AccountActionsMenu } from './AccountActionsMenu.svelte'
-export { default as AccountSwitcherModal } from './AccountSwitcherModal.svelte'
+export { default as WalletActionsMenu } from './WalletActionsMenu.svelte'
+export { default as WalletSwitcherModal } from './WalletSwitcherModal.svelte'
 export { default as FilterModal } from './FilterModal.svelte'
 export { default as VestingModal } from './VestingModal.svelte'
diff --git a/packages/desktop/components/popups/ActivityDetailsPopup.svelte b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
index b0c03af8b8b..50e415733c0 100644
--- a/packages/desktop/components/popups/ActivityDetailsPopup.svelte
+++ b/packages/desktop/components/popups/ActivityDetailsPopup.svelte
@@ -12,7 +12,7 @@
         ActivityType,
         claimActivity,
         rejectActivity,
-        selectedAccountActivities,
+        selectedWalletActivities,
     } from '@core/wallet'
     import {
         ActivityInformation,
@@ -35,7 +35,7 @@
 
     const explorerUrl = getOfficialExplorerUrl($activeProfile?.network?.id)
 
-    $: activity = $selectedAccountActivities.find((_activity) => _activity.id === activityId)
+    $: activity = $selectedWalletActivities.find((_activity) => _activity.id === activityId)
     $: isTimelocked = activity?.asyncData?.asyncStatus === ActivityAsyncStatus.Timelocked
     $: isActivityIncomingAndUnclaimed =
         activity?.asyncData &&
diff --git a/packages/desktop/components/popups/AddProposalPopup.svelte b/packages/desktop/components/popups/AddProposalPopup.svelte
index af3edc1fb03..ed60dc26566 100644
--- a/packages/desktop/components/popups/AddProposalPopup.svelte
+++ b/packages/desktop/components/popups/AddProposalPopup.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
     import { showAppNotification } from '@auxiliary/notification/actions'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { registerProposalsForAccounts, registeredProposalsForSelectedAccount } from '@contexts/governance'
-    import { selectedAccount } from '@core/account'
+    import { registerProposalsForAccounts, registeredProposalsForSelectedWallet } from '@contexts/governance'
+    import { selectedWallet } from '@core/wallet'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
     import { activeAccounts, updateActiveAccountPersistedData } from '@core/profile'
@@ -39,8 +39,8 @@
                 nodeInput?.validate(),
             ])
             await registerParticipationWrapper()
-            updateActiveAccountPersistedData($selectedAccount.index, {
-                removedProposalIds: $selectedAccount.removedProposalIds?.filter((id) => id !== inputtedEventId),
+            updateActiveAccountPersistedData($selectedWallet.id, {
+                removedProposalIds: $selectedWallet.removedProposalIds?.filter((id) => id !== inputtedEventId),
             })
             isBusy = false
         } catch (err) {
@@ -82,7 +82,7 @@
             node: { url: nodeUrl, auth },
             eventsToRegister: isRegisteringAllProposals ? [] : [eventId],
         }
-        const accounts = isAddingForAllAccounts ? $activeAccounts : [$selectedAccount]
+        const accounts = isAddingForAllAccounts ? $activeAccounts : [$selectedWallet]
         await registerProposalsForAccounts(options, accounts)
         showAppNotification({
             type: 'success',
@@ -114,7 +114,7 @@
             eventIdError = localize('error.eventId.insufficientLength')
             return Promise.reject(eventIdError)
         }
-        if (checkIfAlreadyRegistered && $registeredProposalsForSelectedAccount[eventId]) {
+        if (checkIfAlreadyRegistered && $registeredProposalsForSelectedWallet[eventId]) {
             eventIdError = localize('error.eventId.alreadyRegistered')
             return Promise.reject(eventIdError)
         }
diff --git a/packages/desktop/components/popups/AddressHistoryPopup.svelte b/packages/desktop/components/popups/AddressHistoryPopup.svelte
index 49de27f2238..b71bd8a29a0 100644
--- a/packages/desktop/components/popups/AddressHistoryPopup.svelte
+++ b/packages/desktop/components/popups/AddressHistoryPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getSelectedAccount } from '@core/account'
+    import { getSelectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { truncateString } from '@core/utils'
     import { AccountAddress } from '@iota/sdk/out/types'
@@ -10,8 +10,8 @@
     let addressList: AccountAddress[] | undefined = undefined
 
     onMount(() => {
-        getSelectedAccount()
-            ?.addresses()
+        getSelectedWallet()
+            ?.addresses() // TODO(2.0) Wallets are now single address
             .then((_addressList) => {
                 addressList = _addressList?.sort((a, b) => a.keyIndex - b.keyIndex) ?? []
             })
diff --git a/packages/desktop/components/popups/AliasConfirmationPopup.svelte b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
index fdcd164601a..c0d377cc4de 100644
--- a/packages/desktop/components/popups/AliasConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/AliasConfirmationPopup.svelte
@@ -1,25 +1,27 @@
 <script lang="ts">
     import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
-    import { selectedAccount, updateSelectedAccount } from '@core/account'
-    import { api, getClient } from '@core/profile-manager'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth, getBaseToken } from '@core/profile'
-    import { formatTokenAmountPrecise, EMPTY_HEX_ID, processAndAddToActivities } from '@core/wallet'
-    import { AliasOutput, UnlockConditionType, PreparedTransaction } from '@iota/sdk/out/types'
+    import { formatTokenAmountPrecise, EMPTY_HEX_ID, processAndAddToActivities, selectedWallet, updateSelectedWallet } from '@core/wallet'
+    import { UnlockConditionType, PreparedTransaction, AccountOutput } from '@iota/sdk/out/types'
     import { closePopup } from '@auxiliary/popup'
     import { onMount } from 'svelte'
     import { handleError } from '@core/error/handlers/handleError'
     import { plainToInstance } from 'class-transformer'
+    import { api } from '@core/api'
+    import { getClient } from '@core/wallet/actions/getClient'
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
 
+    // TODO(2.0) Does it still make sense to have this popup?
+
     let storageDeposit: string = '0'
 
     $: address = {
         type: 0,
-        pubKeyHash: api.bech32ToHex($selectedAccount.depositAddress),
+        pubKeyHash: api.bech32ToHex($selectedWallet.depositAddress),
     }
-    $: aliasOutput = address
+    $: accountOutput = address
         ? {
               aliasId: EMPTY_HEX_ID,
               unlockConditions: [
@@ -35,13 +37,13 @@
           }
         : ''
 
-    $: void setStorageDeposit(aliasOutput)
-    $: isTransferring = $selectedAccount.isTransferring
+    $: void setStorageDeposit(accountOutput)
+    $: isTransferring = $selectedWallet.isTransferring
 
-    async function setStorageDeposit(aliasOutput: AliasOutput): Promise<void> {
+    async function setStorageDeposit(accountOutput: AccountOutput): Promise<void> {
         try {
             const client = await getClient()
-            const { amount } = await client.buildAliasOutput(aliasOutput)
+            const { amount } = await client.buildAccountOutput(accountOutput)
             storageDeposit = formatTokenAmountPrecise(Number(amount), getBaseToken())
         } catch (err) {
             handleError(err)
@@ -50,16 +52,16 @@
 
     async function createAlias(): Promise<void> {
         try {
-            updateSelectedAccount({ isTransferring: true })
-            const transaction = await $selectedAccount
-                .prepareCreateAliasOutput()
+            updateSelectedWallet({ isTransferring: true })
+            const transaction = await $selectedWallet
+                .prepareCreateAccountOutput()
                 .then((prepared) => plainToInstance(PreparedTransaction, prepared).send())
-            await processAndAddToActivities(transaction, $selectedAccount)
+            await processAndAddToActivities(transaction, $selectedWallet)
             closePopup()
         } catch (err) {
             handleError(err)
         } finally {
-            updateSelectedAccount({ isTransferring: false })
+            updateSelectedWallet({ isTransferring: false })
         }
     }
 
@@ -91,12 +93,12 @@
         />
         <KeyValueBox
             keyText={localize('general.governorAddress')}
-            valueText={$selectedAccount.depositAddress}
+            valueText={$selectedWallet.depositAddress}
             isCopyable
         />
         <KeyValueBox
             keyText={localize('general.stateControllerAddress')}
-            valueText={$selectedAccount.depositAddress}
+            valueText={$selectedWallet.depositAddress}
             isCopyable
         />
     </div>
diff --git a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
index 833d3df6d87..0dd85684e73 100644
--- a/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
+++ b/packages/desktop/components/popups/BalanceBreakdownPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { isVestingOutputId, selectedAccountVestingOverview } from '@contexts/vesting'
-    import { selectedAccount } from '@core/account'
+    import { isVestingOutputId, selectedWalletVestingOverview } from '@contexts/vesting'
+    import { selectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth } from '@core/profile'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
@@ -22,7 +22,7 @@
         Timelock = 'timelock',
     }
 
-    $: accountBalance = $selectedAccount?.balances
+    $: accountBalance = $selectedWallet?.balances
     $: accountBalance, void setBreakdown()
 
     let breakdown: { [key: string]: BalanceBreakdown } = {}
@@ -53,7 +53,7 @@
         const subBreakdown = {}
         for (const [outputId, unlocked] of Object.entries(accountBalance?.potentiallyLockedOutputs ?? {})) {
             if (!unlocked) {
-                const output = (await $selectedAccount.getOutput(outputId)).output
+                const output = (await $selectedWallet.getOutput(outputId)).output
 
                 let type: string
                 let amount: number
@@ -66,7 +66,7 @@
                         containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.StorageDepositReturn)
                     ) {
                         type = PendingFundsType.StorageDepositReturn
-                        amount = (await getStorageDepositFromOutput($selectedAccount, output as CommonOutput))
+                        amount = (await getStorageDepositFromOutput($selectedWallet, output as CommonOutput))
                             ?.storageDeposit
                     } else if (containsUnlockCondition(commonOutput.unlockConditions, UnlockConditionType.Timelock)) {
                         type = PendingFundsType.Timelock
@@ -89,7 +89,7 @@
     }
 
     function getLockedBreakdown(): BalanceBreakdown {
-        const governanceAmount = parseInt($selectedAccount?.votingPower, 10)
+        const governanceAmount = parseInt($selectedWallet?.votingPower, 10)
         const totalLockedAmount = governanceAmount
 
         const subBreakdown = {
@@ -119,7 +119,7 @@
     }
 
     function getVestingBreakdown(): BalanceBreakdown {
-        return { amount: $selectedAccountVestingOverview?.remainingPayout }
+        return { amount: $selectedWalletVestingOverview?.remainingPayout }
     }
 
     function containsUnlockCondition(unlockConditions: UnlockCondition[], unlockConditionId: number): boolean {
diff --git a/packages/desktop/components/popups/BalanceFinderPopup.svelte b/packages/desktop/components/popups/BalanceFinderPopup.svelte
index 506d0658964..488ee1a0a87 100644
--- a/packages/desktop/components/popups/BalanceFinderPopup.svelte
+++ b/packages/desktop/components/popups/BalanceFinderPopup.svelte
@@ -3,7 +3,7 @@
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { showAppNotification } from '@auxiliary/notification'
     import { PopupId, closePopup, openPopup } from '@auxiliary/popup'
-    import { findBalances, sumBalanceForAccounts, SearchAlgorithmType, selectedAccountIndex } from '@core/account'
+    import { findBalances, sumBalanceForWallets, SearchAlgorithmType, selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { displayNotificationForLedgerProfile, ledgerNanoStatus } from '@core/ledger'
     import { NetworkId } from '@core/network'
@@ -13,8 +13,8 @@
         getBaseToken,
         isActiveLedgerProfile,
         isSoftwareProfile,
-        loadAccounts,
-        visibleActiveAccounts,
+        loadWallets,
+        visibleActiveWallets,
     } from '@core/profile'
     import {
         formatTokenAmountBestMatch,
@@ -52,15 +52,15 @@
 
     const { isStrongholdLocked, network } = $activeProfile
 
-    $: isTransferring = $visibleActiveAccounts.some(
-        (account) => account.hasConsolidatingOutputsTransactionInProgress || account.isTransferring
+    $: isTransferring = $visibleActiveWallets.some(
+        (_wallet) => _wallet.hasConsolidatingOutputsTransactionInProgress || _wallet.isTransferring
     )
     $: visibleWalletList = searchInCurrentWallet
-        ? $visibleActiveAccounts?.filter((account) => account.index === $selectedAccountIndex)
-        : $visibleActiveAccounts
+        ? $visibleActiveWallets?.filter((_wallet) => _wallet.id === $selectedWalletId)
+        : $visibleActiveWallets
     $: searchForBalancesOnLoad && !$isStrongholdLocked && onFindBalancesClick()
     $: consolidateAccountsOnLoad && !$isStrongholdLocked && onConsolidateAccountsClick()
-    $: totalBalance = sumBalanceForAccounts($visibleActiveAccounts)
+    $: totalBalance = sumBalanceForWallets($visibleActiveWallets)
     $: searchInCurrentWallet, (shouldInitSearch = true)
     $: searchAlgorithm = searchInCurrentWallet
         ? SearchAlgorithmType.DFS
@@ -94,7 +94,7 @@
     // Actions
     async function findProfileBalances(): Promise<void> {
         await findBalances(searchAlgorithm, !hasUsedBalanceFinder || shouldInitSearch)
-        await loadAccounts()
+        await loadWallets()
         hasUsedBalanceFinder = true
         shouldInitSearch = false
     }
@@ -102,8 +102,8 @@
     async function consolidateProfileAccounts(): Promise<void> {
         const consolidationPromises: Promise<void>[] = []
 
-        for (const account of get(visibleActiveAccounts)) {
-            consolidationPromises.push(consolidateOutputs(account))
+        for (const wallet of get(visibleActiveWallets)) {
+            consolidationPromises.push(consolidateOutputs(wallet))
         }
 
         await Promise.all(consolidationPromises)
diff --git a/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte b/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
index 0758f15a1b3..76819f79475 100644
--- a/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/BurnNativeTokensConfirmationPopup.svelte
@@ -6,7 +6,7 @@
     import { checkActiveProfileAuth } from '@core/profile'
     import { handleError } from '@core/error/handlers'
     import { onMount } from 'svelte'
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { TextHintVariant } from 'shared/components/enums'
 
     export let asset: IAsset
@@ -63,8 +63,8 @@
         <Button
             classes="w-full"
             variant={ButtonVariant.Warning}
-            isBusy={$selectedAccount.isTransferring}
-            disabled={$selectedAccount.isTransferring}
+            isBusy={$selectedWallet.isTransferring}
+            disabled={$selectedWallet.isTransferring}
             onClick={onBurnTokenClick}
         >
             {localize('actions.burnToken')}
diff --git a/packages/desktop/components/popups/ConfirmationPopup.svelte b/packages/desktop/components/popups/ConfirmationPopup.svelte
index 4a2bfab3bc3..d7e7107a63f 100644
--- a/packages/desktop/components/popups/ConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/ConfirmationPopup.svelte
@@ -4,7 +4,7 @@
     import { closePopup } from '@auxiliary/popup'
     import { handleError } from '@core/error/handlers'
     import { onMount } from 'svelte'
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { TextHintVariant } from 'shared/components/enums'
 
     export let title: string
@@ -65,8 +65,8 @@
         <Button
             classes="w-full"
             variant={buttonVariant}
-            disabled={$selectedAccount.isTransferring || isBusy}
-            isBusy={$selectedAccount.isTransferring || isBusy}
+            disabled={$selectedWallet.isTransferring || isBusy}
+            isBusy={$selectedWallet.isTransferring || isBusy}
             onClick={onConfirmClick}
         >
             {confirmText}
diff --git a/packages/desktop/components/popups/CreateAccountPopup.svelte b/packages/desktop/components/popups/CreateWalletPopup.svelte
similarity index 90%
rename from packages/desktop/components/popups/CreateAccountPopup.svelte
rename to packages/desktop/components/popups/CreateWalletPopup.svelte
index d85b21d3925..a749b215867 100644
--- a/packages/desktop/components/popups/CreateAccountPopup.svelte
+++ b/packages/desktop/components/popups/CreateWalletPopup.svelte
@@ -1,16 +1,17 @@
 <script lang="ts">
     import { onMount } from 'svelte'
     import { Button, ColorPicker, Input, Text, TextType } from '@ui'
-    import { getRandomAccountColor, tryCreateAdditionalAccount, validateAccountName } from '@core/account'
+    import { getRandomWalletColor } from '@core/wallet'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth } from '@core/profile'
     import { getTrimmedLength } from '@core/utils'
     import { closePopup, updatePopupProps } from '@auxiliary/popup'
+    import { validateWalletName, tryCreateAdditionalWallet } from '@core/wallet'
 
     export let accountAlias = ''
     export let error: string
-    export let color = getRandomAccountColor()
+    export let color = getRandomWalletColor()
     export let isBusy = false
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
 
@@ -24,7 +25,7 @@
             }
             isBusy = true
             error = null
-            await validateAccountName(trimmedAccountAlias)
+            await validateWalletName(trimmedAccountAlias)
             updatePopupProps({ accountAlias, color, error, isBusy })
             await checkActiveProfileAuth(_create, { stronghold: true, ledger: true })
             isBusy = false
@@ -43,7 +44,7 @@
     async function _create(): Promise<void> {
         if (trimmedAccountAlias && color) {
             try {
-                await tryCreateAdditionalAccount(trimmedAccountAlias, color.toString())
+                await tryCreateAdditionalWallet(trimmedAccountAlias, color.toString())
                 closePopup()
             } catch (err) {
                 isBusy = false
diff --git a/packages/desktop/components/popups/DeleteAccountPopup.svelte b/packages/desktop/components/popups/DeleteAccountPopup.svelte
index a324506393b..336dd7acc74 100644
--- a/packages/desktop/components/popups/DeleteAccountPopup.svelte
+++ b/packages/desktop/components/popups/DeleteAccountPopup.svelte
@@ -2,13 +2,13 @@
     import { Button, PasswordInput, Text, Error, ButtonVariant, HTMLButtonType, TextHint, TextType } from '@ui'
     import { closePopup } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
-    import { setStrongholdPassword } from '@core/profile-manager'
     import { isSoftwareProfile } from '@core/profile'
-    import { selectedAccount } from '@core/account'
     import { handleError } from '@core/error/handlers/handleError'
     import { TextHintVariant } from 'shared/components/enums'
+    import { selectedWallet } from '@core/wallet/stores'
+    import { setStrongholdPassword } from '@core/wallet/actions'
 
-    export let deleteAccount: (index: number) => Promise<void> = async () => {}
+    export let deleteWallet: (walletId: string) => Promise<void> = async () => {}
 
     let password: string
     let error: string
@@ -26,7 +26,7 @@
             if ($isSoftwareProfile) {
                 await setStrongholdPassword(password)
             }
-            await deleteAccount($selectedAccount?.index)
+            await deleteWallet($selectedWallet.id)
             closePopup()
         } catch (err) {
             error = err.error
@@ -42,7 +42,7 @@
 <div class="mb-5">
     <Text type={TextType.h4}>
         {localize('popups.deleteAccount.title', {
-            values: { name: $selectedAccount?.name },
+            values: { name: $selectedWallet?.name },
         })}
     </Text>
 </div>
diff --git a/packages/desktop/components/popups/DeleteProfilePopup.svelte b/packages/desktop/components/popups/DeleteProfilePopup.svelte
index ab315e8f9cd..f608695d5c5 100644
--- a/packages/desktop/components/popups/DeleteProfilePopup.svelte
+++ b/packages/desktop/components/popups/DeleteProfilePopup.svelte
@@ -2,9 +2,9 @@
     import { Button, PasswordInput, Text, ButtonVariant } from 'shared/components'
     import { isSoftwareProfile } from '@core/profile'
     import { localize } from '@core/i18n'
-    import { setStrongholdPassword } from '@core/profile-manager'
     import { closePopup } from '@auxiliary/popup'
     import { deleteProfile } from '@contexts/settings'
+    import { setStrongholdPassword } from '@core/wallet'
 
     let isBusy = false
     let error = ''
diff --git a/packages/desktop/components/popups/ManageAccountPopup.svelte b/packages/desktop/components/popups/ManageAccountPopup.svelte
index 5dad0a629ac..3f450d9fc1e 100644
--- a/packages/desktop/components/popups/ManageAccountPopup.svelte
+++ b/packages/desktop/components/popups/ManageAccountPopup.svelte
@@ -1,27 +1,27 @@
 <script lang="ts">
     import { closePopup } from '@auxiliary/popup'
-    import { selectedAccount, validateAccountName } from '@core/account'
     import { localize } from '@core/i18n'
     import { updateActiveAccountPersistedData } from '@core/profile/actions'
     import { getTrimmedLength } from '@core/utils'
+    import { selectedWallet, validateWalletName } from '@core/wallet'
     import { Button, ColorPicker, Input, Text, TextType } from '@ui'
 
     export let error = ''
 
     let isBusy = false
-    let accountAlias = $selectedAccount.name
-    let color = $selectedAccount.color
+    let accountAlias = $selectedWallet.name
+    let color = $selectedWallet.color
 
     $: accountAlias, (error = '')
     $: trimmedAccountAlias = accountAlias.trim()
-    $: invalidAliasUpdate = !getTrimmedLength(accountAlias) || isBusy || accountAlias === $selectedAccount.name
-    $: hasColorChanged = $selectedAccount.color !== color
+    $: invalidAliasUpdate = !getTrimmedLength(accountAlias) || isBusy || accountAlias === $selectedWallet.name
+    $: hasColorChanged = $selectedWallet.color !== color
 
     async function onSaveClick(): Promise<void> {
         if (trimmedAccountAlias) {
             error = ''
             try {
-                await validateAccountName(trimmedAccountAlias, true, trimmedAccountAlias !== $selectedAccount.name)
+                await validateWalletName(trimmedAccountAlias, true, trimmedAccountAlias !== $selectedWallet.name)
             } catch ({ message }) {
                 error = message
                 return
@@ -39,7 +39,7 @@
     function saveAccountPersistedData(): void {
         try {
             if (trimmedAccountAlias || color) {
-                updateActiveAccountPersistedData($selectedAccount?.index, { name: trimmedAccountAlias, color })
+                updateActiveAccountPersistedData($selectedWallet?.id, { name: trimmedAccountAlias, color })
                 closePopup()
             }
         } finally {
diff --git a/packages/desktop/components/popups/ManageVotingPowerPopup.svelte b/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
index 393207872a2..a7afcb16726 100644
--- a/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
+++ b/packages/desktop/components/popups/ManageVotingPowerPopup.svelte
@@ -1,15 +1,15 @@
 <script lang="ts">
     import { Button, Text, TextHint, AssetAmountInput } from 'shared/components'
     import { HTMLButtonType, TextType, TextHintVariant } from 'shared/components/enums'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { setVotingPower } from '@contexts/governance/actions'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth } from '@core/profile/actions'
-    import { convertToRawAmount, visibleSelectedAccountAssets } from '@core/wallet'
+    import { convertToRawAmount, visibleSelectedWalletAssets } from '@core/wallet'
     import { closePopup, openPopup, PopupId, popupState } from '@auxiliary/popup'
     import { onMount } from 'svelte'
-    import { isAccountVoting } from '@contexts/governance/utils'
+    import { isWalletVoting } from '@contexts/governance/utils'
     import { activeProfile } from '@core/profile'
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
@@ -17,16 +17,16 @@
 
     let assetAmountInput: AssetAmountInput
     let amount: string
-    let rawAmount = newVotingPower ?? $selectedAccount?.votingPower
+    let rawAmount = newVotingPower ?? $selectedWallet?.votingPower
     let confirmDisabled = false
 
-    $: asset = $visibleSelectedAccountAssets[$activeProfile?.network.id].baseCoin
-    $: votingPower = parseInt($selectedAccount?.votingPower, 10)
+    $: asset = $visibleSelectedWalletAssets[$activeProfile?.network.id].baseCoin
+    $: votingPower = parseInt($selectedWallet?.votingPower, 10)
     $: hasTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress ||
-        $selectedAccount?.hasVotingTransactionInProgress ||
-        $selectedAccount?.hasConsolidatingOutputsTransactionInProgress ||
-        $selectedAccount?.isTransferring
+        $selectedWallet?.hasVotingPowerTransactionInProgress ||
+        $selectedWallet?.hasVotingTransactionInProgress ||
+        $selectedWallet?.hasConsolidatingOutputsTransactionInProgress ||
+        $selectedWallet?.isTransferring
     $: amount, hasTransactionInProgress, setConfirmDisabled()
 
     function setConfirmDisabled(): void {
@@ -35,7 +35,7 @@
             return
         }
         const convertedSliderAmount = convertToRawAmount(amount, asset?.metadata)?.toString()
-        confirmDisabled = convertedSliderAmount === $selectedAccount?.votingPower || hasTransactionInProgress
+        confirmDisabled = convertedSliderAmount === $selectedWallet?.votingPower || hasTransactionInProgress
     }
 
     function onCancelClick(): void {
@@ -46,7 +46,7 @@
         try {
             await assetAmountInput?.validate(true)
 
-            if (amount === '0' && isAccountVoting($selectedAccount.index)) {
+            if (amount === '0' && isWalletVoting($selectedWallet.id)) {
                 openPopup({ id: PopupId.VotingPowerToZero })
                 return
             }
diff --git a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
index ca6fdebea74..e930e6613fb 100644
--- a/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNativeTokenConfirmationPopup.svelte
@@ -13,9 +13,9 @@
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { Button, KeyValueBox, Text, FontWeight, TextType } from 'shared/components'
     import { onMount } from 'svelte'
-    import { getClient } from '@core/profile-manager'
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { handleError } from '@core/error/handlers/handleError'
+    import { getClient } from '@core/wallet/actions'
 
     export let _onMount: (..._: any[]) => Promise<void> = async () => {}
 
@@ -23,10 +23,10 @@
 
     let metadata: IIrc30Metadata | undefined
     $: metadata = getMetadata($mintTokenDetails)
-    $: isTransferring = $selectedAccount?.isTransferring
+    $: isTransferring = $selectedWallet?.isTransferring
 
     async function prepareFoundryOutput(): Promise<void> {
-        if ($mintTokenDetails && $selectedAccount && metadata) {
+        if ($mintTokenDetails && $selectedWallet && metadata) {
             const { totalSupply, circulatingSupply, aliasId } = $mintTokenDetails
             const outputData = await buildFoundryOutputData(
                 Number(totalSupply),
diff --git a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
index a9a082b8632..ca257e348cd 100644
--- a/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/MintNftConfirmationPopup.svelte
@@ -2,8 +2,8 @@
     import { onMount } from 'svelte'
     import { Button, Text, FontWeight, NftImageOrIconBox, Tabs, KeyValueBox, NftSize } from 'shared/components'
     import { localize } from '@core/i18n'
-    import { getClient } from '@core/profile-manager'
-    import { selectedAccount } from '@core/account'
+    import { getClient } from '@core/wallet/actions'
+    import { selectedWallet } from '@core/wallet'
     import { buildNftOutputData, formatTokenAmountPrecise, mintNft, mintNftDetails } from '@core/wallet'
     import { getBaseToken, checkActiveProfileAuth } from '@core/profile'
     import { handleError } from '@core/error/handlers/handleError'
@@ -51,7 +51,7 @@
     }
 
     async function prepareNftOutput(): Promise<void> {
-        const outputData = buildNftOutputData(irc27Metadata, $selectedAccount.depositAddress)
+        const outputData = buildNftOutputData(irc27Metadata, $selectedWallet.depositAddress)
         const client = await getClient()
         const preparedOutput = await client.buildNftOutput(outputData)
         storageDeposit = Number(preparedOutput.amount) ?? 0
@@ -121,7 +121,7 @@
                     {/if}
                     <KeyValueBox
                         keyText={localize('general.immutableIssuer')}
-                        valueText={$selectedAccount.depositAddress}
+                        valueText={$selectedWallet.depositAddress}
                     />
                 {:else if activeTab === Tab.Nft}
                     {#each Object.entries(nftTabDetails) as [key, value]}
@@ -138,14 +138,14 @@
         </nft-details>
     </div>
     <div class="flex flex-row flex-nowrap w-full space-x-4">
-        <Button outline classes="w-full" disabled={$selectedAccount.isTransferring} onClick={onBackClick}>
+        <Button outline classes="w-full" disabled={$selectedWallet.isTransferring} onClick={onBackClick}>
             {localize('actions.back')}
         </Button>
         <Button
             classes="w-full"
-            disabled={$selectedAccount.isTransferring}
+            disabled={$selectedWallet.isTransferring}
             onClick={onConfirmClick}
-            isBusy={$selectedAccount.isTransferring}
+            isBusy={$selectedWallet.isTransferring}
         >
             {localize('actions.confirm')}
         </Button>
diff --git a/packages/desktop/components/popups/NodeInfoPopup.svelte b/packages/desktop/components/popups/NodeInfoPopup.svelte
index 73599496cc3..012bc00a2ec 100644
--- a/packages/desktop/components/popups/NodeInfoPopup.svelte
+++ b/packages/desktop/components/popups/NodeInfoPopup.svelte
@@ -2,11 +2,12 @@
     import { onMount } from 'svelte'
     import { Button, Checkbox, CopyableBox, Spinner, Text } from 'shared/components'
     import { formatNumber, localize } from '@core/i18n'
-    import { INode, INodeInfo } from '@core/network'
+    import { INode } from '@core/network'
     import { closePopup } from '@auxiliary/popup'
     import { showAppNotification } from '@auxiliary/notification'
     import { resolveObjectPath, setClipboard } from '@core/utils'
-    import { getNodeInfo } from '@core/profile-manager'
+    import { INodeInfo } from '@iota/sdk/out/types'
+    import { getNodeInfo } from '@core/wallet/actions'
 
     enum NodeInfoTab {
         General = 'general',
diff --git a/packages/desktop/components/popups/Popup.svelte b/packages/desktop/components/popups/Popup.svelte
index c2873aec23a..a33aa0c5b85 100644
--- a/packages/desktop/components/popups/Popup.svelte
+++ b/packages/desktop/components/popups/Popup.svelte
@@ -8,7 +8,7 @@
     import { clickOutside } from '@core/utils/ui'
 
     // Popups
-    import AccountSwitcherPopup from './AccountSwitcherPopup.svelte'
+    import AccountSwitcherPopup from './WalletSwitcherPopup.svelte'
     import ActivityDetailsPopup from './ActivityDetailsPopup.svelte'
     import AddNodePopup from './AddNodePopup.svelte'
     import AddProposalPopup from './AddProposalPopup.svelte'
@@ -19,7 +19,7 @@
     import BurnNativeTokensConfirmationPopup from './BurnNativeTokensConfirmationPopup.svelte'
     import ConfirmationPopup from './ConfirmationPopup.svelte'
     import ConnectLedgerPopup from './ConnectLedgerPopup.svelte'
-    import CreateAccountPopup from './CreateAccountPopup.svelte'
+    import createWalletPopup from './CreateWalletPopup.svelte'
     import DeepLinkErrorPopup from './DeepLinkErrorPopup.svelte'
     import DeleteAccountPopup from './DeleteAccountPopup.svelte'
     import DeleteProfilePopup from './DeleteProfilePopup.svelte'
@@ -78,7 +78,7 @@
 
     $: switch (id) {
         case PopupId.ConnectLedger:
-        case PopupId.CreateAccount:
+        case PopupId.createWallet:
         case PopupId.ManageAccount:
             size = PopupSize.Small
             break
@@ -105,7 +105,7 @@
         [PopupId.BurnNativeTokensConfirmation]: BurnNativeTokensConfirmationPopup,
         [PopupId.Confirmation]: ConfirmationPopup,
         [PopupId.ConnectLedger]: ConnectLedgerPopup,
-        [PopupId.CreateAccount]: CreateAccountPopup,
+        [PopupId.createWallet]: createWalletPopup,
         [PopupId.DeepLinkError]: DeepLinkErrorPopup,
         [PopupId.DeleteAccount]: DeleteAccountPopup,
         [PopupId.DeleteProfile]: DeleteProfilePopup,
diff --git a/packages/desktop/components/popups/ReceiveAddressPopup.svelte b/packages/desktop/components/popups/ReceiveAddressPopup.svelte
index 526e9c2309d..cc7af4cb0b9 100644
--- a/packages/desktop/components/popups/ReceiveAddressPopup.svelte
+++ b/packages/desktop/components/popups/ReceiveAddressPopup.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { QR, Text, FontWeight, AddressBox } from '@ui'
     import { localize } from '@core/i18n'
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
 
     export let title: string = localize('general.receiveFunds')
 
-    $: receiveAddress = $selectedAccount.depositAddress
+    $: receiveAddress = $selectedWallet.depositAddress
 </script>
 
 <receive-details class="w-full h-full space-y-6 flex flex-auto flex-col shrink-0">
diff --git a/packages/desktop/components/popups/RemoveProposalPopup.svelte b/packages/desktop/components/popups/RemoveProposalPopup.svelte
index 7750de13f68..484b18094d4 100644
--- a/packages/desktop/components/popups/RemoveProposalPopup.svelte
+++ b/packages/desktop/components/popups/RemoveProposalPopup.svelte
@@ -8,7 +8,7 @@
         selectedProposalId,
     } from '@contexts/governance/stores'
     import { closePopup } from '@auxiliary/popup'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
     import { updateActiveAccountPersistedData } from '@core/profile/actions'
@@ -22,9 +22,9 @@
 
     async function onConfirmClick(): Promise<void> {
         try {
-            await $selectedAccount.deregisterParticipationEvent($selectedProposalId)
-            updateActiveAccountPersistedData($selectedAccount.index, {
-                removedProposalIds: [...($selectedAccount.removedProposalIds ?? []), $selectedProposalId],
+            await $selectedWallet.deregisterParticipationEvent($selectedProposalId)
+            updateActiveAccountPersistedData($selectedWallet.id, {
+                removedProposalIds: [...($selectedWallet.removedProposalIds ?? []), $selectedProposalId],
             })
             $governanceRouter.previous()
             clearEvent()
@@ -40,7 +40,7 @@
     }
 
     function clearEvent(): void {
-        removePersistedProposal($selectedProposalId, $selectedAccount.index)
+        removePersistedProposal($selectedProposalId, $selectedWallet.id)
         $selectedProposalId = null
         clearSelectedParticipationEventStatus()
     }
diff --git a/packages/desktop/components/popups/RevotePopup.svelte b/packages/desktop/components/popups/RevotePopup.svelte
index faba0a9358d..8be1dd97562 100644
--- a/packages/desktop/components/popups/RevotePopup.svelte
+++ b/packages/desktop/components/popups/RevotePopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Button, Text, TextHint, HTMLButtonType, TextType } from 'shared/components'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
     import { closePopup } from '@auxiliary/popup'
     import { checkActiveProfileAuth } from '@core/profile/actions'
@@ -8,7 +8,7 @@
     import { TextHintVariant } from 'shared/components/enums'
 
     $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+        $selectedWallet?.hasVotingPowerTransactionInProgress || $selectedWallet?.hasVotingTransactionInProgress
 
     async function onSubmit(): Promise<void> {
         await checkActiveProfileAuth(async () => {
diff --git a/packages/desktop/components/popups/StopVotingPopup.svelte b/packages/desktop/components/popups/StopVotingPopup.svelte
index 00da5155cea..852ec3a22a8 100644
--- a/packages/desktop/components/popups/StopVotingPopup.svelte
+++ b/packages/desktop/components/popups/StopVotingPopup.svelte
@@ -5,11 +5,11 @@
     import { stopVotingForProposal } from '@contexts/governance/actions'
     import { selectedProposal } from '@contexts/governance/stores'
     import { localize } from '@core/i18n'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { checkActiveProfileAuth } from '@core/profile/actions'
 
     $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+        $selectedWallet?.hasVotingPowerTransactionInProgress || $selectedWallet?.hasVotingTransactionInProgress
 
     function onCancelClick(): void {
         closePopup()
diff --git a/packages/desktop/components/popups/VestingCollectPopup.svelte b/packages/desktop/components/popups/VestingCollectPopup.svelte
index 116da8287c7..1be2957c0f5 100644
--- a/packages/desktop/components/popups/VestingCollectPopup.svelte
+++ b/packages/desktop/components/popups/VestingCollectPopup.svelte
@@ -2,8 +2,8 @@
     import { Button, Text, FontWeight, TextType, KeyValueBox } from 'shared/components'
     import { localize } from '@core/i18n'
     import { PopupId, closePopup, openPopup } from '@auxiliary/popup'
-    import { selectedAccountVestingUnclaimedFunds } from '@contexts/vesting'
-    import { formatTokenAmountBestMatch, selectedAccountAssets } from '@core/wallet'
+    import { selectedWalletVestingUnclaimedFunds } from '@contexts/vesting'
+    import { formatTokenAmountBestMatch, selectedWalletAssets } from '@core/wallet'
     import { activeProfile, isSoftwareProfile } from '@core/profile'
     import { consolidateOutputs } from '@core/wallet/actions/consolidateOutputs'
     import { handleError } from '@core/error/handlers'
@@ -13,10 +13,10 @@
 
     let isBusy = false
 
-    $: ({ baseCoin } = $selectedAccountAssets[network?.id])
+    $: ({ baseCoin } = $selectedWalletAssets[network?.id])
 
     $: unclaimedFunds = baseCoin
-        ? formatTokenAmountBestMatch(Math.round($selectedAccountVestingUnclaimedFunds), baseCoin.metadata)
+        ? formatTokenAmountBestMatch(Math.round($selectedWalletVestingUnclaimedFunds), baseCoin.metadata)
         : DEFAULT_EMPTY_VALUE_STRING
 
     async function onConfirmClick(): Promise<void> {
diff --git a/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte b/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte
index 5ab40a8197e..08c09d9a464 100644
--- a/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte
+++ b/packages/desktop/components/popups/VestingRewardsFinderPopup.svelte
@@ -2,21 +2,21 @@
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { showAppNotification } from '@auxiliary/notification'
     import { PopupId, closePopup, openPopup } from '@auxiliary/popup'
-    import { selectedAccountVestingOverview } from '@contexts/vesting'
-    import { SearchAlgorithmType, findBalances } from '@core/account'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWalletVestingOverview } from '@contexts/vesting'
+    import { SearchAlgorithmType, findBalances } from '@core/wallet'
+    import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
     import { displayNotificationForLedgerProfile, ledgerNanoStatus } from '@core/ledger'
     import { loadNftsForActiveProfile } from '@core/nfts'
     import {
         BALANCE_FINDER_ACCOUNT_RECOVERY_CONFIGURATION,
+        RecoverAccountsPayload,
         activeProfile,
         getBaseToken,
         isActiveLedgerProfile,
         isSoftwareProfile,
-        loadAccounts,
+        loadWallets,
     } from '@core/profile'
-    import { RecoverAccountsPayload } from '@core/profile-manager'
     import { truncateString } from '@core/utils'
     import {
         formatTokenAmountBestMatch,
@@ -33,7 +33,7 @@
 
     const { isStrongholdLocked, type } = $activeProfile
     const config: RecoverAccountsPayload = {
-        accountStartIndex: $selectedAccount.index,
+        accountStartIndex: $selectedWallet.id, // TODO(2.0) Index?
         accountGapLimit: 0,
         addressGapLimit: BALANCE_FINDER_ACCOUNT_RECOVERY_CONFIGURATION[type].addressGapLimit,
     }
@@ -72,7 +72,7 @@
                     return
                 }
                 await findBalances(SearchAlgorithmType.DFS, !hasUsedVestingRewardsFinder, config)
-                await loadAccounts()
+                await loadWallets()
                 hasUsedVestingRewardsFinder = true
             } catch (err) {
                 error = localize(err.error)
@@ -112,7 +112,7 @@
     >
 
     <div class="w-full flex-col space-y-2 balance-overview-wrapper">
-        <VirtualList items={$selectedAccountVestingOverview.rewardsPerAddresses} let:item>
+        <VirtualList items={$selectedWalletVestingOverview.rewardsPerAddresses} let:item>
             <div class="mb-1">
                 <KeyValueBox
                     isCopyable
@@ -128,7 +128,7 @@
         <KeyValueBox
             keyText={localize('popups.vestingRewards.totalAddressBalance')}
             valueText={formatTokenAmountBestMatch(
-                Math.round($selectedAccountVestingOverview.totalRewards),
+                Math.round($selectedWalletVestingOverview.totalRewards),
                 getBaseToken()
             )}
         />
diff --git a/packages/desktop/components/popups/VoteForProposalPopup.svelte b/packages/desktop/components/popups/VoteForProposalPopup.svelte
index adc45a13883..80fbd29ea67 100644
--- a/packages/desktop/components/popups/VoteForProposalPopup.svelte
+++ b/packages/desktop/components/popups/VoteForProposalPopup.svelte
@@ -2,7 +2,7 @@
     import { Button, Text, FontWeight, TextHint, TextType, KeyValueBox } from 'shared/components'
     import { HTMLButtonType, TextHintVariant } from 'shared/components/enums'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
     import { checkActiveProfileAuth, getBaseToken } from '@core/profile/actions'
     import { formatTokenAmountBestMatch } from '@core/wallet/utils'
@@ -12,11 +12,11 @@
 
     export let selectedAnswerValues: number[]
 
-    $: formattedVotingPower = formatTokenAmountBestMatch(Number($selectedAccount?.votingPower), getBaseToken())
-    $: hasVotingPower = Number($selectedAccount?.votingPower) > 0
+    $: formattedVotingPower = formatTokenAmountBestMatch(Number($selectedWallet?.votingPower), getBaseToken())
+    $: hasVotingPower = Number($selectedWallet?.votingPower) > 0
 
     $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+        $selectedWallet?.hasVotingPowerTransactionInProgress || $selectedWallet?.hasVotingTransactionInProgress
 
     $: numberOfAbstainedQuestions =
         selectedAnswerValues?.filter((answerValue) => answerValue === ABSTAIN_VOTE_VALUE).length ?? 0
diff --git a/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte b/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
index 2226343249a..9cf9a29bec9 100644
--- a/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
+++ b/packages/desktop/components/popups/VotingPowerToZeroPopup.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Button, Text, TextHint } from 'shared/components'
     import { HTMLButtonType, TextHintVariant, TextType } from 'shared/components/enums'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { setVotingPower } from '@contexts/governance/actions'
     import { localize } from '@core/i18n'
@@ -11,7 +11,7 @@
     const ZERO_VOTING_POWER = '0'
 
     $: isTransferring =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+        $selectedWallet?.hasVotingPowerTransactionInProgress || $selectedWallet?.hasVotingTransactionInProgress
 
     function onCancelClick(): void {
         closePopup()
diff --git a/packages/desktop/components/popups/AccountSwitcherPopup.svelte b/packages/desktop/components/popups/WalletSwitcherPopup.svelte
similarity index 78%
rename from packages/desktop/components/popups/AccountSwitcherPopup.svelte
rename to packages/desktop/components/popups/WalletSwitcherPopup.svelte
index 957cac0548c..bb23c6e961a 100644
--- a/packages/desktop/components/popups/AccountSwitcherPopup.svelte
+++ b/packages/desktop/components/popups/WalletSwitcherPopup.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { Text, Button, FontWeight, TextType, AccountSelector } from 'shared/components'
+    import { Text, Button, FontWeight, TextType, WalletSelector } from 'shared/components'
     import { closePopup } from '@auxiliary/popup'
-    import { IAccountState, setSelectedAccount } from '@core/account'
+    import { IWalletState, setSelectedWallet } from '@core/wallet'
 
     export let onCancel: () => void
     export let onConfirm: () => void
 
-    let account: IAccountState
+    let wallet: IWalletState
 
     function onConfirmClick(): void {
-        setSelectedAccount(account.index)
+        setSelectedWallet(wallet.id)
         onConfirm && onConfirm()
     }
 
@@ -20,22 +20,22 @@
     }
 </script>
 
-<account-switcher-popup class="space-y-6 flex flex-col shrink-0">
+<wallet-switcher-popup class="space-y-6 flex flex-col shrink-0">
     <Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left">
         {localize('popups.deeplinkAccountSwitch.title')}
     </Text>
     <div class="flex flex-col space-y-4">
         <Text fontSize="15" color="gray-700" classes="text-left">{localize('popups.deeplinkAccountSwitch.body')}</Text>
-        <AccountSelector bind:account />
+        <WalletSelector bind:wallet={wallet} />
     </div>
     <popup-buttons class="flex flex-row flex-nowrap w-full space-x-4">
         <Button classes="w-full" outline onClick={onCancelClick}>{localize('actions.cancel')}</Button>
         <Button classes="w-full" onClick={onConfirmClick}>{localize('actions.confirm')}</Button>
     </popup-buttons>
-</account-switcher-popup>
+</wallet-switcher-popup>
 
 <style lang="scss">
-    account-input {
+    wallet-input {
         button {
             @apply w-full;
             @apply flex flex-row flex-1;
diff --git a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
index 6d1e94b05d0..25d38c28aa3 100644
--- a/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/desktop/components/popups/send/SendConfirmationPopup.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { PopupId, closePopup, openPopup, updatePopupProps } from '@auxiliary/popup'
-    import { prepareOutput, selectedAccount } from '@core/account'
+    import { prepareOutput, selectedWallet } from '@core/wallet'
     import { handleError } from '@core/error/handlers/handleError'
     import { localize } from '@core/i18n'
     import { ledgerPreparedOutput } from '@core/ledger'
@@ -66,7 +66,7 @@
         transactionDetails.asset?.metadata?.standard === TokenStandard.BaseToken
     $: isInternal = recipient.type === 'account'
     $: isLayer2Transaction = !!layer2Parameters
-    $: isTransferring = $selectedAccount.isTransferring
+    $: isTransferring = $selectedWallet.isTransferring
     $: hideGiftToggle = isBaseTokenTransfer || isLayer2Transaction || (disableToggleGift && !giftStorageDeposit)
 
     $: if (!isSendAndClosePopup) expirationDate, giftStorageDeposit, void rebuildTransactionOutput()
@@ -110,7 +110,7 @@
         try {
             const transactionDetails = get(newTransactionDetails)
             const outputParams = await getOutputParameters(transactionDetails)
-            preparedOutput = await prepareOutput($selectedAccount.index, outputParams, getDefaultTransactionOptions())
+            preparedOutput = await prepareOutput($selectedWallet.id, outputParams, getDefaultTransactionOptions())
             await updateStorageDeposit()
 
             // This potentially triggers a second 'prepareOutput',
@@ -132,7 +132,7 @@
     async function updateStorageDeposit(): Promise<void> {
         if (preparedOutput) {
             const { storageDeposit: _storageDeposit, giftedStorageDeposit: _giftedStorageDeposit } =
-                await getStorageDepositFromOutput($selectedAccount, preparedOutput as CommonOutput)
+                await getStorageDepositFromOutput($selectedWallet, preparedOutput as CommonOutput)
 
             storageDeposit = minimumStorageDeposit = _storageDeposit > 0 ? _storageDeposit : _giftedStorageDeposit
 
diff --git a/packages/desktop/components/popups/send/SendFormPopup.svelte b/packages/desktop/components/popups/send/SendFormPopup.svelte
index 69998ae4469..79460fd4427 100644
--- a/packages/desktop/components/popups/send/SendFormPopup.svelte
+++ b/packages/desktop/components/popups/send/SendFormPopup.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
     import { get } from 'svelte/store'
     import { localize } from '@core/i18n'
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import {
         isReservedTagKeyword,
         InclusionState,
-        selectedAccountActivities,
+        selectedWalletActivities,
         newTransactionDetails,
         NewTransactionType,
     } from '@core/wallet'
@@ -23,8 +23,8 @@
 
     $: hasSpendableNfts = $ownedNfts.some((nft) => nft.isSpendable)
     $: isTransferInProgress =
-        $selectedAccountActivities.some((_activity) => _activity.inclusionState === InclusionState.Pending) ||
-        $selectedAccount.isTransferring
+        $selectedWalletActivities.some((_activity) => _activity.inclusionState === InclusionState.Pending) ||
+        $selectedWallet.isTransferring
 
     async function validate(
         inputValidations?: [() => Promise<void>],
diff --git a/packages/desktop/components/popups/send/SendNftForm.svelte b/packages/desktop/components/popups/send/SendNftForm.svelte
index db276fb493f..7fe928d346e 100644
--- a/packages/desktop/components/popups/send/SendNftForm.svelte
+++ b/packages/desktop/components/popups/send/SendNftForm.svelte
@@ -4,7 +4,7 @@
     import { Button, Error, NetworkInput, NftInput, OptionalInput, RecipientInput } from '@ui'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import { localize } from '@core/i18n'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { Output } from '@iota/sdk/out/types'
     import {
         getDefaultTransactionOptions,
@@ -16,7 +16,7 @@
     } from '@core/wallet'
     import features from '@features/features'
     import { activeProfile } from '@core/profile'
-    import { prepareOutput } from '@core/account'
+    import { prepareOutput } from '@core/wallet'
     import { handleError } from '@core/error/handlers'
     import { MAX_METADATA_BYTES, MAX_TAG_BYTES } from '@core/utils'
     import { OptionalInputType } from '@core/wallet/utils/send/sendUtils'
@@ -63,7 +63,7 @@
             tag,
             metadata,
             layer2Parameters: isLayer2Transfer
-                ? { networkAddress: iscpChainAddress, senderAddress: $selectedAccount.depositAddress }
+                ? { networkAddress: iscpChainAddress, senderAddress: $selectedWallet.depositAddress }
                 : null,
             disableAssetSelection,
         })
@@ -73,7 +73,7 @@
     $: nftId, !showLayer2 && networkInput?.reset()
 
     onMount(() => {
-        if (Number($selectedAccount.balances.baseCoin.available) === 0) {
+        if (Number($selectedWallet.balances.baseCoin.available) === 0) {
             giftStorageDeposit = true
             disableChangeExpiration = true
             disableToggleGift = true
@@ -86,7 +86,7 @@
             isPreparingOutput = true
 
             const outputParams = await getOutputParameters(details)
-            preparedOutput = await prepareOutput($selectedAccount.index, outputParams, getDefaultTransactionOptions())
+            preparedOutput = await prepareOutput($selectedWallet.id, outputParams, getDefaultTransactionOptions())
         } catch (err) {
             handleError(err)
         } finally {
diff --git a/packages/desktop/components/popups/send/SendTokenForm.svelte b/packages/desktop/components/popups/send/SendTokenForm.svelte
index 9c381024bd9..cf68f69c6df 100644
--- a/packages/desktop/components/popups/send/SendTokenForm.svelte
+++ b/packages/desktop/components/popups/send/SendTokenForm.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { AssetAmountInput, Button, Error, NetworkInput, OptionalInput, RecipientInput } from '@ui'
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-    import { prepareOutput, selectedAccount } from '@core/account'
+    import { prepareOutput, selectedWallet } from '@core/wallet'
     import { Output } from '@iota/sdk/out/types'
     import {
         getDefaultTransactionOptions,
@@ -60,7 +60,7 @@
             tag,
             metadata,
             layer2Parameters: isLayer2Transfer
-                ? { networkAddress: iscpChainAddress, senderAddress: $selectedAccount.depositAddress }
+                ? { networkAddress: iscpChainAddress, senderAddress: $selectedWallet.depositAddress }
                 : null,
             disableAssetSelection,
         })
@@ -76,7 +76,7 @@
             isPreparingOutput = true
 
             const outputParams = await getOutputParameters(details)
-            preparedOutput = await prepareOutput($selectedAccount.index, outputParams, getDefaultTransactionOptions())
+            preparedOutput = await prepareOutput($selectedWallet.id, outputParams, getDefaultTransactionOptions())
         } catch (err) {
             handleError(err)
         } finally {
diff --git a/packages/desktop/electron/preload.js b/packages/desktop/electron/preload.js
index eb7acd45ad5..ccc44c5c9b2 100644
--- a/packages/desktop/electron/preload.js
+++ b/packages/desktop/electron/preload.js
@@ -109,45 +109,50 @@ try {
     contextBridge.exposeInMainWorld('__WALLET__API__', {
         ...methods,
         async createSecretManager(options) {
-            const manager = new IotaSdk.SecretManager(options);
+            const manager = new IotaSdk.SecretManager(options)
             bindMethodsAcrossContextBridge(IotaSdk.SecretManager.prototype, manager)
             return manager
         },
-        // rename to createWallet
-        async createAccount(id, options) {
+        // TODO(2.0): rename to createWallet
+        async createWallet(id, options) {
             const wallet = new IotaSdk.Wallet(options)
             wallet.id = id
             wallets[id] = wallet
             bindMethodsAcrossContextBridge(IotaSdk.Wallet.prototype, wallet)
             return wallet
         },
+        // TODO(2.0): also remove from file system
         deleteWallet(id) {
             if (id && id in wallets) {
+                const wallet = wallets[id]
+                wallet.destroy()
                 delete wallets[id]
             }
         },
-        async getAccount(managerId, index) {
-            const manager = wallets[managerId]
-            const account = await manager.getAccount(index)
-            bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account)
-            return account
-        },
-        async getAccounts(managerId, options) {
-            const accounts = [
-                new IotaSdk.Wallet({
-                    ...options,
-                    id: `${managerId}-0`
-                })
-            ]
-            accounts.forEach((account) => bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account))
-            return accounts
+        // TODO(2.0): Rename this to getWallet and fix all usages
+        async getWallet(id, walletOptions) {
+            let wallet = wallets[id]
+            if (!wallet) {
+                wallet = new IotaSdk.Wallet(walletOptions)
+                wallets[id] = wallet
+                bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, wallet)
+            }
+            return wallet
         },
+        // TODO(2.0): remove this method from here and move to new profile
         async recoverAccounts(managerId, payload) {
             const manager = wallets[managerId]
             const accounts = await manager.recoverAccounts(...Object.values(payload))
             accounts.forEach((account) => bindMethodsAcrossContextBridge(IotaSdk.Account.prototype, account))
             return accounts
         },
+        clearWalletsFromMemory() {
+            Object.keys(wallets).forEach((id) => {
+                const wallet = wallets[id]
+                wallet.destroy()
+                delete wallets[id]
+            })
+        },
         async migrateStrongholdSnapshotV2ToV3(currentPath, newPath, currentPassword, newPassword) {
             const snapshotSaltV2 = 'wallet.rs'
             const snapshotRoundsV2 = 100
diff --git a/packages/desktop/views/dashboard/Dashboard.svelte b/packages/desktop/views/dashboard/Dashboard.svelte
index 2326b963d49..9eff7e36473 100644
--- a/packages/desktop/views/dashboard/Dashboard.svelte
+++ b/packages/desktop/views/dashboard/Dashboard.svelte
@@ -26,9 +26,9 @@
         interruptNftDownloadAfterTimeout,
         nftDownloadQueue,
         resetNftDownloadQueue,
-        selectedAccountNfts,
+        selectedWalletNfts,
     } from '@core/nfts'
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
     import { get } from 'svelte/store'
     import features from '@features/features'
     import { isAwareOfMetricSystemDrop } from '@contexts/dashboard/stores'
@@ -49,15 +49,15 @@
 
     $: $hasStrongholdLocked && reflectLockedStronghold()
     $: $nftDownloadQueue, downloadNextNftInQueue()
-    $: $downloadingNftId && interruptNftDownloadAfterTimeout(get(selectedAccountIndex))
-    $: addSelectedAccountNftsToDownloadQueue($selectedAccountIndex)
+    $: $downloadingNftId && interruptNftDownloadAfterTimeout(get(selectedWalletId))
+    $: addselectedWalletNftsToDownloadQueue($selectedWalletId)
 
     $: if (features.analytics.dashboardRoute.enabled && $dashboardRoute)
         Platform.trackEvent('dashboard-route', { route: $dashboardRoute })
 
-    function addSelectedAccountNftsToDownloadQueue(accountIndex: number): void {
+    function addselectedWalletNftsToDownloadQueue(accountIndex: number): void {
         resetNftDownloadQueue()
-        void addNftsToDownloadQueue(accountIndex, $selectedAccountNfts)
+        void addNftsToDownloadQueue(accountIndex, $selectedWalletNfts)
     }
 
     function handleDeepLinkRequest(data: string): void {
diff --git a/packages/desktop/views/dashboard/collectibles/Collectibles.svelte b/packages/desktop/views/dashboard/collectibles/Collectibles.svelte
index 7b8e1b0dbf5..ac2ff2bdbb9 100644
--- a/packages/desktop/views/dashboard/collectibles/Collectibles.svelte
+++ b/packages/desktop/views/dashboard/collectibles/Collectibles.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-    import { selectedAccountIndex } from '@core/account/stores'
+    import { selectedWalletId } from '@core/wallet/stores'
     import { collectiblesRoute, CollectiblesRoute, collectiblesRouter } from '@core/router'
     import { CollectiblesDetailsView, CollectiblesGalleryView } from './views'
 
-    $: $selectedAccountIndex !== undefined && $collectiblesRouter.reset()
+    $: $selectedWalletId !== undefined && $collectiblesRouter.reset()
 </script>
 
 <div class="w-full h-full flex flex-col flex-nowrap p-8 relative flex-1 bg-gray-50 dark:bg-gray-900">
diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
index 2fce86360fd..036581b12f8 100644
--- a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
+++ b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { openPopup, PopupId } from '@auxiliary/popup'
-    import { selectedAccountIndex } from '@core/account/stores'
+    import { selectedWalletId } from '@core/wallet/stores'
     import { time } from '@core/app'
     import { openUrlInBrowser } from '@core/app/utils'
     import { localize } from '@core/i18n'
@@ -8,7 +8,7 @@
     import {
         INft,
         NftDownloadMetadata,
-        allAccountNfts,
+        allWalletNfts,
         convertAndFormatNftMetadata,
         getNftByIdFromAllAccountNfts,
         selectedNftId,
@@ -43,7 +43,7 @@
     let modal: Modal
 
     const explorerUrl = getOfficialExplorerUrl($activeProfile?.network?.id)
-    const nft: INft = getNftByIdFromAllAccountNfts($selectedAccountIndex, $selectedNftId)
+    const nft: INft = getNftByIdFromAllAccountNfts($selectedWalletId, $selectedNftId)
 
     const { id, name, issuer, address, metadata, downloadMetadata, storageDeposit } = nft ?? {}
     const { standard, version, type, uri, description, issuerName, collectionName, attributes, soonaverseAttributes } =
@@ -63,7 +63,7 @@
     }
 
     $: formattedMetadata = convertAndFormatNftMetadata(metadata)
-    $: returnIfNftWasSent($allAccountNfts[$selectedAccountIndex], $time)
+    $: returnIfNftWasSent($allWalletNfts[$selectedWalletId], $time)
     $: timeDiff = getTimeDifference(new Date(nft.timelockTime), $time)
     $: alertText = getAlertText(downloadMetadata)
     $: detailsList = {
diff --git a/packages/desktop/views/dashboard/developer/Developer.svelte b/packages/desktop/views/dashboard/developer/Developer.svelte
index e349d9865b6..60497ddfbfd 100644
--- a/packages/desktop/views/dashboard/developer/Developer.svelte
+++ b/packages/desktop/views/dashboard/developer/Developer.svelte
@@ -11,15 +11,15 @@
 
     import features from '@features/features'
 
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
 </script>
 
-{#if $selectedAccount}
+{#if $selectedWallet}
     <div
         class="w-full h-full flex flex-nowrap p-8 relative flex-1 bg-gray-50 dark:bg-gray-900 justify-center items-start"
     >
-        {#key $selectedAccount?.index}
+        {#key $selectedWallet?.index}
             <div class="flex columns-3 gap-4 min-h-0 min-w-0 max-w-7xl">
                 <Pane>
                     <div class="flex flex-col space-y-6">
diff --git a/packages/desktop/views/dashboard/governance/Governance.svelte b/packages/desktop/views/dashboard/governance/Governance.svelte
index 0aae639c607..19478c6b6aa 100644
--- a/packages/desktop/views/dashboard/governance/Governance.svelte
+++ b/packages/desktop/views/dashboard/governance/Governance.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
     import { GovernanceDashboardView, ProposalDetailsView } from './views'
-    import { selectedAccount, selectedAccountIndex } from '@core/account/stores'
+    import { selectedWallet, selectedWalletId } from '@core/wallet/stores'
     import { GovernanceRoute, governanceRoute, governanceRouter } from '@core/router'
 
-    $: $selectedAccountIndex !== undefined && $governanceRouter.reset()
+    $: $selectedWalletId !== undefined && $governanceRouter.reset()
 </script>
 
-{#if $selectedAccount}
+{#if $selectedWallet}
     {#if $governanceRoute === GovernanceRoute.Proposals}
         <GovernanceDashboardView />
     {:else if $governanceRoute === GovernanceRoute.Details}
diff --git a/packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte b/packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte
index 267b3c05f9e..990067a9447 100644
--- a/packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte
+++ b/packages/desktop/views/dashboard/governance/views/GovernanceDashboardView.svelte
@@ -5,7 +5,7 @@
 
     import { localize } from '@core/i18n'
 
-    import { registeredProposalsForSelectedAccount } from '@contexts/governance/stores'
+    import { registeredProposalsForSelectedWallet } from '@contexts/governance/stores'
     import { IllustrationEnum } from '@auxiliary/illustration'
 </script>
 
@@ -20,7 +20,7 @@
     </div>
     <span class="block w-0.5 h-full bg-gray-200 dark:bg-gray-800" />
     <div class="w-2/3">
-        {#if Object.keys($registeredProposalsForSelectedAccount).length}
+        {#if Object.keys($registeredProposalsForSelectedWallet).length}
             <Proposals />
         {:else}
             <div class="w-full h-full flex flex-col items-center justify-center">
diff --git a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
index 1fea4648379..593d2bf64a5 100644
--- a/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
+++ b/packages/desktop/views/dashboard/governance/views/ProposalDetailsView.svelte
@@ -6,12 +6,12 @@
     import { Button, Height, KeyValueBox, MarkdownBlock, Pane, ProposalStatusPill, Text, TextHint, TextType } from '@ui'
     import { ProposalDetailsButton, ProposalInformationPane, ProposalQuestion } from '@components'
 
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
     import { networkStatus } from '@core/network/stores'
     import { getBestTimeDuration, milestoneToDate } from '@core/utils'
-    import { visibleSelectedAccountAssets } from '@core/wallet/stores'
+    import { visibleSelectedWalletAssets } from '@core/wallet/stores'
     import { formatTokenAmountBestMatch } from '@core/wallet/utils'
 
     import { getVotingEvent } from '@contexts/governance/actions'
@@ -23,7 +23,7 @@
     import { ProposalStatus } from '@contexts/governance/enums'
     import {
         clearSelectedParticipationEventStatus,
-        participationOverviewForSelectedAccount,
+        participationOverviewForSelectedWallet,
         selectedParticipationEventStatus,
         selectedProposal,
         updateParticipationOverviewForEventId,
@@ -38,7 +38,7 @@
     import { activeProfile } from '@core/profile'
     import { TextHintVariant } from 'shared/components/enums'
 
-    const { metadata } = $visibleSelectedAccountAssets?.[$activeProfile?.network?.id]?.baseCoin ?? {}
+    const { metadata } = $visibleSelectedWalletAssets?.[$activeProfile?.network?.id]?.baseCoin ?? {}
 
     let selectedAnswerValues: number[] = []
     let votedAnswerValues: number[] = []
@@ -54,7 +54,7 @@
     let isUpdatingVotedAnswerValues: boolean = false
     let lastAction: 'vote' | 'stopVote'
 
-    $: selectedProposalOverview = $participationOverviewForSelectedAccount?.participations?.[$selectedProposal?.id]
+    $: selectedProposalOverview = $participationOverviewForSelectedWallet?.participations?.[$selectedProposal?.id]
     $: trackedParticipations = Object.values(selectedProposalOverview ?? {})
     $: currentMilestone = $networkStatus.currentMilestone
 
@@ -77,7 +77,7 @@
     $: $selectedParticipationEventStatus, (textHintString = getTextHintString())
 
     $: hasGovernanceTransactionInProgress =
-        $selectedAccount?.hasVotingPowerTransactionInProgress || $selectedAccount?.hasVotingTransactionInProgress
+        $selectedWallet?.hasVotingPowerTransactionInProgress || $selectedWallet?.hasVotingTransactionInProgress
 
     $: areSelectedAndVotedAnswersEqual = JSON.stringify(selectedAnswerValues) === JSON.stringify(votedAnswerValues)
 
@@ -242,7 +242,7 @@
                     <li>
                         <KeyValueBox
                             keyText={localize('views.governance.details.yourVote.power')}
-                            valueText={formatTokenAmountBestMatch(parseInt($selectedAccount?.votingPower), metadata)}
+                            valueText={formatTokenAmountBestMatch(parseInt($selectedWallet?.votingPower), metadata)}
                         />
                     </li>
                 </ul>
diff --git a/packages/desktop/views/dashboard/settings/views/advanced/HiddenAccounts.svelte b/packages/desktop/views/dashboard/settings/views/advanced/HiddenAccounts.svelte
index 17a79c81388..867610774ae 100644
--- a/packages/desktop/views/dashboard/settings/views/advanced/HiddenAccounts.svelte
+++ b/packages/desktop/views/dashboard/settings/views/advanced/HiddenAccounts.svelte
@@ -2,13 +2,13 @@
     import { Checkbox, Text } from 'shared/components'
     import { localize } from '@core/i18n'
     import { activeProfile, updateActiveProfile } from '@core/profile'
-    import { setNextSelectedAccount } from '@core/account'
+    import { setNextSelectedWallet } from '@core/wallet/actions'
 
     let showHiddenAccounts = $activeProfile?.showHiddenAccounts
     $: updateActiveProfile({ showHiddenAccounts: showHiddenAccounts })
 
     $: if ($activeProfile?.hasLoadedAccounts && !showHiddenAccounts) {
-        setNextSelectedAccount()
+        setNextSelectedWallet()
     }
 </script>
 
diff --git a/packages/desktop/views/dashboard/settings/views/collectibles/MaxMediaSize.svelte b/packages/desktop/views/dashboard/settings/views/collectibles/MaxMediaSize.svelte
index be2471bde57..598204a6604 100644
--- a/packages/desktop/views/dashboard/settings/views/collectibles/MaxMediaSize.svelte
+++ b/packages/desktop/views/dashboard/settings/views/collectibles/MaxMediaSize.svelte
@@ -2,7 +2,7 @@
     import { Dropdown, Text } from '@ui'
     import { TextType } from '@ui/enums'
 
-    import { selectedAccountIndex } from '@core/account/stores'
+    import { selectedWalletId } from '@core/wallet/stores'
     import { Platform } from '@core/app'
     import { localize } from '@core/i18n'
     import {
@@ -10,7 +10,7 @@
         DownloadWarningType,
         INft,
         persistedNftForActiveProfile,
-        selectedAccountNfts,
+        selectedWalletNfts,
         updateNftInAllAccountNfts,
     } from '@core/nfts'
     import { activeProfile, updateActiveProfileSettings } from '@core/profile/stores'
@@ -41,7 +41,7 @@
         const nftsToDelete: INft[] = []
 
         Object.keys($persistedNftForActiveProfile ?? {}).forEach((nftId) => {
-            const nft = $selectedAccountNfts.find((nft) => nft.id === nftId)
+            const nft = $selectedWalletNfts.find((nft) => nft.id === nftId)
             if (!nft) {
                 return
             }
@@ -59,11 +59,11 @@
             }
         })
 
-        addNftsToDownloadQueue($selectedAccountIndex, nftsToDownload, true)
+        addNftsToDownloadQueue($selectedWalletId, nftsToDownload, true)
         await Promise.all(
             nftsToDelete.map(async (nft) => {
                 await Platform.deleteFile(nft.filePath)
-                updateNftInAllAccountNfts($selectedAccountIndex, nft.id, {
+                updateNftInAllAccountNfts($selectedWalletId, nft.id, {
                     downloadMetadata: { isLoaded: false, warning: { type: DownloadWarningType.TooLargeFile } },
                 })
             })
diff --git a/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte b/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte
index 6cefda4e9b1..ee796d54de0 100644
--- a/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte
+++ b/packages/desktop/views/dashboard/settings/views/collectibles/RefreshNftMedia.svelte
@@ -4,12 +4,12 @@
     import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
     import {
         addNftsToDownloadQueue,
-        selectedAccountNfts,
+        selectedWalletNfts,
         stopDownloadingNftMediaFromQueue,
         updateNftInAllAccountNfts,
     } from '@core/nfts'
     import { Platform } from '@core/app'
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
 
     let isLoading = false
 
@@ -32,14 +32,14 @@
         try {
             await stopDownloadingNftMediaFromQueue()
             await Promise.all(
-                $selectedAccountNfts.map(async (nft) => {
+                $selectedWalletNfts.map(async (nft) => {
                     await Platform.deleteFile(nft.filePath)
-                    updateNftInAllAccountNfts($selectedAccountIndex, nft.id, {
+                    updateNftInAllAccountNfts($selectedWalletId, nft.id, {
                         downloadMetadata: { isLoaded: false },
                     })
                 })
             )
-            addNftsToDownloadQueue($selectedAccountIndex, $selectedAccountNfts, true)
+            addNftsToDownloadQueue($selectedWalletId, $selectedWalletNfts, true)
         } finally {
             isLoading = false
         }
diff --git a/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte b/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte
index d6b9f59c751..9cd88f54eac 100644
--- a/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte
+++ b/packages/desktop/views/dashboard/settings/views/security/ChangePassword.svelte
@@ -11,10 +11,10 @@
     } from 'shared/components'
     import { localize } from '@core/i18n'
     import { MAX_STRONGHOLD_PASSWORD_LENGTH } from '@core/profile'
-    import { changePasswordAndUnlockStronghold } from '@core/profile-manager'
     import zxcvbn from 'zxcvbn'
     import { exportStronghold } from '@contexts/settings'
     import { PASSWORD_REASON_MAP } from '@core/stronghold'
+    import { changePasswordAndUnlockStronghold } from '@core/profile/actions'
 
     let exportStrongholdChecked: boolean
     let startOfPasswordChange: number
diff --git a/packages/desktop/views/dashboard/settings/views/security/StrongholdPasswordTimeout.svelte b/packages/desktop/views/dashboard/settings/views/security/StrongholdPasswordTimeout.svelte
index 4e682399e5e..39c7239a6f4 100644
--- a/packages/desktop/views/dashboard/settings/views/security/StrongholdPasswordTimeout.svelte
+++ b/packages/desktop/views/dashboard/settings/views/security/StrongholdPasswordTimeout.svelte
@@ -3,7 +3,7 @@
     import { localize } from '@core/i18n'
     import { activeProfile, DEFAULT_PERSISTED_PROFILE_OBJECT, updateActiveProfileSettings } from '@core/profile'
     import { IDropdownItem, SECONDS_PER_MINUTE } from '@core/utils'
-    import { setStrongholdPasswordClearInterval } from '@core/profile-manager'
+    import { setStrongholdPasswordClearInterval } from '@core/wallet/actions'
 
     function onStrongholdPasswordTimeoutChange(option: IDropdownItem<number>): void {
         const strongholdPasswordTimeoutInMinutes = option.value
diff --git a/packages/desktop/views/dashboard/vesting/Vesting.svelte b/packages/desktop/views/dashboard/vesting/Vesting.svelte
index c63bcdf71f8..269f1b9a5bd 100644
--- a/packages/desktop/views/dashboard/vesting/Vesting.svelte
+++ b/packages/desktop/views/dashboard/vesting/Vesting.svelte
@@ -7,12 +7,12 @@
         VestingOutputStatus,
         VestingType,
         calculateAsmbEquivalence,
-        selectedAccountVestingOutputs,
-        selectedAccountVestingOverview,
-        selectedAccountVestingPayouts,
-        selectedAccountVestingUnclaimedFunds,
+        selectedWalletVestingOutputs,
+        selectedWalletVestingOverview,
+        selectedWalletVestingPayouts,
+        selectedWalletVestingUnclaimedFunds,
     } from '@contexts/vesting'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { formatCurrency, localize } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
     import { activeProfile } from '@core/profile'
@@ -20,7 +20,7 @@
     import {
         formatTokenAmountBestMatch,
         getRequiredStorageDepositForMinimalBasicOutput,
-        selectedAccountAssets,
+        selectedWalletAssets,
     } from '@core/wallet'
     import {
         Button,
@@ -43,35 +43,35 @@
     let minRequiredStorageDeposit: number | null
     let hasOutputsToConsolidate = false
 
-    $: ({ baseCoin } = $selectedAccountAssets[$activeProfile?.network?.id])
+    $: ({ baseCoin } = $selectedWalletAssets[$activeProfile?.network?.id])
     $: hasTransactionInProgress =
-        $selectedAccount?.isTransferring || $selectedAccount.hasConsolidatingOutputsTransactionInProgress
-    $: $selectedAccount, areOutputsReadyForConsolidation()
+        $selectedWallet?.isTransferring || $selectedWallet.hasConsolidatingOutputsTransactionInProgress
+    $: $selectedWallet, areOutputsReadyForConsolidation()
     $: vestingOverview = [
         {
             title: localize('views.vesting.overview.unlocked'),
-            iotaAmount: $selectedAccountVestingOverview?.accumulatedPayout || 0,
+            iotaAmount: $selectedWalletVestingOverview?.accumulatedPayout || 0,
         },
         {
             title: localize('views.vesting.overview.locked'),
-            iotaAmount: $selectedAccountVestingOverview?.remainingPayout || 0,
+            iotaAmount: $selectedWalletVestingOverview?.remainingPayout || 0,
         },
         {
             title: localize('views.vesting.overview.total'),
-            iotaAmount: $selectedAccountVestingOverview?.totalRewards || 0,
+            iotaAmount: $selectedWalletVestingOverview?.totalRewards || 0,
             asmbAmount:
-                $selectedAccountVestingOverview?.totalRewards &&
-                $selectedAccountVestingOutputs.every((payout) => payout.type === VestingType.Staker)
-                    ? calculateAsmbEquivalence($selectedAccountVestingOverview?.totalRewards, baseCoin.metadata)
+                $selectedWalletVestingOverview?.totalRewards &&
+                $selectedWalletVestingOutputs.every((payout) => payout.type === VestingType.Staker)
+                    ? calculateAsmbEquivalence($selectedWalletVestingOverview?.totalRewards, baseCoin.metadata)
                     : undefined,
         },
     ]
-    $: $selectedAccountVestingPayouts, (timeUntilNextPayout = getTimeUntilNextPayout())
+    $: $selectedWalletVestingPayouts, (timeUntilNextPayout = getTimeUntilNextPayout())
     $: canCollect =
-        $selectedAccountVestingUnclaimedFunds > 0 &&
+        $selectedWalletVestingUnclaimedFunds > 0 &&
         !hasTransactionInProgress &&
         minRequiredStorageDeposit !== null &&
-        $selectedAccount?.balances?.baseCoin?.available > minRequiredStorageDeposit &&
+        $selectedWallet?.balances?.baseCoin?.available > minRequiredStorageDeposit &&
         hasOutputsToConsolidate
 
     onMount(() => {
@@ -79,7 +79,7 @@
     })
 
     function areOutputsReadyForConsolidation(): void {
-        $selectedAccount
+        $selectedWallet
             .prepareConsolidateOutputs({ force: false, outputThreshold: 2 })
             .then(() => (hasOutputsToConsolidate = true))
             .catch(() => (hasOutputsToConsolidate = false))
@@ -97,7 +97,7 @@
 
     function getTimeUntilNextPayout(): string {
         // Note: we can look at the time of the first output, since all outputs along the addresses are unlocked at the same time
-        const upcomingPayout: IVestingPayout = $selectedAccountVestingPayouts?.find(
+        const upcomingPayout: IVestingPayout = $selectedWalletVestingPayouts?.find(
             (payout) => payout.status === VestingOutputStatus.Locked
         )
         if (!upcomingPayout) {
@@ -113,12 +113,12 @@
     }
 </script>
 
-{#if $selectedAccount}
+{#if $selectedWallet}
     <vesting-container
         class="w-full h-full flex flex-nowrap p-8 relative flex-1 bg-gray-50 dark:bg-gray-900 space-x-4 justify-center"
     >
         <div class="flex space-x-4 max-w-7xl justify-center w-full">
-            {#key $selectedAccount?.index}
+            {#key $selectedWallet?.index}
                 <left-pane class="flex flex-col w-1/3">
                     <Pane height={Height.Full}>
                         <left-pane-content class="flex flex-col justify-between h-full">
@@ -199,7 +199,7 @@
                     <Pane height={Height.Full}>
                         <Text type={TextType.h5} classes="text-left">{localize('views.vesting.payouts.title')}</Text>
                         <div class="h-full flex justify-center items-center">
-                            <VestingSchedule payouts={$selectedAccountVestingPayouts} />
+                            <VestingSchedule payouts={$selectedWalletVestingPayouts} />
                         </div>
                     </Pane>
                 </right-pane>
diff --git a/packages/desktop/views/dashboard/wallet/Wallet.svelte b/packages/desktop/views/dashboard/wallet/Wallet.svelte
index 0a371662431..a2619435816 100644
--- a/packages/desktop/views/dashboard/wallet/Wallet.svelte
+++ b/packages/desktop/views/dashboard/wallet/Wallet.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
     import { AssetList, Overflow, Pane, ReceiveAddressButton } from '@ui'
     import { AccountSummary, AccountActivity, SendButton } from '@components'
-    import { selectedAccountAssets } from '@core/wallet'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWalletAssets } from '@core/wallet'
+    import { selectedWallet } from '@core/wallet/stores'
     import features from '@features/features'
 </script>
 
-{#if $selectedAccount}
+{#if $selectedWallet}
     <wallet-container
         class="w-full h-full flex flex-nowrap p-8 relative flex-1
         bg-gray-50 dark:bg-gray-900 justify-center items-center"
     >
-        {#key $selectedAccount?.index}
+        {#key $selectedWallet?.index}
             <div class="h-full grid grid-cols-3 gap-x-4 min-h-0 min-w-0 max-w-7xl">
                 <div class="flex flex-col space-y-4">
                     <Pane overflow={Overflow.Visible}>
@@ -30,7 +30,7 @@
                 </div>
                 <Pane>
                     {#if features?.wallet?.assets?.enabled}
-                        <AssetList assets={$selectedAccountAssets} />
+                        <AssetList assets={$selectedWalletAssets} />
                     {/if}
                 </Pane>
                 <Pane>
diff --git a/packages/desktop/views/login/views/SelectProfileView.svelte b/packages/desktop/views/login/views/SelectProfileView.svelte
index d2130ea056d..e37e90d2e12 100644
--- a/packages/desktop/views/login/views/SelectProfileView.svelte
+++ b/packages/desktop/views/login/views/SelectProfileView.svelte
@@ -8,8 +8,13 @@
         needsToAcceptLatestTermsOfService,
     } from '@core/app'
     import { localize } from '@core/i18n'
-    import { ProfileType, loadPersistedProfileIntoActiveProfile, profiles, removeProfileFolder } from '@core/profile'
-    import { destroyProfileManager } from '@core/profile-manager/actions'
+    import {
+        ProfileType,
+        clearProfileFromMemory,
+        loadPersistedProfileIntoActiveProfile,
+        profiles,
+        removeProfileFolder,
+    } from '@core/profile'
     import { loginRouter, routerManager } from '@core/router'
     import features from '@features/features'
     import { Icon, Logo, Profile } from '@ui'
@@ -41,7 +46,7 @@
         // Clean up if user has navigated back to this view from onboarding
         if ($onboardingProfile) {
             if ($onboardingProfile.hasInitialisedProfileManager) {
-                await destroyProfileManager()
+                await clearProfileFromMemory()
                 await removeProfileFolder($onboardingProfile.id)
             }
             $onboardingProfile = undefined
diff --git a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
index e71a61b97a9..4d1c983e7f3 100644
--- a/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
+++ b/packages/desktop/views/onboarding/views/complete-onboarding/views/FinishOnboardingView.svelte
@@ -12,12 +12,12 @@
     import { localize } from '@core/i18n'
     import { checkOrConnectLedger } from '@core/ledger'
     import { ProfileType } from '@core/profile'
-    import { setStrongholdPassword } from '@core/profile-manager'
     import { STRONGHOLD_VERSION } from '@core/stronghold'
     import { Animation, Button, Icon, Text, TextHint } from '@ui'
     import { TextHintVariant } from 'shared/components/enums'
     import { TextType } from '@ui/enums'
     import { onboardingRouter } from '@views/onboarding/onboarding-router'
+    import { setStrongholdPassword } from '@core/wallet/actions/setStrongholdPassword'
 
     function onContinueClick(): void {
         if ($isOnboardingLedgerProfile) {
diff --git a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
index da3c9189231..59964bd6fda 100644
--- a/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
+++ b/packages/desktop/views/onboarding/views/create-profile/views/ChooseCreateProfileFlowView.svelte
@@ -7,12 +7,11 @@
         updateOnboardingProfile,
     } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
-    import { ProfileType, removeProfileFolder } from '@core/profile'
+    import { ProfileType, clearProfileFromMemory, removeProfileFolder } from '@core/profile'
     import features from '@features/features'
     import { Animation, OnboardingButton, Text } from '@ui'
     import { onMount } from 'svelte'
     import { createProfileRouter } from '../create-profile-router'
-    import { destroyProfileManager } from '@core/profile-manager/actions'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { AnimationEnum } from '@auxiliary/animation'
 
@@ -40,7 +39,7 @@
     onMount(async () => {
         // Clean up if user has navigated back to this view
         if ($onboardingProfile.hasInitialisedProfileManager) {
-            await destroyProfileManager()
+            await clearProfileFromMemory()
             await removeProfileFolder($onboardingProfile.id)
         }
         updateOnboardingProfile({ type: undefined, createProfileType: undefined, hasInitialisedProfileManager: false })
diff --git a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
index a92f9772c53..7b3f36a0a9b 100644
--- a/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
+++ b/packages/desktop/views/onboarding/views/network-setup/views/CustomNetworkView.svelte
@@ -14,7 +14,7 @@
         getEnabledNetworkFromFeatureFlags,
         getNetworkIdFromNetworkName,
     } from '@core/network'
-    import { getNodeInfo } from '@core/profile-manager'
+    import { getNodeInfo } from '@core/wallet/actions'
     import { Animation, Button, HTMLButtonType, NodeConfigurationForm, Text, TextType } from '@ui'
     import { onMount } from 'svelte'
     import { networkSetupRouter } from '../network-setup-router'
diff --git a/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte b/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte
index de291337ab3..9710254c4b0 100644
--- a/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-from-stronghold/views/ImportStrongholdView.svelte
@@ -5,12 +5,12 @@
     import { CLIENT_ERROR_REGEXES } from '@core/error/constants'
     import { ClientError } from '@core/error/enums'
     import { localize } from '@core/i18n'
-    import { restoreBackup } from '@core/profile-manager/api'
     import { STRONGHOLD_VERSION } from '@core/stronghold/constants'
     import { StrongholdVersion } from '@core/stronghold/enums'
     import { Animation, Button, Dropzone, Text } from '@ui'
     import { onMount } from 'svelte'
     import { restoreFromStrongholdRouter } from '../../restore-from-stronghold/restore-from-stronghold-router'
+    import { restoreBackup } from '@core/wallet/actions'
 
     interface FileWithPath extends File {
         path?: string
diff --git a/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte b/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
index d1f29a7e3f2..01ac17563ee 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-profile/views/ChooseRestoreProfileFlowView.svelte
@@ -1,19 +1,13 @@
 <script lang="ts">
     import { OnboardingLayout } from '@components'
-    import {
-        RestoreProfileType,
-        initialiseProfileManagerFromOnboardingProfile,
-        onboardingProfile,
-        updateOnboardingProfile,
-    } from '@contexts/onboarding'
+    import { RestoreProfileType, onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import { getNetworkNameFromNetworkId } from '@core/network'
-    import { ProfileType, removeProfileFolder } from '@core/profile'
+    import { ProfileType, clearProfileFromMemory, removeProfileFolder } from '@core/profile'
     import features from '@features/features'
     import { Animation, OnboardingButton, Text } from '@ui'
     import { onMount } from 'svelte'
     import { restoreProfileRouter } from '../restore-profile-router'
-    import { destroyProfileManager } from '@core/profile-manager/actions'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { AnimationEnum } from '@auxiliary/animation'
 
@@ -31,6 +25,7 @@
         isBusy = { ...isBusy, [restoreProfileType]: true }
         const type = restoreProfileType === RestoreProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software
         updateOnboardingProfile({ type, restoreProfileType })
+        // TODO(2.0) This is gone
         await initialiseProfileManagerFromOnboardingProfile()
         $restoreProfileRouter.next()
     }
@@ -42,7 +37,7 @@
     onMount(async () => {
         // Clean up if user has navigated back to this view
         if ($onboardingProfile.hasInitialisedProfileManager) {
-            await destroyProfileManager()
+            await clearProfileFromMemory()
             await removeProfileFolder($onboardingProfile.id)
         }
         updateOnboardingProfile({ type: undefined, restoreProfileType: undefined, hasInitialisedProfileManager: false })
diff --git a/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte b/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte
index f9e88dd9c01..d9d4de43bc4 100644
--- a/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte
+++ b/packages/desktop/views/onboarding/views/restore-profile/views/ClaimFinderView.svelte
@@ -5,7 +5,7 @@
         ClaimShimmerRewardsError,
         FindShimmerRewardsError,
         RestoreProfileType,
-        ShimmerClaimingAccountState,
+        ShimmerClaimingWalletState,
         canUserClaimRewards,
         canUserRecoverFromShimmerClaiming,
         claimShimmerRewards,
@@ -31,11 +31,11 @@
         pollLedgerNanoStatus,
         stopPollingLedgerNanoStatus,
     } from '@core/ledger'
-    import { setStrongholdPassword, unsubscribeFromWalletApiEvents } from '@core/profile-manager'
     import { Animation, Button, ShimmerClaimingAccountTile, Text } from '@ui'
     import { onDestroy, onMount } from 'svelte'
     import { restoreProfileRouter } from '../restore-profile-router'
     import { AnimationEnum } from '@auxiliary/animation'
+    import { setStrongholdPassword, unsubscribeFromWalletApiEvents } from '@core/wallet/actions'
 
     $: shimmerClaimingAccounts = $onboardingProfile?.shimmerClaimingAccounts ?? []
 
@@ -46,7 +46,7 @@
     let hasTriedClaimingRewards = false
 
     $: isClaimingRewards = shimmerClaimingAccounts.some(
-        (shimmerClaimingAccount) => shimmerClaimingAccount.state === ShimmerClaimingAccountState.Claiming
+        (shimmerClaimingAccount) => shimmerClaimingAccount.state === ShimmerClaimingWalletState.Claiming
     )
 
     $: shouldSearchForRewardsButtonBeEnabled =
diff --git a/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte b/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
index 2cde6f9bfd5..53178a8c5f4 100644
--- a/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
+++ b/packages/desktop/views/onboarding/views/shared/EncryptMnemonicView.svelte
@@ -5,9 +5,9 @@
     import { updateOnboardingProfile, verifyAndStoreMnemonic } from '@contexts/onboarding'
     import { localize } from '@core/i18n'
     import { MAX_STRONGHOLD_PASSWORD_LENGTH } from '@core/profile'
-    import { setStrongholdPassword } from '@core/profile-manager'
     import { Subrouter } from '@core/router'
     import { PASSWORD_REASON_MAP } from '@core/stronghold'
+    import { setStrongholdPassword } from '@core/wallet/actions'
     import { Animation, Button, HTMLButtonType, PasswordInput, Text, TextType } from '@ui'
     import zxcvbn from 'zxcvbn'
 
diff --git a/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte b/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
index abdb32375ec..5580a7a71fe 100644
--- a/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
+++ b/packages/desktop/views/update-stronghold/views/ChangePasswordView.svelte
@@ -4,10 +4,6 @@
     import { handleError } from '@core/error/handlers'
     import { localize } from '@core/i18n'
     import { MAX_STRONGHOLD_PASSWORD_LENGTH, unlockStronghold } from '@core/profile'
-    import { initialiseProfileManager } from '@core/profile-manager/actions'
-    import { changeStrongholdPassword } from '@core/profile-manager/api'
-    import { profileManager } from '@core/profile-manager/stores'
-    import { buildProfileManagerOptionsFromProfileData } from '@core/profile-manager/utils'
     import { activeProfile, updateActiveProfile } from '@core/profile/stores'
     import { PASSWORD_REASON_MAP } from '@core/stronghold'
     import { Animation, Button, PasswordInput, Text, TextHint } from '@ui'
@@ -18,6 +14,7 @@
     import { TextHintVariant } from 'shared/components/enums'
     import { AnimationEnum } from '@auxiliary/animation'
     import { onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
+    import { changeStrongholdPassword } from '@core/secret-manager'
 
     export let oldPassword: string
     export let newPassword: string
@@ -100,10 +97,12 @@
     }
 
     onMount(async () => {
+        // TODO(2.0) Profile manager is gone
         if (!isRecovery && !$profileManager) {
             const profileManagerOptions = await buildProfileManagerOptionsFromProfileData($activeProfile)
             const { storagePath, coinType, clientOptions, secretManager } = profileManagerOptions
             updateActiveProfile({ clientOptions })
+            // TODO(2.0): Update initialiseProfileManager to new logic
             const manager = await initialiseProfileManager(
                 $activeProfile?.id,
                 storagePath,
diff --git a/packages/shared/components/ActivityInformation.svelte b/packages/shared/components/ActivityInformation.svelte
index 29d0df0097c..c79db14e117 100644
--- a/packages/shared/components/ActivityInformation.svelte
+++ b/packages/shared/components/ActivityInformation.svelte
@@ -14,7 +14,7 @@
     import { Tab } from 'shared/components/enums'
     import { ActivityType, Activity } from '@core/wallet'
     import { getNftByIdFromAllAccountNfts } from '@core/nfts'
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
 
     export let activity: Activity
     export let activeTab: Tab = Tab.Transaction
@@ -23,7 +23,7 @@
     $: {
         const storedNft =
             activity?.type === ActivityType.Nft
-                ? getNftByIdFromAllAccountNfts($selectedAccountIndex, activity?.nftId)
+                ? getNftByIdFromAllAccountNfts($selectedWalletId, activity?.nftId)
                 : undefined
         hasMetadata = !!storedNft?.metadata
     }
diff --git a/packages/shared/components/AssetIcon.svelte b/packages/shared/components/AssetIcon.svelte
index 8def780886f..a8947138ae4 100644
--- a/packages/shared/components/AssetIcon.svelte
+++ b/packages/shared/components/AssetIcon.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { AnimationRenderer } from '@auxiliary/animation'
     import { Icon as IconEnum, NETWORK_ICON_SVG } from '@auxiliary/icon'
-    import { getIconColorFromString } from '@core/account'
+    import { getIconColorFromString } from '@core/wallet/utils'
     import { COIN_TYPE, NetworkId } from '@core/network'
     import { isBright } from '@core/utils'
     import { ANIMATED_TOKEN_IDS, getAssetInitials, IPersistedAsset, TokenStandard } from '@core/wallet'
diff --git a/packages/shared/components/BalanceSummarySection.svelte b/packages/shared/components/BalanceSummarySection.svelte
index 169962b4432..cf404987b90 100644
--- a/packages/shared/components/BalanceSummarySection.svelte
+++ b/packages/shared/components/BalanceSummarySection.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { formatCurrency, localize } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
-    import { formatTokenAmountBestMatch, selectedAccountAssets } from '@core/wallet'
+    import { formatTokenAmountBestMatch, selectedWalletAssets } from '@core/wallet'
     import { BalanceSummaryRow, Icon } from 'shared/components'
     import { Icon as IconEnum } from '@auxiliary/icon'
     import { activeProfile } from '@core/profile'
@@ -15,7 +15,7 @@
     let expanded: boolean = false
 
     $: hasChildren = !!Object.keys(subBreakdown ?? {}).length
-    $: ({ baseCoin } = $selectedAccountAssets?.[$activeProfile?.network?.id] ?? {})
+    $: ({ baseCoin } = $selectedWalletAssets?.[$activeProfile?.network?.id] ?? {})
 
     function getAmount(amount: number): string {
         return baseCoin?.metadata ? formatTokenAmountBestMatch(amount, baseCoin?.metadata) : ''
diff --git a/packages/shared/components/ColorPicker.svelte b/packages/shared/components/ColorPicker.svelte
index a80288c1d77..b90a489ff6b 100644
--- a/packages/shared/components/ColorPicker.svelte
+++ b/packages/shared/components/ColorPicker.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Text, Icon, Tooltip, TextType, Position } from 'shared/components'
-    import { AccountColors } from '@core/account'
+    import { WalletColors } from '@core/wallet/enums'
     import { localize } from '@core/i18n'
     import { clickOutside, isBright, convertHexToRgba } from '@core/utils'
     import { Icon as IconEnum } from '@auxiliary/icon'
@@ -9,7 +9,7 @@
     export let active: string = ''
     export let isCustomColorEnabled: boolean = false
 
-    const accountColors = Object.values(AccountColors).filter((c) => /[#]/.test(c as string))
+    const accountColors = Object.values(WalletColors).filter((c) => /[#]/.test(c as string))
     const activeAccountColorIndex = accountColors.findIndex((_, i) => accountColors[i] === active)
 
     let indexOfActiveElement = activeAccountColorIndex >= 0 ? activeAccountColorIndex : accountColors.length
@@ -72,11 +72,11 @@
         }
     }
 
-    function getAccountColors(): string[] {
-        return Object.keys(AccountColors)
+    function getWalletColors(): string[] {
+        return Object.keys(WalletColors)
             .filter((key) => key.startsWith('#'))
             .map((key) => {
-                const color = AccountColors[key as keyof typeof AccountColors].toString().toLowerCase()
+                const color = WalletColors[key as keyof typeof WalletColors].toString().toLowerCase()
                 return `bg-${color}-500 hover:bg-${color}-600`
             })
     }
@@ -92,7 +92,7 @@
         </title-container>
     {/if}
     <ul class="flex flex-row flex-wrap gap-3.5">
-        {#each getAccountColors() as color, i}
+        {#each getWalletColors() as color, i}
             <button
                 on:click={() => onColorClick(i)}
                 on:keypress={(event) => onKeyPress(event, i)}
diff --git a/packages/shared/components/NftActivityDetails.svelte b/packages/shared/components/NftActivityDetails.svelte
index 5920266e312..f882232dff3 100644
--- a/packages/shared/components/NftActivityDetails.svelte
+++ b/packages/shared/components/NftActivityDetails.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { closePopup } from '@auxiliary/popup'
-    import { selectedAccountIndex } from '@core/account/stores'
+    import { selectedWalletId } from '@core/wallet/stores'
     import { time } from '@core/app'
     import { localize } from '@core/i18n'
     import { getNftByIdFromAllAccountNfts, ownedNfts, selectedNftId } from '@core/nfts'
@@ -22,7 +22,7 @@
 
     export let activity: NftActivity
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity.nftId)
     $: nftIsOwned = $ownedNfts.some((nft) => nft.id === activity.nftId)
     $: isTimelocked = activity?.asyncData?.timelockDate > $time
     $: subject = getSubjectFromActivity(activity)
diff --git a/packages/shared/components/NodeConfigurationForm.svelte b/packages/shared/components/NodeConfigurationForm.svelte
index bf7da68c54d..a9f0dd1b20e 100644
--- a/packages/shared/components/NodeConfigurationForm.svelte
+++ b/packages/shared/components/NodeConfigurationForm.svelte
@@ -1,15 +1,16 @@
 <script lang="ts">
     import { localize } from '@core/i18n'
-    import { IAuth, NetworkId } from '@core/network'
+    import { NetworkId } from '@core/network'
     import { EMPTY_NODE } from '@core/network/constants'
-    import { IClientOptions, INode, INodeInfoResponse } from '@core/network/interfaces'
+    import { INode, INodeInfoResponse } from '@core/network/interfaces'
     import { nodeInfo } from '@core/network/stores'
     import { checkNetworkId, checkNodeUrlValidity, getNetworkNameFromNetworkId } from '@core/network/utils'
     import { activeProfile } from '@core/profile'
-    import { getNodeInfo } from '@core/profile-manager'
     import { IDropdownItem, cleanUrl } from '@core/utils'
     import features from '@features/features'
     import { Dropdown, Error, NumberInput, PasswordInput, TextInput } from 'shared/components'
+    import { getNodeInfo } from '@core/wallet/actions'
+    import { IAuth, IClientOptions } from '@iota/sdk/out/types'
     interface INodeValidationOptions {
         checkNodeInfo: boolean
         checkSameNetwork: boolean
diff --git a/packages/shared/components/ProfilePicture.svelte b/packages/shared/components/ProfilePicture.svelte
index bf2e0b94d84..719e7dc548f 100644
--- a/packages/shared/components/ProfilePicture.svelte
+++ b/packages/shared/components/ProfilePicture.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { getIconColorFromString } from '@core/account/utils'
+    import { getIconColorFromString } from '@core/wallet/utils'
     import { IPersistedProfile } from '@core/profile'
     import { getInitials } from '@core/utils'
     import { NftMedia, Text, FontWeight, Size } from '@ui'
diff --git a/packages/shared/components/activity-info/NftActivityInformation.svelte b/packages/shared/components/activity-info/NftActivityInformation.svelte
index 23d0f7c7bda..44f7aab14a3 100644
--- a/packages/shared/components/activity-info/NftActivityInformation.svelte
+++ b/packages/shared/components/activity-info/NftActivityInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { getNftByIdFromAllAccountNfts } from '@core/nfts'
     import { IKeyValueBoxList } from '@core/utils'
@@ -15,7 +15,7 @@
 
     export let activity: NftActivity
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity.nftId)
     $: issuerAddress = nft?.issuer && getBech32AddressFromAddressTypes(nft.issuer)
     $: collectionId = nft?.issuer && getHexAddressFromAddressTypes(nft.issuer)
 
diff --git a/packages/shared/components/activity-info/NftMetadataInformation.svelte b/packages/shared/components/activity-info/NftMetadataInformation.svelte
index 8b342dcad86..e62115005b2 100644
--- a/packages/shared/components/activity-info/NftMetadataInformation.svelte
+++ b/packages/shared/components/activity-info/NftMetadataInformation.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { convertAndFormatNftMetadata, getNftByIdFromAllAccountNfts, IIrc27Metadata } from '@core/nfts'
     import { NftActivity } from '@core/wallet'
@@ -18,7 +18,7 @@
         }
     }
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity?.nftId)
+    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity?.nftId)
     $: nftMetadataDetailsList = nft?.parsedMetadata
         ? createIrc27NftMetadataDetailsList(nft?.parsedMetadata)
         : createNftMetadataDetailsList(nft?.metadata)
diff --git a/packages/shared/components/buttons/ReceiveAddressButton.svelte b/packages/shared/components/buttons/ReceiveAddressButton.svelte
index 70cf87b922d..253faab0e81 100644
--- a/packages/shared/components/buttons/ReceiveAddressButton.svelte
+++ b/packages/shared/components/buttons/ReceiveAddressButton.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import { selectedAccount } from '@core/account'
+    import { selectedWallet } from '@core/wallet'
     import { appSettings } from '@core/app'
     import { localize } from '@core/i18n'
     import { QR, Text, FontWeight, AddressBox } from 'shared/components'
 
     let addressBoxElement: AddressBox
 
-    $: receiveAddress = $selectedAccount.depositAddress
+    $: receiveAddress = $selectedWallet.depositAddress
     $: darkModeEnabled = $appSettings.darkMode
 
     function onReceiveClick(): void {
diff --git a/packages/shared/components/filter-items/AssetFilterItem.svelte b/packages/shared/components/filter-items/AssetFilterItem.svelte
index 4197c09eeba..f0d4dd54c76 100644
--- a/packages/shared/components/filter-items/AssetFilterItem.svelte
+++ b/packages/shared/components/filter-items/AssetFilterItem.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
     import { Dropdown } from 'shared/components'
     import type { IDropdownItem } from '@core/utils'
-    import { visibleSelectedAccountAssets } from '@core/wallet'
+    import { visibleSelectedWalletAssets } from '@core/wallet'
     import { AssetFilterUnit } from '@core/utils/interfaces/filter'
     import { activeProfile } from '@core/profile'
 
     export let filterUnit: AssetFilterUnit
-    const { baseCoin, nativeTokens } = $visibleSelectedAccountAssets[$activeProfile?.network?.id]
+    const { baseCoin, nativeTokens } = $visibleSelectedWalletAssets[$activeProfile?.network?.id]
 
     const choices: IDropdownItem<string>[] = [baseCoin, ...nativeTokens].map((choice) => ({
         label: choice.metadata.name,
diff --git a/packages/shared/components/inputs/AccountSelector.svelte b/packages/shared/components/inputs/AccountSelector.svelte
deleted file mode 100644
index 8f3a6142cdb..00000000000
--- a/packages/shared/components/inputs/AccountSelector.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script lang="ts">
-    import { Modal, AccountLabel, Text, TextType } from 'shared/components'
-    import { IAccountState, selectedAccount } from '@core/account'
-    import { fade } from 'svelte/transition'
-    import { visibleActiveAccounts, getBaseToken } from '@core/profile'
-    import { formatTokenAmountBestMatch } from '@core/wallet'
-
-    export let hideSelectedAccount: boolean = false
-    export let account: IAccountState | undefined = $selectedAccount
-
-    let modal: Modal | undefined
-
-    $: accounts = $visibleActiveAccounts?.filter(
-        (account) => account.index !== $selectedAccount?.index || !hideSelectedAccount
-    )
-
-    function getSuffixForAccount(account: IAccountState): string {
-        return formatTokenAmountBestMatch(Number(account.balances.baseCoin.available), getBaseToken())
-    }
-
-    function onClick(_selected: IAccountState): void {
-        modal?.close()
-        account = _selected
-    }
-
-    function handleFilteredAccountClick(account: IAccountState): () => void {
-        return () => onClick(account)
-    }
-</script>
-
-<account-input class="w-full h-full relative">
-    <button
-        on:click={modal?.open}
-        class="w-full flex flex-row flex-1 justify-between px-4 py-3 rounded-lg border border-solid border-gray-300 dark:border-gray-700 hover:border-gray-500 dark:hover:border-gray-700 focus:border-blue-500 dark:focus:border-gray-600"
-    >
-        <AccountLabel {account} />
-    </button>
-
-    {#if accounts?.length > 0}
-        <Modal bind:this={modal} position={{ left: '0', top: '100%' }} classes="w-full p-4">
-            <recipient-account-picker-modal
-                class="max-h-64 flex flex-col space-y-1 scrollable-y"
-                in:fade={{ duration: 100 }}
-            >
-                {#each accounts as account}
-                    {@const handleOnClick = handleFilteredAccountClick(account)}
-                    <button
-                        on:click={handleOnClick}
-                        class="w-full flex flex-row flex-1 justify-between px-2 py-3 rounded-lg hover:bg-blue-50 dark:hover:bg-gray-800 dark:hover:bg-opacity-20"
-                    >
-                        <AccountLabel {account} />
-                        <Text type={TextType.pre} fontSize="sm" color="gray-600">{getSuffixForAccount(account)}</Text>
-                    </button>
-                {/each}
-            </recipient-account-picker-modal>
-        </Modal>
-    {/if}
-</account-input>
diff --git a/packages/shared/components/inputs/AliasInput.svelte b/packages/shared/components/inputs/AliasInput.svelte
index 0a4413888d7..8f52ebc60a5 100644
--- a/packages/shared/components/inputs/AliasInput.svelte
+++ b/packages/shared/components/inputs/AliasInput.svelte
@@ -1,11 +1,13 @@
 <script lang="ts">
     import { Modal, SelectorInput, IOption } from 'shared/components'
-    import { selectedAccount } from '@core/account/stores'
+    import { selectedWallet } from '@core/wallet/stores'
     import { localize } from '@core/i18n'
     import { validateBech32Address } from '@core/utils/crypto'
     import { ADDRESS_TYPE_ALIAS } from '@core/wallet/constants'
     import { getNetworkHrp } from '@core/profile/actions'
-    import { api } from '@core/profile-manager'
+    import { api } from '@core/api'
+
+    // TODO(2.0) Alias are gone.
 
     export let alias: string = ''
     export let error: string = ''
@@ -14,8 +16,8 @@
     let modal: Modal = undefined
 
     const aliasOptions: IOption[] =
-        $selectedAccount.balances?.aliases.map((hexAliasId, index) => {
-            const aliasId = api.aliasIdToBech32(hexAliasId, getNetworkHrp())
+        $selectedWallet.balances?.aliases.map((hexAliasId, index) => {
+            const aliasId = api.accountIdToBech32(hexAliasId, getNetworkHrp())
             return { key: 'Alias ' + (index + 1), value: aliasId }
         }) ?? []
 
diff --git a/packages/shared/components/inputs/AssetAmountInput.svelte b/packages/shared/components/inputs/AssetAmountInput.svelte
index 102377f86fc..7ecdec046d9 100644
--- a/packages/shared/components/inputs/AssetAmountInput.svelte
+++ b/packages/shared/components/inputs/AssetAmountInput.svelte
@@ -10,7 +10,7 @@
         formatTokenAmountDefault,
         getRequiredStorageDepositForMinimalBasicOutput,
         getUnitFromTokenMetadata,
-        visibleSelectedAccountAssets,
+        visibleSelectedWalletAssets,
     } from '@core/wallet'
     import Big from 'big.js'
     import { AmountInput, AssetDropdown, InputContainer, SliderInput, Text, TooltipIcon } from 'shared/components'
@@ -21,7 +21,7 @@
     export let disabled = false
     export let isFocused = false
     export let votingPower: number = 0
-    export let asset: IAsset = $visibleSelectedAccountAssets?.[$activeProfile?.network?.id]?.baseCoin
+    export let asset: IAsset = $visibleSelectedWalletAssets?.[$activeProfile?.network?.id]?.baseCoin
     export let rawAmount: string = undefined
     export let unit: string = undefined
     export let containsSlider: boolean = false
diff --git a/packages/shared/components/inputs/AssetDropdown.svelte b/packages/shared/components/inputs/AssetDropdown.svelte
index 0fb77a4d852..a11ce9bc50f 100644
--- a/packages/shared/components/inputs/AssetDropdown.svelte
+++ b/packages/shared/components/inputs/AssetDropdown.svelte
@@ -1,22 +1,22 @@
 <script lang="ts">
-    import { IAsset, visibleSelectedAccountAssets } from '@core/wallet'
+    import { IAsset, visibleSelectedWalletAssets } from '@core/wallet'
     import { AssetTile, Icon, Text, AssetIcon, FontWeight, AssetIconSize } from 'shared/components'
     import { clickOutside } from '@core/utils'
     import { activeProfile } from '@core/profile'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
-    export let asset = $visibleSelectedAccountAssets?.[$activeProfile?.network?.id]?.baseCoin
+    export let asset = $visibleSelectedWalletAssets?.[$activeProfile?.network?.id]?.baseCoin
     export let readonly: boolean = false
 
     let isDropdownOpen = false
     let assetList: IAsset[] = []
 
-    $: isReadonly = readonly || $visibleSelectedAccountAssets?.[$activeProfile?.network?.id]?.nativeTokens.length === 0
-    $: $visibleSelectedAccountAssets, (assetList = getAssetList())
+    $: isReadonly = readonly || $visibleSelectedWalletAssets?.[$activeProfile?.network?.id]?.nativeTokens.length === 0
+    $: $visibleSelectedWalletAssets, (assetList = getAssetList())
 
     function getAssetList(): IAsset[] {
         const list = []
-        for (const assetsPernetwork of Object.values($visibleSelectedAccountAssets)) {
+        for (const assetsPernetwork of Object.values($visibleSelectedWalletAssets)) {
             if (assetsPernetwork?.baseCoin) {
                 list.push(assetsPernetwork.baseCoin)
             }
diff --git a/packages/shared/components/inputs/ImportTextfield.svelte b/packages/shared/components/inputs/ImportTextfield.svelte
index 8651e51503d..3edaa2ab856 100644
--- a/packages/shared/components/inputs/ImportTextfield.svelte
+++ b/packages/shared/components/inputs/ImportTextfield.svelte
@@ -2,9 +2,9 @@
     import { Text } from 'shared/components'
     import { english } from '@auxiliary/wordlists'
     import { localize } from '@core/i18n'
-    import { verifyMnemonic } from '@core/profile-manager'
     import { debounce } from '@core/utils'
     import { Mnemonic } from '@contexts/onboarding'
+    import { verifyMnemonic } from '@core/secret-manager/utils'
 
     enum Type {
         Seed = 'seed',
diff --git a/packages/shared/components/inputs/NftInput.svelte b/packages/shared/components/inputs/NftInput.svelte
index e426db7a639..066be8c650a 100644
--- a/packages/shared/components/inputs/NftInput.svelte
+++ b/packages/shared/components/inputs/NftInput.svelte
@@ -2,7 +2,7 @@
     import { Modal, SelectorInput, IOption, NftImageOrIconBox, NftSize } from 'shared/components'
     import { ownedNfts } from '@core/nfts'
     import { getNftByIdFromAllAccountNfts } from '@core/nfts'
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { time } from '@core/app'
 
@@ -12,7 +12,7 @@
 
     let inputElement: HTMLInputElement | undefined = undefined
     let modal: Modal = undefined
-    const selectedNft = getNftByIdFromAllAccountNfts($selectedAccountIndex, nftId)
+    const selectedNft = getNftByIdFromAllAccountNfts($selectedWalletId, nftId)
     let selected: IOption | undefined = selectedNft
         ? { key: selectedNft.name, value: selectedNft.id }
         : { value: nftId }
@@ -54,7 +54,7 @@
     let:option
 >
     <NftImageOrIconBox
-        nft={getNftByIdFromAllAccountNfts($selectedAccountIndex, String(option?.value))}
+        nft={getNftByIdFromAllAccountNfts($selectedWalletId, String(option?.value))}
         size={NftSize.Small}
     />
 </SelectorInput>
diff --git a/packages/shared/components/inputs/RecipientInput.svelte b/packages/shared/components/inputs/RecipientInput.svelte
index e39d94c7d9d..80498e5143c 100644
--- a/packages/shared/components/inputs/RecipientInput.svelte
+++ b/packages/shared/components/inputs/RecipientInput.svelte
@@ -1,14 +1,12 @@
 <script lang="ts">
     import { Modal, SelectorInput, IOption, ColoredCircle } from 'shared/components'
-    import { selectedAccountIndex } from '@core/account/stores'
-    import { getAccountColorById } from '@core/account/utils'
     import { localize } from '@core/i18n'
-    import { visibleActiveAccounts } from '@core/profile/stores'
     import { validateBech32Address, validateEthereumAddress } from '@core/utils/crypto'
     import { Subject } from '@core/wallet/types'
     import { getSubjectFromAddress } from '@core/wallet/utils'
     import { Layer1RecipientError } from '@core/layer-2/errors'
-    import { getNetworkHrp } from '@core/profile'
+    import { getNetworkHrp, getWalletColorById, visibleActiveWallets } from '@core/profile'
+    import { selectedWalletId } from '@core/wallet/stores'
 
     export let recipient: Subject
     export let disabled = false
@@ -47,7 +45,7 @@
                 throw new Error(localize('error.send.recipientRequired'))
             }
 
-            Promise.resolve()
+            return Promise.resolve()
         } catch (err) {
             error = err?.message ?? err
             return Promise.reject(error)
@@ -55,12 +53,12 @@
     }
 
     function getLayer1AccountOptions(): IOption[] {
-        return $visibleActiveAccounts
-            .filter((account) => account.index !== $selectedAccountIndex)
-            .map((account) => ({
-                id: account.index,
-                key: account.name,
-                value: account.depositAddress,
+        return $visibleActiveWallets
+            .filter((wallet) => wallet.id !== $selectedWalletId)
+            .map((wallet) => ({
+                id: wallet.id,
+                key: wallet.name,
+                value: wallet.depositAddress,
             }))
     }
 </script>
@@ -78,6 +76,6 @@
     let:option
 >
     {#if option?.id}
-        <ColoredCircle color={getAccountColorById(option?.id)} />
+        <ColoredCircle color={getWalletColorById(option?.id)} />
     {/if}
 </SelectorInput>
diff --git a/packages/shared/components/inputs/TokenAmountInput.svelte b/packages/shared/components/inputs/TokenAmountInput.svelte
index d5374a6f048..3aab71beae2 100644
--- a/packages/shared/components/inputs/TokenAmountInput.svelte
+++ b/packages/shared/components/inputs/TokenAmountInput.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import { formatCurrency, getDecimalSeparator } from '@core/i18n'
     import { getMaxDecimalsFromTokenMetadata } from '@core/token/utils'
-    import { IAsset, convertToRawAmount, formatTokenAmountDefault, visibleSelectedAccountAssets } from '@core/wallet'
+    import { IAsset, convertToRawAmount, formatTokenAmountDefault, visibleSelectedWalletAssets } from '@core/wallet'
     import { AmountInput, FontWeight, InputContainer, Text } from '@ui'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
     import { validateTokenAmount } from '@core/wallet/utils/validateTokenAmount'
     import { activeProfile } from '@core/profile'
     import { getBaseToken } from '@core/profile'
 
-    export let asset: IAsset | undefined = $visibleSelectedAccountAssets?.[$activeProfile?.network?.id]?.baseCoin
+    export let asset: IAsset | undefined = $visibleSelectedWalletAssets?.[$activeProfile?.network?.id]?.baseCoin
     export let rawAmount: string | undefined = undefined
     export let unit: string | undefined = undefined
     export let availableBalance: number
diff --git a/packages/shared/components/inputs/WalletSelector.svelte b/packages/shared/components/inputs/WalletSelector.svelte
new file mode 100644
index 00000000000..044725171d6
--- /dev/null
+++ b/packages/shared/components/inputs/WalletSelector.svelte
@@ -0,0 +1,57 @@
+<script lang="ts">
+    import { Modal, WalletLabel, Text, TextType } from 'shared/components'
+    import { fade } from 'svelte/transition'
+    import { visibleActiveWallets, getBaseToken } from '@core/profile'
+    import { IWalletState, formatTokenAmountBestMatch, selectedWallet } from '@core/wallet'
+
+    export let hideSelectedWallet: boolean = false
+    export let wallet: IWalletState | undefined = $selectedWallet
+
+    let modal: Modal | undefined
+
+    $: wallets = $visibleActiveWallets?.filter(
+        (wallet) => wallet.id !== $selectedWallet?.id || !hideSelectedWallet
+    )
+
+    function getSuffixForWallet(wallet: IWalletState): string {
+        return formatTokenAmountBestMatch(Number(wallet.balances.baseCoin.available), getBaseToken())
+    }
+
+    function onClick(_selected: IWalletState): void {
+        modal?.close()
+        wallet = _selected
+    }
+
+    function handleFilteredAccountClick(wallet: IWalletState): () => void {
+        return () => onClick(wallet)
+    }
+</script>
+
+<wallet-input class="w-full h-full relative">
+    <button
+        on:click={modal?.open}
+        class="w-full flex flex-row flex-1 justify-between px-4 py-3 rounded-lg border border-solid border-gray-300 dark:border-gray-700 hover:border-gray-500 dark:hover:border-gray-700 focus:border-blue-500 dark:focus:border-gray-600"
+    >
+        <WalletLabel {wallet} />
+    </button>
+
+    {#if wallets?.length > 0}
+        <Modal bind:this={modal} position={{ left: '0', top: '100%' }} classes="w-full p-4">
+            <recipient-wallet-picker-modal
+                class="max-h-64 flex flex-col space-y-1 scrollable-y"
+                in:fade={{ duration: 100 }}
+            >
+                {#each wallets as wallet}
+                    {@const handleOnClick = handleFilteredAccountClick(wallet)}
+                    <button
+                        on:click={handleOnClick}
+                        class="w-full flex flex-row flex-1 justify-between px-2 py-3 rounded-lg hover:bg-blue-50 dark:hover:bg-gray-800 dark:hover:bg-opacity-20"
+                    >
+                        <WalletLabel {wallet} />
+                        <Text type={TextType.pre} fontSize="sm" color="gray-600">{getSuffixForWallet(wallet)}</Text>
+                    </button>
+                {/each}
+            </recipient-wallet-picker-modal>
+        </Modal>
+    {/if}
+</wallet-input>
diff --git a/packages/shared/components/inputs/index.js b/packages/shared/components/inputs/index.js
index 185a2dc2f6a..d325ffc9afc 100644
--- a/packages/shared/components/inputs/index.js
+++ b/packages/shared/components/inputs/index.js
@@ -1,4 +1,4 @@
-export { default as AccountSelector } from './AccountSelector.svelte'
+export { default as WalletSelector } from './WalletSelector.svelte'
 export { default as AliasInput } from './AliasInput.svelte'
 export { default as AmountInput } from './AmountInput.svelte'
 export { default as AssetAmountInput } from './AssetAmountInput.svelte'
diff --git a/packages/shared/components/interfaces/option.interface.ts b/packages/shared/components/interfaces/option.interface.ts
index 2a70cbecfe6..e1a80035486 100644
--- a/packages/shared/components/interfaces/option.interface.ts
+++ b/packages/shared/components/interfaces/option.interface.ts
@@ -1,5 +1,5 @@
 export interface IOption {
-    id?: number
+    id?: string
     key?: string
     value?: string
 }
diff --git a/packages/shared/components/labels/AccountLabel.svelte b/packages/shared/components/labels/WalletLabel.svelte
similarity index 65%
rename from packages/shared/components/labels/AccountLabel.svelte
rename to packages/shared/components/labels/WalletLabel.svelte
index 9e399d1be20..4502e213b93 100644
--- a/packages/shared/components/labels/AccountLabel.svelte
+++ b/packages/shared/components/labels/WalletLabel.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-    import { IAccountState } from '@core/account'
     import { Text, FontWeight, ColoredCircle } from 'shared/components/'
+    import { IWalletState } from '@core/wallet'
 
-    export let account: IAccountState
+    export let wallet: IWalletState
     export let selected = true
 </script>
 
 <div class="flex flex-row items-center space-x-3">
-    <ColoredCircle color={account?.color} />
+    <ColoredCircle color={wallet?.color} />
     <Text fontSize="14" fontWeight={FontWeight.semibold} classes={selected ? '' : 'opacity-50'}>
-        {account?.name}
+        {wallet?.name}
     </Text>
 </div>
diff --git a/packages/shared/components/labels/index.js b/packages/shared/components/labels/index.js
index 513edf0f7e1..b16354e0b41 100644
--- a/packages/shared/components/labels/index.js
+++ b/packages/shared/components/labels/index.js
@@ -1,2 +1,2 @@
-export { default as AccountLabel } from './AccountLabel'
+export { default as WalletLabel } from './WalletLabel'
 export { default as TogglableAssetBalanceLabel } from './TogglableAssetBalanceLabel'
diff --git a/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte b/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
index 470196e0bba..029dfc8f95d 100644
--- a/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
+++ b/packages/shared/components/menu-items/ToggleHiddenAccountMenuItem.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-    import { selectedAccount, setNextSelectedAccount } from '@core/account'
+    import { selectedWallet, setNextSelectedWallet } from '@core/wallet'
     import { localize } from '@core/i18n'
-    import { activeProfile, nonHiddenActiveAccounts } from '@core/profile'
+    import { activeProfile, nonHiddenActiveWallets } from '@core/profile'
     import { updateActiveAccountPersistedData } from '@core/profile/actions'
     import { Icon } from '@lib/auxiliary/icon'
     import { MenuItem } from '@ui'
@@ -9,33 +9,33 @@
     export let onClick: () => unknown
 
     function onShowAccountClick(): void {
-        if ($selectedAccount) {
-            updateActiveAccountPersistedData($selectedAccount.index, { hidden: false })
+        if ($selectedWallet) {
+            updateActiveAccountPersistedData($selectedWallet.id, { hidden: false })
             onClick && onClick()
         }
     }
 
     function onHideAccountClick(): void {
-        if ($nonHiddenActiveAccounts.length > 1) {
-            if ($selectedAccount) {
-                updateActiveAccountPersistedData($selectedAccount.index, { hidden: true })
+        if ($nonHiddenActiveWallets.length > 1) {
+            if ($selectedWallet) {
+                updateActiveAccountPersistedData($selectedWallet.id, { hidden: true })
                 if (!$activeProfile.showHiddenAccounts) {
-                    setNextSelectedAccount()
+                    setNextSelectedWallet()
                 }
                 onClick && onClick()
             }
         } else {
-            console.error('Not enough accounts visible: ', $nonHiddenActiveAccounts.length)
+            console.error('Not enough accounts visible: ', $nonHiddenActiveWallets.length)
         }
     }
 </script>
 
-{#if $selectedAccount}
+{#if $selectedWallet}
     <MenuItem
-        icon={$selectedAccount.hidden ? Icon.View : Icon.Hide}
-        title={localize($selectedAccount.hidden ? 'actions.showAccount' : 'actions.hideAccount')}
-        onClick={() => ($selectedAccount.hidden ? onShowAccountClick() : onHideAccountClick())}
-        disabled={!$selectedAccount.hidden && $nonHiddenActiveAccounts.length <= 1}
+        icon={$selectedWallet.hidden ? Icon.View : Icon.Hide}
+        title={localize($selectedWallet.hidden ? 'actions.showAccount' : 'actions.hideAccount')}
+        onClick={() => ($selectedWallet.hidden ? onShowAccountClick() : onHideAccountClick())}
+        disabled={!$selectedWallet.hidden && $nonHiddenActiveWallets.length <= 1}
         {...$$restProps}
     />
 {/if}
diff --git a/packages/shared/components/menu-items/AccountSwitcherMenuItem.svelte b/packages/shared/components/menu-items/WalletSwitcherMenuItem.svelte
similarity index 51%
rename from packages/shared/components/menu-items/AccountSwitcherMenuItem.svelte
rename to packages/shared/components/menu-items/WalletSwitcherMenuItem.svelte
index 6a8e6f3d0b6..a63c5a7d532 100644
--- a/packages/shared/components/menu-items/AccountSwitcherMenuItem.svelte
+++ b/packages/shared/components/menu-items/WalletSwitcherMenuItem.svelte
@@ -1,48 +1,48 @@
 <script lang="ts">
-    import { IAccountState, selectedAccount, setSelectedAccount } from '@core/account'
+    import { IWalletState, selectedWallet, setSelectedWallet } from '@core/wallet'
     import { formatCurrency } from '@core/i18n'
     import { getMarketAmountFromAssetValue } from '@core/market/utils'
     import { activeProfile, getBaseToken } from '@core/profile'
-    import { formatTokenAmountBestMatch, selectedAccountAssets } from '@core/wallet'
-    import { FontWeight, Text, AccountLabel } from '@ui'
+    import { formatTokenAmountBestMatch, selectedWalletAssets } from '@core/wallet'
+    import { FontWeight, Text, WalletLabel } from '@ui'
 
-    export let account: IAccountState
+    export let wallet: IWalletState
     export let onClick: () => unknown
     export let id: string = ''
 
-    $: ({ baseCoin } = $selectedAccountAssets[$activeProfile?.network?.id])
+    $: ({ baseCoin } = $selectedWalletAssets[$activeProfile?.network?.id])
 
-    function onAccountClick(accountIndex: number): void {
-        setSelectedAccount(accountIndex)
+    function onAccountClick(walletId: string): void {
+        setSelectedWallet(walletId)
         onClick && onClick()
     }
 </script>
 
 <button
     {id}
-    on:click={() => onAccountClick(account.index)}
+    on:click={() => onAccountClick(wallet.id)}
     class="hover:bg-gray-50 dark:hover:bg-gray-800 flex flex-row items-center justify-between py-2 px-4 rounded"
 >
     <div class="flex flex-row items-center space-x-4">
-        <AccountLabel selected={account.index === $selectedAccount?.index} {account} />
+        <WalletLabel selected={wallet.id === $selectedWallet?.id} {wallet} />
     </div>
     <div class="flex flex-col items-end space-x-1">
         <Text
             fontSize="14"
             lineHeight="20"
             fontWeight={FontWeight.semibold}
-            classes="{account.index === $selectedAccount?.index ? '' : 'opacity-50'} text-right"
+            classes="{wallet.id === $selectedWallet?.id ? '' : 'opacity-50'} text-right"
         >
-            {formatTokenAmountBestMatch(Number(account.balances.baseCoin.total), getBaseToken())}
+            {formatTokenAmountBestMatch(Number(wallet.balances.baseCoin.total), getBaseToken())}
         </Text>
         <Text
             fontSize="12"
             fontWeight={FontWeight.semibold}
             lineHeight="20"
             color="blue-500"
-            classes="{account.index === $selectedAccount?.index ? '' : 'opacity-50'} text-right"
+            classes="{wallet.id === $selectedWallet?.id ? '' : 'opacity-50'} text-right"
         >
-            {formatCurrency(getMarketAmountFromAssetValue(Number(account.balances.baseCoin.total), baseCoin))}
+            {formatCurrency(getMarketAmountFromAssetValue(Number(wallet.balances.baseCoin.total), baseCoin))}
         </Text>
     </div>
 </button>
diff --git a/packages/shared/components/menu-items/index.js b/packages/shared/components/menu-items/index.js
index a9730565ebb..664fd37c341 100644
--- a/packages/shared/components/menu-items/index.js
+++ b/packages/shared/components/menu-items/index.js
@@ -1,2 +1,2 @@
-export { default as AccountSwitcherMenuItem } from './AccountSwitcherMenuItem.svelte'
+export { default as WalletSwitcherMenuItem } from './WalletSwitcherMenuItem.svelte'
 export { default as ToggleHiddenAccountMenuItem } from './ToggleHiddenAccountMenuItem.svelte'
diff --git a/packages/shared/components/tiles/ActivityTile.svelte b/packages/shared/components/tiles/ActivityTile.svelte
index c16da516374..787a1bc18d6 100644
--- a/packages/shared/components/tiles/ActivityTile.svelte
+++ b/packages/shared/components/tiles/ActivityTile.svelte
@@ -7,8 +7,8 @@
         IAsset,
         InclusionState,
         NotVerifiedStatus,
-        getTokenFromSelectedAccount,
-        selectedAccountAssets,
+        getTokenFromSelectedWallet,
+        selectedWalletAssets,
     } from '@core/wallet'
     import {
         AliasActivityTileContent,
@@ -27,10 +27,10 @@
     export let activity: Activity
 
     let asset: IAsset | undefined
-    $: $selectedAccountAssets,
+    $: $selectedWalletAssets,
         (asset =
             activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry
-                ? getTokenFromSelectedAccount(activity.assetId)
+                ? getTokenFromSelectedWallet(activity.assetId)
                 : undefined)
     $: isTimelocked = activity?.asyncData?.timelockDate > $time
     $: shouldShowAsyncFooter = activity.asyncData && activity.asyncData.asyncStatus !== ActivityAsyncStatus.Claimed
diff --git a/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte b/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte
index f5e528d78e5..8e2309a0f06 100644
--- a/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte
+++ b/packages/shared/components/tiles/ShimmerClaimingAccountTile.svelte
@@ -2,18 +2,18 @@
     import { Icon, Text, Tile, FontWeight, TextType } from 'shared/components'
     import { localize } from '@core/i18n'
     import { formatTokenAmountBestMatch } from '@core/wallet/utils'
-    import { IShimmerClaimingAccount, ShimmerClaimingAccountState } from '@contexts/onboarding'
+    import { IShimmerClaimingWallet, ShimmerClaimingWalletState } from '@contexts/onboarding'
     import { IBaseToken } from '@core/wallet/interfaces'
     import { Icon as IconEnum } from '@auxiliary/icon'
 
-    export let shimmerClaimingAccount: IShimmerClaimingAccount
+    export let shimmerClaimingAccount: IShimmerClaimingWallet
     export let baseToken: IBaseToken
 
-    $: shouldDisplayFailedState = shimmerClaimingAccount?.state === ShimmerClaimingAccountState.Failed
-    $: shouldDisplayUnclaimedRewards = shimmerClaimingAccount?.state !== ShimmerClaimingAccountState.FullyClaimed
+    $: shouldDisplayFailedState = shimmerClaimingAccount?.state === ShimmerClaimingWalletState.Failed
+    $: shouldDisplayUnclaimedRewards = shimmerClaimingAccount?.state !== ShimmerClaimingWalletState.FullyClaimed
     $: shouldDisplayClaimedRewards =
-        shimmerClaimingAccount?.state !== ShimmerClaimingAccountState.UnclaimedWithRewards &&
-        shimmerClaimingAccount?.state !== ShimmerClaimingAccountState.UnclaimedWithoutRewards
+        shimmerClaimingAccount?.state !== ShimmerClaimingWalletState.UnclaimedWithRewards &&
+        shimmerClaimingAccount?.state !== ShimmerClaimingWalletState.UnclaimedWithoutRewards
 </script>
 
 {#if shimmerClaimingAccount}
@@ -26,7 +26,7 @@
                 </Text>
             </div>
             <div class="flex flex-col">
-                {#if shimmerClaimingAccount?.state === ShimmerClaimingAccountState.Claiming}
+                {#if shimmerClaimingAccount?.state === ShimmerClaimingWalletState.Claiming}
                     <Text type={TextType.p} secondary fontWeight={FontWeight.semibold}>
                         {`${localize('actions.claimingRewards')}...`}
                     </Text>
diff --git a/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte
index 5419c13fc59..9604bea70bc 100644
--- a/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/FoundryActivityTileContent.svelte
@@ -6,14 +6,14 @@
         getAssetFromPersistedAssets,
         getFormattedAmountFromActivity,
         IPersistedAsset,
-        selectedAccountAssets,
+        selectedWalletAssets,
     } from '@core/wallet'
     import { AssetIcon, ActivityTileContent } from 'shared/components'
 
     export let activity: FoundryActivity
 
     let asset: IPersistedAsset | undefined
-    $: $selectedAccountAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
+    $: $selectedWalletAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
     $: action = localize(getActivityTileTitle(activity))
     $: amount = getFormattedAmountFromActivity(activity)
     $: formattedAsset = {
diff --git a/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte
index f742de95bd8..8ee6f948031 100644
--- a/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/NftActivityTileContent.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { selectedAccountIndex } from '@core/account'
+    import { selectedWalletId } from '@core/wallet'
     import { localize } from '@core/i18n'
     import { getNftByIdFromAllAccountNfts } from '@core/nfts'
     import { ActivityDirection } from '@core/wallet/enums'
@@ -22,7 +22,7 @@
     }
     $: subjectLocale = getSubjectLocaleFromActivity(activity)
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+    $: nft = getNftByIdFromAllAccountNfts($selectedWalletId, activity.nftId)
 </script>
 
 <ActivityTileContent {action} {subject} {formattedAsset}>
diff --git a/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte
index 17af9a79795..80fcababb4c 100644
--- a/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/TransactionActivityTileContent.svelte
@@ -7,7 +7,7 @@
         getFormattedAmountFromActivity,
         getSubjectLocaleFromActivity,
         IPersistedAsset,
-        selectedAccountAssets,
+        selectedWalletAssets,
         TransactionActivity,
     } from '@core/wallet'
     import { ActivityTileContent, AssetIcon } from 'shared/components'
@@ -15,7 +15,7 @@
     export let activity: TransactionActivity
 
     let asset: IPersistedAsset
-    $: $selectedAccountAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
+    $: $selectedWalletAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
     $: action = localize(getActivityTileTitle(activity))
     $: subject =
         activity.direction === ActivityDirection.SelfTransaction
diff --git a/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte b/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte
index 57b00baf9fc..c167af1324b 100644
--- a/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte
+++ b/packages/shared/components/tiles/tileContents/VestingActivityTileContent.svelte
@@ -7,14 +7,14 @@
         getAssetFromPersistedAssets,
         getFormattedAmountFromActivity,
         getSubjectLocaleFromActivity,
-        selectedAccountAssets,
+        selectedWalletAssets,
     } from '@core/wallet'
     import { ActivityTileContent, AssetIcon } from 'shared/components'
 
     export let activity: VestingActivity
 
     let asset: IPersistedAsset
-    $: $selectedAccountAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
+    $: $selectedWalletAssets, (asset = getAssetFromPersistedAssets(activity.assetId))
     $: action = localize(getActivityTileTitle(activity))
     $: subject = getSubjectLocaleFromActivity(activity)
     $: amount = getFormattedAmountFromActivity(activity)
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/governance/operations/handleDeepLinkAddProposalOperation.ts b/packages/shared/lib/auxiliary/deep-link/handlers/governance/operations/handleDeepLinkAddProposalOperation.ts
index f60032553d1..4d506a47c77 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/governance/operations/handleDeepLinkAddProposalOperation.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/governance/operations/handleDeepLinkAddProposalOperation.ts
@@ -1,9 +1,9 @@
 import { showAppNotification } from '@auxiliary/notification/actions'
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
 import { isValidUrl } from '@core/utils/validation'
-import { isProposalAlreadyAddedForSelectedAccount, isValidProposalId } from '@contexts/governance/utils'
+import { isProposalAlreadyAddedForSelectedWallet, isValidProposalId } from '@contexts/governance/utils'
 import { AddProposalOperationParameter } from '../../../enums'
-import { registeredProposalsForSelectedAccount, selectedProposalId } from '@contexts/governance/stores'
+import { registeredProposalsForSelectedWallet, selectedProposalId } from '@contexts/governance/stores'
 import { GovernanceRoute, governanceRouter } from '@core/router'
 import { get } from 'svelte/store'
 
@@ -15,8 +15,8 @@ export function handleDeepLinkAddProposalOperation(searchParams: URLSearchParams
     const eventId = searchParams.get(AddProposalOperationParameter.EventId)
     if (!isValidProposalId(eventId)) {
         throw new Error('Invalid proposal ID')
-    } else if (isProposalAlreadyAddedForSelectedAccount(eventId)) {
-        const proposal = get(registeredProposalsForSelectedAccount)[eventId]
+    } else if (isProposalAlreadyAddedForSelectedWallet(eventId)) {
+        const proposal = get(registeredProposalsForSelectedWallet)[eventId]
         if (proposal === undefined) {
             throw new Error(`Event with id ${eventId} not found`)
         } else {
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
index c31412f621c..0a8ed31147e 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendConfirmationOperation.ts
@@ -7,7 +7,7 @@ import {
     SubjectType,
     getAssetById,
     getUnitFromTokenMetadata,
-    selectedAccountAssets,
+    selectedWalletAssets,
     setNewTransactionDetails,
 } from '@core/wallet'
 import { get } from 'svelte/store'
@@ -65,7 +65,7 @@ function parseSendConfirmationOperation(searchParams: URLSearchParams): NewTrans
     assetId && validateAssetId(assetId)
 
     const networkId = getActiveNetworkId()
-    const baseAsset = networkId ? get(selectedAccountAssets)[networkId].baseCoin : undefined
+    const baseAsset = networkId ? get(selectedWalletAssets)[networkId].baseCoin : undefined
     const asset = assetId && networkId ? getAssetById(assetId, networkId) : baseAsset
     if (!asset) {
         throw new UnknownAssetError()
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
index bc910bef309..710e5f9918f 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
@@ -2,7 +2,7 @@ import {
     NewTransactionDetails,
     Subject,
     setNewTransactionDetails,
-    selectedAccountAssets,
+    selectedWalletAssets,
     getAssetById,
     NewTransactionType,
     getUnitFromTokenMetadata,
@@ -41,7 +41,7 @@ function parseSendFormOperation(searchParams: URLSearchParams): NewTransactionDe
     const assetId = searchParams.get(SendOperationParameter.AssetId)
 
     const networkId = getActiveNetworkId()
-    const baseAsset = networkId ? get(selectedAccountAssets)[networkId].baseCoin : undefined
+    const baseAsset = networkId ? get(selectedWalletAssets)[networkId].baseCoin : undefined
     const asset = assetId && networkId ? getAssetById(assetId, networkId) : baseAsset
     if (!asset) {
         throw new UnknownAssetError()
diff --git a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
index c0378ef4623..22007bd3cc4 100644
--- a/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
+++ b/packages/shared/lib/auxiliary/popup/enums/popup-id.enum.ts
@@ -11,7 +11,7 @@ export enum PopupId {
     CheckForUpdates = 'checkForUpdates',
     Confirmation = 'confirmation',
     ConnectLedger = 'connectLedger',
-    CreateAccount = 'createAccount',
+    createWallet = 'createWallet',
     DeepLinkError = 'deepLinkError',
     DeleteAccount = 'deleteAccount',
     DeleteProfile = 'deleteProfile',
diff --git a/packages/shared/lib/contexts/developer/actions/requestTokensFromFaucet.ts b/packages/shared/lib/contexts/developer/actions/requestTokensFromFaucet.ts
index 0ff0db07993..9786f0aa573 100644
--- a/packages/shared/lib/contexts/developer/actions/requestTokensFromFaucet.ts
+++ b/packages/shared/lib/contexts/developer/actions/requestTokensFromFaucet.ts
@@ -1,4 +1,4 @@
-import { selectedAccount } from '@core/account'
+import { selectedWallet } from '@core/wallet'
 import { localize } from '@core/i18n'
 import { FAUCET_URLS } from '@core/network'
 import { showAppNotification } from '@auxiliary/notification'
@@ -19,7 +19,7 @@ export async function requestTokensFromFaucet(): Promise<void> {
     const headers = new Headers()
     headers.append('Content-Type', 'application/json')
 
-    const address = get(selectedAccount)?.depositAddress
+    const address = get(selectedWallet)?.depositAddress
     const body = JSON.stringify({ address })
 
     const requestInit = {
diff --git a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
index 85c5cec8743..fe36989fc3d 100644
--- a/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
+++ b/packages/shared/lib/contexts/governance/actions/addProposalsFromParticipationEventMap.ts
@@ -1,13 +1,12 @@
 import { ParticipationEventMap, ParticipationEventWithNodes } from '@iota/sdk/out/types'
 
-import { IAccountState } from '@core/account/interfaces'
-
 import { addOrUpdateProposalToRegisteredProposals } from '../stores'
 import { createProposalFromEvent } from '../utils'
+import { IWalletState } from 'shared/lib/core/wallet'
 
-export function addProposalsFromParticipationEventMap(eventMap: ParticipationEventMap, account: IAccountState): void {
+export function addProposalsFromParticipationEventMap(eventMap: ParticipationEventMap, wallet: IWalletState): void {
     Object.values(eventMap).forEach((event: ParticipationEventWithNodes) => {
         const proposal = createProposalFromEvent(event)
-        addOrUpdateProposalToRegisteredProposals(proposal, account.index)
+        addOrUpdateProposalToRegisteredProposals(proposal, wallet.id)
     })
 }
diff --git a/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts b/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
deleted file mode 100644
index 685cf504298..00000000000
--- a/packages/shared/lib/contexts/governance/actions/getAccountsParticipationEventStatusForEvent.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { get } from 'svelte/store'
-
-import type { ParticipationEventId, ParticipationEventStatus } from '@iota/sdk/out/types'
-
-import { IAccount } from '@core/account/interfaces'
-import { selectedAccount } from '@core/account/stores'
-
-export function getAccountsParticipationEventStatusForEvent(
-    eventId: ParticipationEventId,
-    account: IAccount = get(selectedAccount)
-): Promise<ParticipationEventStatus> {
-    return account?.getParticipationEventStatus(eventId)
-}
diff --git a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
index e3118e3c0a4..2512e27a61d 100644
--- a/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/getVotingEvent.ts
@@ -1,8 +1,7 @@
-import { get } from 'svelte/store'
 import type { ParticipationEventId, ParticipationEventWithNodes } from '@iota/sdk/out/types'
-import { selectedAccount } from '@core/account/stores'
+import { getSelectedWallet } from 'shared/lib/core/wallet'
 
 export function getVotingEvent(eventId: ParticipationEventId): Promise<ParticipationEventWithNodes> {
-    const account = get(selectedAccount)
-    return account.getParticipationEvent(eventId)
+    const wallet = getSelectedWallet();
+    return wallet.getParticipationEvent(eventId)
 }
diff --git a/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts b/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts
new file mode 100644
index 00000000000..690fd9eee74
--- /dev/null
+++ b/packages/shared/lib/contexts/governance/actions/getWalletsParticipationEventStatusForEvent.ts
@@ -0,0 +1,11 @@
+import type { ParticipationEventId, ParticipationEventStatus } from '@iota/sdk/out/types'
+import { IWallet } from 'shared/lib/core/profile'
+import { getSelectedWallet } from 'shared/lib/core/wallet/stores/selected-wallet.store'
+
+
+export function getWalletsParticipationEventStatusForEvent(
+    eventId: ParticipationEventId,
+    wallet: IWallet = getSelectedWallet()
+): Promise<ParticipationEventStatus> {
+    return wallet?.getParticipationEventStatus(eventId)
+}
diff --git a/packages/shared/lib/contexts/governance/actions/index.ts b/packages/shared/lib/contexts/governance/actions/index.ts
index c9167b4b44c..1d269afa272 100644
--- a/packages/shared/lib/contexts/governance/actions/index.ts
+++ b/packages/shared/lib/contexts/governance/actions/index.ts
@@ -1,6 +1,6 @@
 export * from './addProposalsFromParticipationEventMap'
 export * from './getVotingEvent'
-export * from './getAccountsParticipationEventStatusForEvent'
+export * from './getWalletsParticipationEventStatusForEvent'
 export * from './initializeParticipationOverviews'
 export * from './initializeRegisteredProposals'
 export * from './pollParticipationEventStatus'
diff --git a/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts b/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts
index 23971d9e8ae..c708b068074 100644
--- a/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts
+++ b/packages/shared/lib/contexts/governance/actions/initializeRegisteredProposals.ts
@@ -1,46 +1,45 @@
+import { activeWallets } from 'shared/lib/core/profile'
+import { getSelectedWallet, IWalletState } from 'shared/lib/core/wallet'
 import { get } from 'svelte/store'
 
-import { selectedAccount } from '@core/account/stores'
-import { IAccountState } from '@core/account/interfaces'
-import { activeAccounts } from '@core/profile/stores'
 
 import { IRegisteredProposals } from '../interfaces'
 import { registeredProposals } from '../stores'
 import { createProposalFromError, createProposalFromEvent } from '../utils'
-import { getAccountsParticipationEventStatusForEvent } from './getAccountsParticipationEventStatusForEvent'
+import { getWalletsParticipationEventStatusForEvent } from './getWalletsParticipationEventStatusForEvent'
 
 export async function initializeRegisteredProposals(): Promise<void> {
-    const allProposals: { [accountId: number]: IRegisteredProposals } = {}
+    const allProposals: { [walletId: string]: IRegisteredProposals } = {}
 
-    // Get selected account first to speed up showing proposals for the user
-    const _selectedAccount = get(selectedAccount)
-    allProposals[_selectedAccount.index] = await getParticipationEventsAndCreateProposalsForAccount(_selectedAccount)
+    // Get selected wallet first to speed up showing proposals for the user
+    const _selectedWallet = getSelectedWallet();
+    allProposals[_selectedWallet.id] = await getParticipationEventsAndCreateProposalsForWallet(_selectedWallet)
     registeredProposals.set(allProposals)
 
-    // Then get the rest of the accounts in the background
-    for (const account of get(activeAccounts)) {
-        if (!get(selectedAccount)) {
+    // Then get the rest of the wallet in the background
+    for (const wallet of get(activeWallets)) {
+        if (!getSelectedWallet()) {
             break
         }
-        if (account.index !== _selectedAccount.index) {
-            allProposals[account.index] = await getParticipationEventsAndCreateProposalsForAccount(account)
+        if (wallet.id !== _selectedWallet.id) {
+            allProposals[wallet.id] = await getParticipationEventsAndCreateProposalsForWallet(wallet)
         }
     }
     registeredProposals.set(allProposals)
 }
 
-async function getParticipationEventsAndCreateProposalsForAccount(
-    account: IAccountState
+async function getParticipationEventsAndCreateProposalsForWallet(
+    wallet: IWalletState
 ): Promise<IRegisteredProposals> {
     const proposals: IRegisteredProposals = {}
-    const events = await account.getParticipationEvents()
+    const events = await wallet.getParticipationEvents()
     for (const event of Object.values(events)) {
         const proposal = createProposalFromEvent(event)
-        if (!get(selectedAccount)) {
+        if (!getSelectedWallet()) {
             break
         }
         try {
-            await getAccountsParticipationEventStatusForEvent(event.id, account)
+            await getWalletsParticipationEventStatusForEvent(event.id, wallet)
             proposals[event.id] = proposal
         } catch (err) {
             proposals[event.id] = createProposalFromError(proposal, err)
diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
index 88fc59dc36e..31e7f4af916 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvent.ts
@@ -4,14 +4,14 @@ import type {
     ParticipationEventId,
     ParticipationEventRegistrationOptions,
 } from '@iota/sdk/out/types'
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet'
 import { addOrUpdateProposalToRegisteredProposals } from '../stores'
 import { createProposalFromEvent } from '@contexts/governance'
 
 export async function registerParticipationEvent(
     eventId: ParticipationEventId,
     node: INode,
-    account: IAccountState
+    account: IWalletState
 ): Promise<ParticipationEventWithNodes> {
     const options: ParticipationEventRegistrationOptions = {
         node,
@@ -21,7 +21,7 @@ export async function registerParticipationEvent(
     const event = eventMap[eventId]
 
     const proposal = createProposalFromEvent(event)
-    addOrUpdateProposalToRegisteredProposals(proposal, account.index)
+    addOrUpdateProposalToRegisteredProposals(proposal, account.id)
 
     return event
 }
diff --git a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
index 6536a773f1b..f91f9b5b7c4 100644
--- a/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerParticipationEvents.ts
@@ -1,18 +1,17 @@
 import { ParticipationEventMap, ParticipationEventRegistrationOptions } from '@iota/sdk/out/types'
+import { getSelectedWallet, IWalletState } from 'shared/lib/core/wallet'
 
 import { get } from 'svelte/store'
 
-import { IAccountState } from '@core/account/interfaces'
 
 import { addProposalsFromParticipationEventMap } from './addProposalsFromParticipationEventMap'
-import { selectedAccount } from '@core/account'
 
 export async function registerParticipationEvents(
     registrationOptions: ParticipationEventRegistrationOptions,
-    account: IAccountState
+    wallet: IWalletState
 ): Promise<ParticipationEventMap> {
     let newRegistrationOptions = registrationOptions
-    const { removedProposalIds } = get(selectedAccount) ?? {}
+    const { removedProposalIds } = getSelectedWallet() ?? {}
     if (removedProposalIds?.length > 0) {
         newRegistrationOptions = {
             ...registrationOptions,
@@ -20,7 +19,7 @@ export async function registerParticipationEvents(
         }
     }
 
-    const eventMap = await account.registerParticipationEvents(newRegistrationOptions)
-    addProposalsFromParticipationEventMap(eventMap, account)
+    const eventMap = await wallet.registerParticipationEvents(newRegistrationOptions)
+    addProposalsFromParticipationEventMap(eventMap, wallet)
     return eventMap
 }
diff --git a/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts b/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
index 17e1cd4b6b1..a20ea460e07 100644
--- a/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerProposalsForAccounts.ts
@@ -1,12 +1,12 @@
 import { ParticipationEventRegistrationOptions } from '@iota/sdk/out/types'
 
-import { IAccountState } from '@core/account/interfaces'
+import { IWalletState } from '@core/wallet/interfaces'
 
 import { registerParticipationEvents } from './registerParticipationEvents'
 
 export async function registerProposalsForAccounts(
     registrationOptions: ParticipationEventRegistrationOptions,
-    accounts: IAccountState[]
+    accounts: IWalletState[]
 ): Promise<void> {
     await Promise.all(accounts.map((account) => registerParticipationEvents(registrationOptions, account)))
 }
diff --git a/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts b/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts
index 6f8ec27644f..64bf6e5d31d 100644
--- a/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts
+++ b/packages/shared/lib/contexts/governance/actions/registerProposalsFromNodes.ts
@@ -1,12 +1,13 @@
 import { get } from 'svelte/store'
 
-import { IAccountState } from '@core/account/interfaces'
+import { IWalletState } from '@core/wallet/interfaces'
 import { INode } from '@core/network/interfaces'
 import { activeProfile } from '@core/profile/stores'
 
 import { registerProposalsForAccounts } from './registerProposalsForAccounts'
 
-export async function registerProposalsFromNodes(accounts: IAccountState[], nodes?: INode[]): Promise<void> {
+// TODO(2.0) FIx this
+export async function registerProposalsFromNodes(accounts: IWalletState[], nodes?: INode[]): Promise<void> {
     const _nodes = nodes ? nodes : get(activeProfile)?.clientOptions?.nodes
     await Promise.all(_nodes.map((node) => registerProposalsForAccounts({ node }, accounts)))
 }
diff --git a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
index 839169b5989..23d0bcfd886 100644
--- a/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
+++ b/packages/shared/lib/contexts/governance/actions/setVotingPower.ts
@@ -1,31 +1,30 @@
 import { PreparedTransaction, Transaction } from '@iota/sdk/out/types'
 import { plainToInstance } from 'class-transformer'
-import { get } from 'svelte/store'
-import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { processAndAddToActivities } from '@core/wallet/utils'
 import { handleError } from '@core/error/handlers'
 import { closePopup } from '@auxiliary/popup'
+import { getSelectedWallet, updateSelectedWallet } from 'shared/lib/core/wallet'
 
 export async function setVotingPower(rawAmount: string): Promise<void> {
-    const account = get(selectedAccount)
+    const wallet = getSelectedWallet();
     try {
-        if (!account) return
+        if (!wallet) return
 
-        const votingPower = parseInt(account.votingPower, 10)
+        const votingPower = parseInt(wallet.votingPower, 10)
         const amount = parseInt(rawAmount, 10)
 
         if (amount === votingPower) {
             return closePopup()
         }
 
-        updateSelectedAccount({ hasVotingPowerTransactionInProgress: true, isTransferring: true })
+        updateSelectedWallet({ hasVotingPowerTransactionInProgress: true, isTransferring: true })
 
         let transaction: Transaction
         let preparedTransaction: PreparedTransaction
 
         if (amount < votingPower) {
             const amountToDecrease = votingPower - amount
-            const prepareDecreaseVotingPowerTransaction = await account?.prepareDecreaseVotingPower(
+            const prepareDecreaseVotingPowerTransaction = await wallet?.prepareDecreaseVotingPower(
                 amountToDecrease.toString()
             )
             preparedTransaction = plainToInstance(PreparedTransaction, prepareDecreaseVotingPowerTransaction)
@@ -33,7 +32,7 @@ export async function setVotingPower(rawAmount: string): Promise<void> {
             transaction = await preparedTransaction?.send()
         } else {
             const amountToIncrease = amount - votingPower
-            const prepareIncreaseVotingPowerTransaction = await account?.prepareIncreaseVotingPower(
+            const prepareIncreaseVotingPowerTransaction = await wallet?.prepareIncreaseVotingPower(
                 amountToIncrease.toString()
             )
             preparedTransaction = plainToInstance(PreparedTransaction, prepareIncreaseVotingPowerTransaction)
@@ -41,9 +40,9 @@ export async function setVotingPower(rawAmount: string): Promise<void> {
             transaction = await preparedTransaction?.send()
         }
 
-        await processAndAddToActivities(transaction, account)
+        await processAndAddToActivities(transaction, wallet)
     } catch (err) {
         handleError(err)
-        updateSelectedAccount({ hasVotingPowerTransactionInProgress: false, isTransferring: false })
+        updateSelectedWallet({ hasVotingPowerTransactionInProgress: false, isTransferring: false })
     }
 }
diff --git a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
index ee8f488985a..3761b362dc5 100644
--- a/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/actions/stopVotingForProposal.ts
@@ -1,21 +1,20 @@
 import { PreparedTransaction, type Transaction } from '@iota/sdk/out/types'
 import { plainToInstance } from 'class-transformer'
-import { get } from 'svelte/store'
-import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { showAppNotification } from '@auxiliary/notification/actions'
 import { localize } from '@core/i18n'
 import { handleError } from '@core/error/handlers'
 import { processAndAddToActivities } from '@core/wallet/utils'
+import { getSelectedWallet, updateSelectedWallet } from 'shared/lib/core/wallet'
 
 export async function stopVotingForProposal(eventId: string): Promise<Transaction | undefined> {
-    const account = get(selectedAccount)
+    const wallet = getSelectedWallet();
     try {
-        updateSelectedAccount({ hasVotingTransactionInProgress: true })
-        const prepareStopParticipatingTransaction = await account?.prepareStopParticipating(eventId)
+        updateSelectedWallet({ hasVotingTransactionInProgress: true })
+        const prepareStopParticipatingTransaction = await wallet?.prepareStopParticipating(eventId)
         const preparedTransaction = plainToInstance(PreparedTransaction, prepareStopParticipatingTransaction)
         const transaction = await preparedTransaction?.send()
 
-        await processAndAddToActivities(transaction, account)
+        await processAndAddToActivities(transaction, wallet)
 
         showAppNotification({
             type: 'success',
@@ -25,6 +24,6 @@ export async function stopVotingForProposal(eventId: string): Promise<Transactio
         return transaction
     } catch (err) {
         handleError(err)
-        updateSelectedAccount({ hasVotingTransactionInProgress: false })
+        updateSelectedWallet({ hasVotingTransactionInProgress: false })
     }
 }
diff --git a/packages/shared/lib/contexts/governance/actions/vote.ts b/packages/shared/lib/contexts/governance/actions/vote.ts
index cb85e0135ef..5a48281831c 100644
--- a/packages/shared/lib/contexts/governance/actions/vote.ts
+++ b/packages/shared/lib/contexts/governance/actions/vote.ts
@@ -1,22 +1,20 @@
 import { PreparedTransaction } from '@iota/sdk/out/types'
 import { plainToInstance } from 'class-transformer'
 
-import { get } from 'svelte/store'
-import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { showAppNotification } from '@auxiliary/notification/actions'
 import { localize } from '@core/i18n'
 import { handleError } from '@core/error/handlers'
-import { processAndAddToActivities } from '@core/wallet'
+import { getSelectedWallet, processAndAddToActivities, updateSelectedWallet } from '@core/wallet'
 
 export async function vote(eventId?: string, answers?: number[]): Promise<void> {
-    const account = get(selectedAccount)
+    const wallet = getSelectedWallet();
     try {
-        updateSelectedAccount({ hasVotingTransactionInProgress: true })
-        const prepareVoteTransaction = await account?.prepareVote(eventId, answers)
+        updateSelectedWallet({ hasVotingTransactionInProgress: true })
+        const prepareVoteTransaction = await wallet?.prepareVote(eventId, answers)
         const preparedTransaction = plainToInstance(PreparedTransaction, prepareVoteTransaction)
         const transaction = await preparedTransaction?.send()
 
-        await processAndAddToActivities(transaction, account)
+        await processAndAddToActivities(transaction, wallet)
 
         showAppNotification({
             type: 'success',
@@ -24,7 +22,7 @@ export async function vote(eventId?: string, answers?: number[]): Promise<void>
             alert: true,
         })
     } catch (err) {
-        updateSelectedAccount({ hasVotingTransactionInProgress: false })
+        updateSelectedWallet({ hasVotingTransactionInProgress: false })
         handleError(err)
     }
 }
diff --git a/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts b/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts
index 22baa22b4ce..d5135e58200 100644
--- a/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/participation-overviews.store.ts
@@ -1,43 +1,40 @@
 import { derived, get, Readable, writable } from 'svelte/store'
 import type { ParticipationOverview } from '@iota/sdk/out/types'
-import { selectedAccountIndex } from '@core/account/stores'
-import { getParticipationOverview } from '@core/account/api/getParticipationOverview'
 import { DEFAULT_PARTICIPATION_OVERVIEW } from '../constants'
+import { getParticipationOverview } from '@core/wallet/actions'
+import { selectedWalletId } from '@core/wallet/stores/selected-wallet-id.store'
 
-export const allParticipationOverviews = writable<{ [accountId: number]: ParticipationOverview }>({})
+export const allParticipationOverviews = writable<{ [walletId: string]: ParticipationOverview }>({})
 let isUpdatingParticipationOverview: boolean = false
 
-export const participationOverviewForSelectedAccount: Readable<ParticipationOverview> = derived(
-    [selectedAccountIndex, allParticipationOverviews],
-    ([$selectedAccountIndex, $allParticipationOverviews]) => {
-        if ($selectedAccountIndex >= 0) {
-            return $allParticipationOverviews[$selectedAccountIndex]
-        } else {
-            return undefined
-        }
+// TODO(2.0) Rename this store
+export const participationOverviewForSelectedWallet: Readable<ParticipationOverview> = derived(
+    [selectedWalletId, allParticipationOverviews],
+    ([$selectedWalletId, $allParticipationOverviews]) => {
+        $allParticipationOverviews[$selectedWalletId]
     }
 )
 
-export async function updateParticipationOverview(accountIndex: number = get(selectedAccountIndex)): Promise<void> {
+export async function updateParticipationOverview(walletId: string = get(selectedWalletId)): Promise<void> {
     if (!isUpdatingParticipationOverview) {
         isUpdatingParticipationOverview = true
-        const overview = await getParticipationOverview(accountIndex)
+        const overview = await getParticipationOverview(walletId)
         isUpdatingParticipationOverview = false
         allParticipationOverviews.update((state) => {
-            state[accountIndex] = overview ?? DEFAULT_PARTICIPATION_OVERVIEW
+            state[walletId] = overview ?? DEFAULT_PARTICIPATION_OVERVIEW
             return state
         })
     }
 }
 
 export async function updateParticipationOverviewForEventId(eventId: string): Promise<void> {
-    const accountIndex = get(selectedAccountIndex)
-    const overview = await getParticipationOverview(accountIndex, eventId)
+    const walletId = get(selectedWalletId)
+    const overview = await getParticipationOverview(walletId, eventId)
     allParticipationOverviews.update((state) => {
-        if (!state[accountIndex]) {
-            state[accountIndex] = { participations: {} }
+        if (!state[walletId]) {
+            state[walletId] = { participations: {} }
         }
-        state[accountIndex].participations[eventId] = overview.participations[eventId]
+        state[walletId].participations[eventId] = overview.participations[eventId]
         return state
     })
 }
diff --git a/packages/shared/lib/contexts/governance/stores/registered-proposals.store.ts b/packages/shared/lib/contexts/governance/stores/registered-proposals.store.ts
index 71015d0ded1..f4ca89ed706 100644
--- a/packages/shared/lib/contexts/governance/stores/registered-proposals.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/registered-proposals.store.ts
@@ -1,23 +1,24 @@
-import { selectedAccountIndex } from '@core/account/stores'
 import { networkStatus } from '@core/network/stores/network-status.store'
+import { selectedWalletId } from '@core/wallet/stores/selected-wallet-id.store'
 import { derived, Readable, writable } from 'svelte/store'
 import { IProposal, IProposalMetadata, IRegisteredProposals } from '../interfaces'
 import { getProposalStatusForMilestone } from '../utils'
 
-export const registeredProposals = writable<{ [accountId: number]: IRegisteredProposals }>({})
+export const registeredProposals = writable<{ [walletId: string]: IRegisteredProposals }>({})
 
-export const registeredProposalsForSelectedAccount: Readable<{ [proposalId: string]: IProposal }> = derived(
-    [selectedAccountIndex, registeredProposals, networkStatus],
-    ([$selectedAccountIndex, $registeredProposals, $networkStatus]) => {
-        if ($networkStatus && $selectedAccountIndex >= 0) {
-            const proposalsForSelectedAccount = $registeredProposals[$selectedAccountIndex] ?? {}
+// TODO(2.0) Rename this
+export const registeredProposalsForSelectedWallet: Readable<{ [proposalId: string]: IProposal }> = derived(
+    [selectedWalletId, registeredProposals, networkStatus],
+    ([$selectedWalletId, $registeredProposals, $networkStatus]) => {
+        if ($networkStatus && selectedWalletId) {
+            const proposalsForSelectedWallet = $registeredProposals[$selectedWalletId] ?? {}
             const proposals: { [proposalId: string]: IProposal } = {}
-            for (const key of Object.keys(proposalsForSelectedAccount)) {
+            for (const key of Object.keys(proposalsForSelectedWallet)) {
                 const status = getProposalStatusForMilestone(
                     $networkStatus.currentMilestone,
-                    proposalsForSelectedAccount[key]?.milestones
+                    proposalsForSelectedWallet[key]?.milestones
                 )
-                proposals[key] = { ...proposalsForSelectedAccount[key], status }
+                proposals[key] = { ...proposalsForSelectedWallet[key], status }
             }
 
             return proposals
@@ -27,20 +28,20 @@ export const registeredProposalsForSelectedAccount: Readable<{ [proposalId: stri
     }
 )
 
-export function addOrUpdateProposalToRegisteredProposals(proposal: IProposalMetadata, accountId: number): void {
+export function addOrUpdateProposalToRegisteredProposals(proposal: IProposalMetadata, walletId: string): void {
     registeredProposals.update((proposals) => {
-        if (!proposals[accountId]) {
-            proposals[accountId] = {}
+        if (!proposals[walletId]) {
+            proposals[walletId] = {}
         }
 
-        proposals[accountId][proposal.id] = proposal
+        proposals[walletId][proposal.id] = proposal
         return proposals
     })
 }
 
-export function removePersistedProposal(proposalId: string, accountId: number): void {
+export function removePersistedProposal(proposalId: string, walletId: string): void {
     registeredProposals.update((proposals) => {
-        delete proposals[accountId][proposalId]
+        delete proposals[walletId][proposalId]
         return proposals
     })
 }
diff --git a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
index dd526f16c3b..66f532adc98 100644
--- a/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/selected-participation-event-status.store.ts
@@ -1,7 +1,7 @@
 import { ParticipationEventStatus } from '@iota/sdk/out/types'
+import { selectedWalletId } from 'shared/lib/core/wallet'
 import { get, writable } from 'svelte/store'
-import { selectedAccountIndex } from '@core/account/stores'
-import { getAccountsParticipationEventStatusForEvent } from '../actions'
+import { getWalletsParticipationEventStatusForEvent } from '../actions'
 import { createProposalFromError } from '../utils'
 import { addOrUpdateProposalToRegisteredProposals, registeredProposals } from './registered-proposals.store'
 
@@ -10,12 +10,12 @@ export const selectedParticipationEventStatus = writable<ParticipationEventStatu
 export async function getAndSetSelectedParticipationEventStatus(eventId: string): Promise<void> {
     let eventStatus: ParticipationEventStatus
     try {
-        eventStatus = await getAccountsParticipationEventStatusForEvent(eventId)
+        eventStatus = await getWalletsParticipationEventStatusForEvent(eventId)
     } catch (err) {
-        const accountIndex = get(selectedAccountIndex)
-        const proposal = get(registeredProposals)[accountIndex][eventId]
+        const walletId = get(selectedWalletId)
+        const proposal = get(registeredProposals)[walletId][eventId]
         const errorProposal = createProposalFromError(proposal, err)
-        addOrUpdateProposalToRegisteredProposals(errorProposal, accountIndex)
+        addOrUpdateProposalToRegisteredProposals(errorProposal, walletId)
     }
     selectedParticipationEventStatus.set(eventStatus)
 }
diff --git a/packages/shared/lib/contexts/governance/stores/selected-proposal.store.ts b/packages/shared/lib/contexts/governance/stores/selected-proposal.store.ts
index 2e1726d906f..e524c3424ef 100644
--- a/packages/shared/lib/contexts/governance/stores/selected-proposal.store.ts
+++ b/packages/shared/lib/contexts/governance/stores/selected-proposal.store.ts
@@ -1,11 +1,11 @@
 import { IProposal } from '@contexts/governance/interfaces'
 import { writable, Readable, derived } from 'svelte/store'
-import { registeredProposalsForSelectedAccount } from './registered-proposals.store'
+import { registeredProposalsForSelectedWallet } from './registered-proposals.store'
 
 export const selectedProposalId = writable<string>(null)
 
 export const selectedProposal: Readable<IProposal> = derived(
-    [selectedProposalId, registeredProposalsForSelectedAccount],
-    ([$selectedProposalId, $registeredProposalsForSelectedAccount]) =>
-        $registeredProposalsForSelectedAccount[$selectedProposalId]
+    [selectedProposalId, registeredProposalsForSelectedWallet],
+    ([$selectedProposalId, $registeredProposalsForSelectedWallet]) =>
+        $registeredProposalsForSelectedWallet[$selectedProposalId]
 )
diff --git a/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts b/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
index 0a57b7c216f..87293b803f9 100644
--- a/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
+++ b/packages/shared/lib/contexts/governance/utils/getActiveParticipation.ts
@@ -1,9 +1,9 @@
 import { get } from 'svelte/store'
 import type { TrackedParticipationOverview } from '@iota/sdk/out/types'
-import { participationOverviewForSelectedAccount } from '../stores/participation-overviews.store'
+import { participationOverviewForSelectedWallet } from '../stores/participation-overviews.store'
 
 export function getActiveParticipation(proposalId: string): TrackedParticipationOverview {
-    const overview = get(participationOverviewForSelectedAccount)
+    const overview = get(participationOverviewForSelectedWallet)
     const participationsForProposal: TrackedParticipationOverview[] = Object.values(
         overview?.participations?.[proposalId] ?? {}
     )
diff --git a/packages/shared/lib/contexts/governance/utils/getNumberOfActiveProposals.ts b/packages/shared/lib/contexts/governance/utils/getNumberOfActiveProposals.ts
index 803b9896642..32da6dcdadd 100644
--- a/packages/shared/lib/contexts/governance/utils/getNumberOfActiveProposals.ts
+++ b/packages/shared/lib/contexts/governance/utils/getNumberOfActiveProposals.ts
@@ -1,9 +1,9 @@
 import { get } from 'svelte/store'
-import { registeredProposalsForSelectedAccount } from '../stores'
+import { registeredProposalsForSelectedWallet } from '../stores'
 import { isProposalActive } from './isProposalActive'
 
 export function getNumberOfActiveProposals(): number {
-    const proposals = get(registeredProposalsForSelectedAccount)
+    const proposals = get(registeredProposalsForSelectedWallet)
     const activeProposals = Object.values(proposals ?? {}).filter((proposal) => isProposalActive(proposal?.status))
     return activeProposals.length
 }
diff --git a/packages/shared/lib/contexts/governance/utils/getNumberOfTotalProposals.ts b/packages/shared/lib/contexts/governance/utils/getNumberOfTotalProposals.ts
index 6f0e5761e65..5975d43894f 100644
--- a/packages/shared/lib/contexts/governance/utils/getNumberOfTotalProposals.ts
+++ b/packages/shared/lib/contexts/governance/utils/getNumberOfTotalProposals.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
-import { registeredProposalsForSelectedAccount } from '../stores'
+import { registeredProposalsForSelectedWallet } from '../stores'
 
 export function getNumberOfTotalProposals(): number {
-    const proposals = get(registeredProposalsForSelectedAccount)
+    const proposals = get(registeredProposalsForSelectedWallet)
     return Object.keys(proposals ?? {}).length
 }
diff --git a/packages/shared/lib/contexts/governance/utils/getNumberOfVotedProposals.ts b/packages/shared/lib/contexts/governance/utils/getNumberOfVotedProposals.ts
index 0df224e7997..5ee7ec8c76f 100644
--- a/packages/shared/lib/contexts/governance/utils/getNumberOfVotedProposals.ts
+++ b/packages/shared/lib/contexts/governance/utils/getNumberOfVotedProposals.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store'
-import { participationOverviewForSelectedAccount } from '../stores'
+import { participationOverviewForSelectedWallet } from '../stores'
 
 export function getNumberOfVotedProposals(): number {
-    const overview = get(participationOverviewForSelectedAccount)
+    const overview = get(participationOverviewForSelectedWallet)
     if (!overview) {
         return undefined
     }
diff --git a/packages/shared/lib/contexts/governance/utils/getNumberOfVotingProposals.ts b/packages/shared/lib/contexts/governance/utils/getNumberOfVotingProposals.ts
index 4d491a6e0cd..2175b9eb090 100644
--- a/packages/shared/lib/contexts/governance/utils/getNumberOfVotingProposals.ts
+++ b/packages/shared/lib/contexts/governance/utils/getNumberOfVotingProposals.ts
@@ -1,11 +1,11 @@
 import { get } from 'svelte/store'
 
-import { participationOverviewForSelectedAccount } from '../stores'
+import { participationOverviewForSelectedWallet } from '../stores'
 
 import { isVotingForProposal } from './isVotingForProposal'
 
 export function getNumberOfVotingProposals(): number {
-    const overview = get(participationOverviewForSelectedAccount)
+    const overview = get(participationOverviewForSelectedWallet)
     if (!overview) {
         return undefined
     }
diff --git a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
index 6bb0881ee46..6a5115442b2 100644
--- a/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/getParticipationsForProposal.ts
@@ -3,12 +3,12 @@ import { get } from 'svelte/store'
 import type { ParticipationOverview, TrackedParticipationOverview } from '@iota/sdk/out/types'
 
 import { allParticipationOverviews } from '@contexts/governance/stores'
-import { selectedAccountIndex } from '@core/account/stores'
+import { selectedWalletId } from 'shared/lib/core/wallet'
 
 export function getParticipationsForProposal(
     proposalId: string,
-    accountIndex = get(selectedAccountIndex)
+    walletId = get(selectedWalletId)
 ): { [outputId: string]: TrackedParticipationOverview } {
-    const overview: ParticipationOverview = get(allParticipationOverviews)[accountIndex]
+    const overview: ParticipationOverview = get(allParticipationOverviews)[walletId]
     return overview?.participations?.[proposalId]
 }
diff --git a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
index 2365b071d57..b9169e12c47 100644
--- a/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
+++ b/packages/shared/lib/contexts/governance/utils/getVotingParticipationEventIds.ts
@@ -1,9 +1,6 @@
-import { get } from 'svelte/store'
-
 import { INode, ParticipationEventId, ParticipationEventType } from '@iota/sdk/out/types'
-
-import { selectedAccount } from '@core/account/stores'
+import { getSelectedWallet } from '@core/wallet'
 
 export function getVotingParticipationEventIds(node: INode): Promise<ParticipationEventId[]> | undefined {
-    return get(selectedAccount)?.getParticipationEventIds(node, ParticipationEventType.Voting)
+    return getSelectedWallet()?.getParticipationEventIds(node, ParticipationEventType.Voting)
 }
diff --git a/packages/shared/lib/contexts/governance/utils/index.ts b/packages/shared/lib/contexts/governance/utils/index.ts
index 84b0f0cc13b..fd4edd78a29 100644
--- a/packages/shared/lib/contexts/governance/utils/index.ts
+++ b/packages/shared/lib/contexts/governance/utils/index.ts
@@ -11,11 +11,11 @@ export * from './getParticipationsForProposal'
 export * from './getPercentagesFromAnswerStatuses'
 export * from './getVotingParticipationEventIds'
 export * from './getProposalStatusForMilestone'
-export * from './isAccountVoting'
+export * from './isWalletVoting'
 export * from './isParticipationOutput'
 export * from './isProposalActive'
 export * from './isProposalVotable'
-export * from './isProposalAlreadyAddedForSelectedAccount'
+export * from './isProposalAlreadyAddedForSelectedWallet'
 export * from './isValidProposalId'
 export * from './isVisibleProposal'
 export * from './isVotingForProposal'
diff --git a/packages/shared/lib/contexts/governance/utils/isProposalAlreadyAddedForSelectedAccount.ts b/packages/shared/lib/contexts/governance/utils/isProposalAlreadyAddedForSelectedAccount.ts
deleted file mode 100644
index 14d119d6256..00000000000
--- a/packages/shared/lib/contexts/governance/utils/isProposalAlreadyAddedForSelectedAccount.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { get } from 'svelte/store'
-import { registeredProposalsForSelectedAccount } from '../stores'
-
-export function isProposalAlreadyAddedForSelectedAccount(proposalId: string): boolean {
-    return !!get(registeredProposalsForSelectedAccount)?.[proposalId]
-}
diff --git a/packages/shared/lib/contexts/governance/utils/isProposalAlreadyAddedForSelectedWallet.ts b/packages/shared/lib/contexts/governance/utils/isProposalAlreadyAddedForSelectedWallet.ts
new file mode 100644
index 00000000000..2a2793de95d
--- /dev/null
+++ b/packages/shared/lib/contexts/governance/utils/isProposalAlreadyAddedForSelectedWallet.ts
@@ -0,0 +1,6 @@
+import { get } from 'svelte/store'
+import { registeredProposalsForSelectedWallet } from '../stores'
+
+export function isProposalAlreadyAddedForSelectedWallet(proposalId: string): boolean {
+    return !!get(registeredProposalsForSelectedWallet)?.[proposalId]
+}
diff --git a/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts b/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
index 870018c7cfa..8c95e100a8f 100644
--- a/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
+++ b/packages/shared/lib/contexts/governance/utils/isVotingForProposal.ts
@@ -1,10 +1,10 @@
 import { get } from 'svelte/store'
 import type { TrackedParticipationOverview } from '@iota/sdk/out/types'
-import { selectedAccountIndex } from '@core/account'
 import { getParticipationsForProposal } from './getParticipationsForProposal'
+import { selectedWalletId } from '@core/wallet'
 
-export function isVotingForProposal(proposalId: string, accountIndex = get(selectedAccountIndex)): boolean {
-    const participations = getParticipationsForProposal(proposalId, accountIndex) ?? {}
+export function isVotingForProposal(proposalId: string, walletId = get(selectedWalletId)): boolean {
+    const participations = getParticipationsForProposal(proposalId, walletId) ?? {}
     const participationOutputs: TrackedParticipationOverview[] = Object.values(participations)
     return participationOutputs.some((output) => output?.endMilestoneIndex === 0)
 }
diff --git a/packages/shared/lib/contexts/governance/utils/isAccountVoting.ts b/packages/shared/lib/contexts/governance/utils/isWalletVoting.ts
similarity index 76%
rename from packages/shared/lib/contexts/governance/utils/isAccountVoting.ts
rename to packages/shared/lib/contexts/governance/utils/isWalletVoting.ts
index 5be05129af5..e37c1cba0b1 100644
--- a/packages/shared/lib/contexts/governance/utils/isAccountVoting.ts
+++ b/packages/shared/lib/contexts/governance/utils/isWalletVoting.ts
@@ -2,8 +2,8 @@ import { get } from 'svelte/store'
 import { allParticipationOverviews } from '../stores'
 import { isVotingForProposal } from '@contexts/governance/utils/isVotingForProposal'
 
-export function isAccountVoting(accountIndex: number): boolean {
-    const overview = get(allParticipationOverviews)[accountIndex]
+export function isWalletVoting(walletId: string): boolean {
+    const overview = get(allParticipationOverviews)[walletId]
     const participations = overview?.participations ?? []
 
     for (const proposalId in participations) {
diff --git a/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts b/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts
index 0ba2bad0c48..050f1ab5820 100644
--- a/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/backupInitialStronghold.ts
@@ -2,10 +2,10 @@ import { get } from 'svelte/store'
 
 import { Platform } from '@core/app'
 import { InvalidBackupDestinationError } from '@core/profile'
-import { backup } from '@core/profile-manager'
 import { getDefaultStrongholdName } from '@core/stronghold'
 
 import { onboardingProfile, updateOnboardingProfile } from '../stores'
+import { backup } from '@core/wallet'
 
 /**
  * Creates an initial backup for a profile's Stronghold.
diff --git a/packages/shared/lib/contexts/onboarding/actions/claimShimmerRewards.ts b/packages/shared/lib/contexts/onboarding/actions/claimShimmerRewards.ts
index ece6ddd19ec..ddcd4e08c2b 100644
--- a/packages/shared/lib/contexts/onboarding/actions/claimShimmerRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/claimShimmerRewards.ts
@@ -7,11 +7,12 @@ import {
     NewTransactionType,
     NewTokenTransactionDetails,
     SubjectType,
+    getDepositAddress,
 } from '@core/wallet'
 import { logAndNotifyError } from '@core/error/actions'
 
-import { ShimmerClaimingAccountState } from '../enums'
-import { IShimmerClaimingAccount } from '../interfaces'
+import { ShimmerClaimingWalletState } from '../enums'
+import { IShimmerClaimingWallet } from '../interfaces'
 import {
     isOnboardingLedgerProfile,
     onboardingProfile,
@@ -19,9 +20,10 @@ import {
     updateShimmerClaimingAccount,
 } from '../stores'
 import { handleLedgerError } from '@core/ledger/utils'
-import { getDepositAddress } from '@core/account/utils'
 import { SHIMMER_CLAIM_DEFAULT_TRANSACTION_OPTIONS } from '../constants'
 
+// TODO(2.0) Fix this
+
 export async function claimShimmerRewards(): Promise<void> {
     const shimmerClaimingAccounts = get(onboardingProfile)?.shimmerClaimingAccounts
     const unclaimedShimmerClaimingAccounts =
@@ -30,19 +32,19 @@ export async function claimShimmerRewards(): Promise<void> {
 }
 
 async function claimShimmerRewardsForShimmerClaimingAccounts(
-    shimmerClaimingAccounts: IShimmerClaimingAccount[]
+    shimmerClaimingAccounts: IShimmerClaimingWallet[]
 ): Promise<void> {
     for (const shimmerClaimingAccount of shimmerClaimingAccounts) {
         try {
             updateShimmerClaimingAccount({
                 ...shimmerClaimingAccount,
-                state: ShimmerClaimingAccountState.Claiming,
+                state: ShimmerClaimingWalletState.Claiming,
             })
             await claimShimmerRewardsForShimmerClaimingAccount(shimmerClaimingAccount)
         } catch (err) {
             updateShimmerClaimingAccount({
                 ...shimmerClaimingAccount,
-                state: ShimmerClaimingAccountState.Failed,
+                state: ShimmerClaimingWalletState.Failed,
             })
             if (get(isOnboardingLedgerProfile)) {
                 handleLedgerError(err?.error ?? err)
@@ -60,7 +62,7 @@ async function claimShimmerRewardsForShimmerClaimingAccounts(
 }
 
 async function claimShimmerRewardsForShimmerClaimingAccount(
-    shimmerClaimingAccount: IShimmerClaimingAccount
+    shimmerClaimingAccount: IShimmerClaimingWallet
 ): Promise<void> {
     const recipientAddress = await getDepositAddress(shimmerClaimingAccount?.twinAccount)
     const rawAmount = shimmerClaimingAccount?.unclaimedRewards
@@ -96,7 +98,7 @@ async function claimShimmerRewardsForShimmerClaimingAccount(
          * display as "claiming" to user until it's updated
          * later by the transaction inclusion event handler.
          */
-        state: ShimmerClaimingAccountState.Claiming,
+        state: ShimmerClaimingWalletState.Claiming,
         claimingTransaction,
         claimedRewards,
         unclaimedRewards,
diff --git a/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfileManager.ts b/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfileManager.ts
index bd48627e29e..d5ed79b5478 100644
--- a/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfileManager.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/cleanupOnboardingProfileManager.ts
@@ -1,15 +1,14 @@
-import { get } from 'svelte/store'
-
-import { destroyProfileManager, profileManager } from '@core/profile-manager'
-import { removeProfileFolder } from '@core/profile'
+import { clearProfileFromMemory, removeProfileFolder } from '@core/profile'
+import { getSelectedWallet } from 'shared/lib/core/wallet'
 
+// TODO(2.0) Fix all usages and rename
 export async function cleanupOnboardingProfileManager(): Promise<void> {
-    if (!get(profileManager)) {
+    if (!getSelectedWallet()) {
         return
     }
 
-    const { id } = get(profileManager)
+    const { id } = getSelectedWallet()
 
-    await destroyProfileManager()
+    await clearProfileFromMemory()
     await removeProfileFolder(id)
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/clearStrongholdPasswordForOnboarding.ts b/packages/shared/lib/contexts/onboarding/actions/clearStrongholdPasswordForOnboarding.ts
index 51338291606..1f1293967f5 100644
--- a/packages/shared/lib/contexts/onboarding/actions/clearStrongholdPasswordForOnboarding.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/clearStrongholdPasswordForOnboarding.ts
@@ -1,12 +1,11 @@
+import { clearStrongholdPassword } from '@core/secret-manager'
 import { get } from 'svelte/store'
 
-import { clearStrongholdPassword } from '@core/profile-manager'
-
 import { onboardingProfile, updateOnboardingProfile } from '../stores'
 
 export async function clearStrongholdPasswordForOnboarding(): Promise<void> {
     if (get(onboardingProfile)?.strongholdPassword) {
         await clearStrongholdPassword()
-        updateOnboardingProfile({ strongholdPassword: null })
+        updateOnboardingProfile({ strongholdPassword: undefined })
     }
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts b/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
index 4bf3e411dd5..d3a449a52ab 100644
--- a/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/completeOnboardingProcess.ts
@@ -1,12 +1,13 @@
-import { activeProfile, login } from '@core/profile'
+import { activeProfile, activeWallets, addWalletPersistedDataToActiveProfile, createWallet, login } from '@core/profile'
 import { get } from 'svelte/store'
 import { OnboardingType } from '../enums'
-import { onboardingProfile } from '../stores'
+import { addWalletPersistedDataToOnboardingProfile, onboardingProfile } from '../stores'
 import { createNewProfileFromOnboardingProfile } from './createNewProfileFromOnboardingProfile'
 import { showBalanceOverviewPopup } from '@contexts/dashboard/stores'
-import { createNewAccount } from '@core/account'
+import { buildWalletStateAndPersistedData, createNewWallet, IWalletState } from '@core/wallet'
+import { localize } from '@core/i18n'
 
-export async function completeOnboardingProcess(): void {
+export async function completeOnboardingProcess(): Promise<void> {
     // if we already have an active profile
     // it means we are trying to load again after an error
     // and we don't need to add it again
@@ -17,8 +18,35 @@ export async function completeOnboardingProcess(): void {
     const onboardingType = get(onboardingProfile)?.onboardingType
     const shouldRecoverAccounts = onboardingType === OnboardingType.Restore || onboardingType === OnboardingType.Claim
     showBalanceOverviewPopup.set(shouldRecoverAccounts)
-    await createNewAccount()
+
+
+    await createOnboardingWallet()
+    
     void login({ isFromOnboardingFlow: true, shouldRecoverAccounts })
 
     onboardingProfile.set(undefined)
 }
+
+export async function createOnboardingWallet(name?: string, color?: string): Promise<IWalletState> {
+    // 1. Get the wallet name
+    const walletName = name || `${localize('general.account')} ${(get(activeWallets)?.length ?? 0) + 1}`;
+
+    // 2. Create the wallet instance
+    const wallet = await createWallet()
+
+    // 3. Sync the wallet with the Node
+    // TODO(2.0): test & fix sync when we have iota2.0 nodes
+    //await account.sync(DEFAULT_SYNC_OPTIONS)
+
+    // 4. Create a wrapper over the wallet instance and the persisted data
+    const [walletState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
+
+    // TODO(2.0) Fix
+    // addAccountToActiveAccounts(walletState)
+    addWalletPersistedDataToOnboardingProfile(walletState.id, accountPersistedData)
+    // TODO(2.0) Fix
+    // addEmptyAccountActivitiesToAllAccountActivities(walletState.id)
+
+
+    return walletState
+}
diff --git a/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts b/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts
index b64d522667a..a9a3bf66eb8 100644
--- a/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/createShimmerClaimingProfileManager.ts
@@ -1,12 +1,14 @@
 import { COIN_TYPE } from '@core/network/constants'
 import { NetworkId } from '@core/network/enums'
-import { getSecretManagerFromProfileType, initialiseProfileManager } from '@core/profile-manager'
 import { generateRandomId } from '@core/utils'
+import { getSecretManagerFromProfileType } from '@core/profile'
 import { get } from 'svelte/store'
 import { RestoreProfileType } from '../enums'
 import { getTemporaryProfileManagerStorageDirectory } from '../helpers'
 import { onboardingProfile, shimmerClaimingProfileManager } from '../stores'
 
+
+    // TODO(2.0): Fix all shimmer claiming and rename this
 export async function createShimmerClaimingProfileManager(): Promise<void> {
     const $onboardingProfile = get(onboardingProfile)
     if (!$onboardingProfile) {
diff --git a/packages/shared/lib/contexts/onboarding/actions/deleteOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/deleteOnboardingProfile.ts
index fd2435dc354..4787bc3504a 100644
--- a/packages/shared/lib/contexts/onboarding/actions/deleteOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/deleteOnboardingProfile.ts
@@ -1,7 +1,7 @@
-import { destroyProfileManager } from '@core/profile-manager'
 import { get } from 'svelte/store'
 import { onboardingProfile } from '../stores'
 import { removeProfileFolder } from '@core/profile/utils'
+import { clearProfileFromMemory } from '@core/profile'
 
 /**
  * Deletes a new profile
@@ -12,7 +12,7 @@ export async function deleteOnboardingProfile(): Promise<void> {
     const profile = get(onboardingProfile)
     if (profile) {
         try {
-            await destroyProfileManager()
+            await clearProfileFromMemory()
             await removeProfileFolder(profile.id)
         } catch (err) {
             console.error(err)
diff --git a/packages/shared/lib/contexts/onboarding/actions/destroyShimmerClaimingProfileManager.ts b/packages/shared/lib/contexts/onboarding/actions/destroyShimmerClaimingProfileManager.ts
index 126ea5f66ae..3ebf83d9b29 100644
--- a/packages/shared/lib/contexts/onboarding/actions/destroyShimmerClaimingProfileManager.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/destroyShimmerClaimingProfileManager.ts
@@ -1,17 +1,19 @@
 import { get } from 'svelte/store'
 
-import { destroyProfileManager } from '@core/profile-manager'
 import { Platform } from '@core/app'
 
 import { getTemporaryProfileManagerStorageDirectory } from '../helpers'
 import { shimmerClaimingProfileManager } from '../stores'
+import { clearProfileFromMemory } from '@core/profile/actions'
+
+// TODO(2.0) Fix this
 
 export async function destroyShimmerClaimingProfileManager(): Promise<void> {
     const _shimmerClaimingProfileManager = get(shimmerClaimingProfileManager)
     if (!_shimmerClaimingProfileManager) {
         return
     }
-    await destroyProfileManager(shimmerClaimingProfileManager)
+    await clearProfileFromMemory(shimmerClaimingProfileManager)
     const profilePath = await getTemporaryProfileManagerStorageDirectory()
     await Platform.removeProfileFolder(profilePath)
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/findShimmerRewards.ts b/packages/shared/lib/contexts/onboarding/actions/findShimmerRewards.ts
index 61b4f32fcbf..3ea5b563f73 100644
--- a/packages/shared/lib/contexts/onboarding/actions/findShimmerRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/findShimmerRewards.ts
@@ -1,9 +1,7 @@
 import { showAppNotification } from '@auxiliary/notification'
-import { IAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { updateLedgerNanoStatus } from '@core/ledger'
-import { AccountRecoveryProfileConfiguration, ProfileType, UnableToFindProfileTypeError } from '@core/profile'
-import { RecoverAccountsPayload, recoverAccounts } from '@core/profile-manager'
+import { AccountRecoveryProfileConfiguration, ProfileType, RecoverAccountsPayload, UnableToFindProfileTypeError } from '@core/profile'
 import { zip } from '@core/utils'
 import { formatTokenAmountBestMatch } from '@core/wallet/utils'
 import { get } from 'svelte/store'
@@ -92,6 +90,7 @@ async function depthSearchAndRecoverAccounts(): Promise<void> {
             addressStartIndexInternal: depthSearchAddressStartIndex,
         },
     }
+    // TODO(2.0) Fix this
     const depthSearchAccounts = await recoverAccounts(recoverAccountsPayload, shimmerClaimingProfileManager)
 
     await updateRecoveredAccounts(depthSearchAccounts)
@@ -139,6 +138,7 @@ function updateRewardsFinderParameters(): void {
     currentSearchRound++
 }
 
+// TODO(2.0) Fix this
 async function updateRecoveredAccounts(accounts: IAccount[]): Promise<void> {
     const boundAccounts = await getSortedRenamedBoundAccounts(accounts, shimmerClaimingProfileManager)
     const updatedTotalUnclaimedShimmerRewards = await sumTotalUnclaimedRewards(boundAccounts)
diff --git a/packages/shared/lib/contexts/onboarding/actions/generateMnemonicForOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/generateMnemonicForOnboardingProfile.ts
index c8df4f450f6..d3baa77574c 100644
--- a/packages/shared/lib/contexts/onboarding/actions/generateMnemonicForOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/generateMnemonicForOnboardingProfile.ts
@@ -1,10 +1,9 @@
-import { generateMnemonic } from '@core/profile-manager'
-
+import { api } from '@core/api'
 import { updateOnboardingProfile } from '../stores'
 import { Mnemonic } from '../types'
 
 export async function generateMnemonicForOnboardingProfile(): Promise<Mnemonic> {
-    const mnemonicString = await generateMnemonic()
+    const mnemonicString = await api.generateMnemonic()
     const mnemnonicList = mnemonicString?.split(' ')
     updateOnboardingProfile({ mnemonic: mnemnonicList })
     return mnemnonicList
diff --git a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
index 30a2f973a0d..cc94cf1cbb2 100644
--- a/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/handleTransactionInclusionEventForShimmerClaiming.ts
@@ -3,23 +3,21 @@ import { get } from 'svelte/store'
 import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
 
 import { localize } from '@core/i18n'
-import { validateWalletApiEvent } from '@core/profile-manager'
-import { InclusionState, MissingTransactionIdError } from '@core/wallet'
+import { InclusionState, MissingTransactionIdError, validateWalletApiEvent } from '@core/wallet'
 import { showAppNotification } from '@auxiliary/notification'
 
-import { ShimmerClaimingAccountState } from '../enums'
+import { ShimmerClaimingWalletState } from '../enums'
 import { MissingShimmerClaimingAccountError } from '../errors'
-import { IShimmerClaimingAccount } from '../interfaces'
+import { IShimmerClaimingWallet } from '../interfaces'
 import { onboardingProfile, shimmerClaimingTransactions, updateShimmerClaimingAccount } from '../stores'
 
+// TODO(2.0) Fix this
+
 export function handleTransactionInclusionEventForShimmerClaiming(error: Error, rawEvent: Event): void {
-    const { accountIndex, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionInclusion)
+    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionInclusion)
     const type = payload.type
     if (type === WalletEventType.TransactionInclusion) {
-        handleTransactionInclusionEventForShimmerClaimingInternal(
-            accountIndex,
-            payload as TransactionInclusionWalletEvent
-        )
+        handleTransactionInclusionEventForShimmerClaimingInternal(walletId, payload as TransactionInclusionWalletEvent)
     }
 }
 
@@ -38,7 +36,7 @@ export function handleTransactionInclusionEventForShimmerClaimingInternal(
             if (inclusionState === InclusionState.Confirmed) {
                 updateShimmerClaimingAccount({
                     ...shimmerClaimingAccount,
-                    state: ShimmerClaimingAccountState.FullyClaimed,
+                    state: ShimmerClaimingWalletState.FullyClaimed,
                 })
                 showAppNotification({
                     type: 'success',
@@ -69,12 +67,12 @@ export function handleTransactionInclusionEventForShimmerClaimingInternal(
 }
 
 function handleShimmerClaimingTransactionInclusionEventFailure(
-    shimmerClaimingAccount: IShimmerClaimingAccount,
+    shimmerClaimingAccount: IShimmerClaimingWallet,
     displayNotification = true
 ): void {
     updateShimmerClaimingAccount({
         ...shimmerClaimingAccount,
-        state: ShimmerClaimingAccountState.Failed,
+        state: ShimmerClaimingWalletState.Failed,
     })
     if (displayNotification) {
         showAppNotification({
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseFirstShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseFirstShimmerClaimingAccount.ts
index 4c2ad22b420..f24c3972a82 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseFirstShimmerClaimingAccount.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseFirstShimmerClaimingAccount.ts
@@ -1,7 +1,6 @@
-import { IAccount } from '@core/account'
 import { handleLedgerError } from '@core/ledger/utils'
-import { createAccount, getAccounts, profileManager } from '@core/profile-manager'
 import { sortAccountsByIndex, zip } from '@core/utils'
+import { createWallet, getWallets } from '@core/profile'
 import { get } from 'svelte/store'
 import { RestoreProfileType } from '../enums'
 import { CannotInitialiseShimmerClaimingAccountError, MissingShimmerClaimingProfileManagerError } from '../errors'
@@ -13,6 +12,7 @@ import {
     updateOnboardingProfile,
 } from '../stores'
 
+// TODO(2.0) Fix this
 export async function initialiseFirstShimmerClaimingAccount(): Promise<void> {
     if (!get(shimmerClaimingProfileManager)) {
         throw new MissingShimmerClaimingProfileManagerError()
@@ -26,14 +26,14 @@ export async function initialiseFirstShimmerClaimingAccount(): Promise<void> {
              * will NOT have any accounts, so we create one.
              */
             const shimmerClaimingAccount = await prepareShimmerClaimingAccount(
-                await createAccount({}, shimmerClaimingProfileManager),
-                await createAccount({}, profileManager)
+                await createWallet({}, shimmerClaimingProfileManager),
+                await createWallet({}, profileManager)
             )
             updateOnboardingProfile({ shimmerClaimingAccounts: [shimmerClaimingAccount] })
         } else if (restoreProfileType === RestoreProfileType.Stronghold) {
-            const accounts = await getAccounts(shimmerClaimingProfileManager)
+            const accounts = await getWallets(shimmerClaimingProfileManager)
             if (accounts?.length === 0) {
-                const account = await createAccount({}, shimmerClaimingProfileManager)
+                const account = await createWallet({}, shimmerClaimingProfileManager)
                 accounts.push(account)
             }
             accounts.sort(sortAccountsByIndex)
@@ -41,7 +41,7 @@ export async function initialiseFirstShimmerClaimingAccount(): Promise<void> {
             const twinAccounts = (
                 await Promise.all(
                     accounts.map((boundAccount) =>
-                        createAccount({ alias: boundAccount?.getMetadata()?.alias }, profileManager)
+                        createWallet({ alias: boundAccount?.getMetadata()?.alias }, profileManager)
                     )
                 )
             ).sort(sortAccountsByIndex)
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts
index db127e5499d..c0ca936d54d 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingFlow.ts
@@ -3,13 +3,13 @@ import { get } from 'svelte/store'
 import { stopPollingLedgerNanoStatus } from '@core/ledger/actions'
 import { isPollingLedgerDeviceStatus } from '@core/ledger/stores'
 import { getDefaultPersistedNetwork } from '@core/network/utils'
-import { destroyProfileManager, unsubscribeFromWalletApiEvents } from '@core/profile-manager/actions'
-import { resetActiveProfile } from '@core/profile/actions'
+import { clearProfileFromMemory, resetActiveProfile } from '@core/profile/actions'
 
 import { IOnboardingInitialisationOptions } from '../interfaces'
 import { updateOnboardingProfile } from '../stores'
 import { deleteOnboardingProfile } from './deleteOnboardingProfile'
 import { initialiseOnboardingProfile } from './initialiseOnboardingProfile'
+import { unsubscribeFromWalletApiEvents } from 'shared/lib/core/wallet'
 
 export async function initialiseOnboardingFlow(options: IOnboardingInitialisationOptions): Promise<void> {
     resetActiveProfile()
@@ -20,7 +20,7 @@ export async function initialiseOnboardingFlow(options: IOnboardingInitialisatio
         stopPollingLedgerNanoStatus()
     }
     await unsubscribeFromWalletApiEvents()
-    await destroyProfileManager()
+    await clearProfileFromMemory()
 
     const { isDeveloperProfile, networkId } = options
 
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
index d9be8aa7e1c..786ca6b4557 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseOnboardingProfile.ts
@@ -1,5 +1,5 @@
 import { stopPollingLedgerNanoStatus } from '@core/ledger'
-import { destroyProfileManager, profileManager } from '@core/profile-manager'
+import { clearProfileFromMemory } from '@core/profile'
 import { get } from 'svelte/store'
 import { OnboardingProfileManagerAlreadyInitializedError } from '../errors'
 import { buildInitialOnboardingProfile } from '../helpers'
@@ -12,12 +12,13 @@ export async function initialiseOnboardingProfile(
     isDeveloperProfile: boolean,
     destroyPreviousManager = false
 ): Promise<void> {
+    // TODO(2.0) Refactor this logic
     if (get(profileManager)) {
         if (destroyPreviousManager) {
             if (get(isOnboardingLedgerProfile)) {
                 stopPollingLedgerNanoStatus()
             }
-            await destroyProfileManager()
+            await clearProfileFromMemory()
         } else {
             throw new OnboardingProfileManagerAlreadyInitializedError()
         }
diff --git a/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
index b4672f674fc..351aaa8a4f5 100644
--- a/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/initialiseProfileManagerFromOnboardingProfile.ts
@@ -1,29 +1,30 @@
 import { get } from 'svelte/store'
 
-import {
-    buildProfileManagerOptionsFromProfileData,
-    initialiseProfileManager,
-    profileManager,
-} from '@core/profile-manager'
+import { onboardingProfileSecretManager } from '../stores'
 
+import { getSecretManagerFromProfileType, getStorageDirectoryOfProfile, removeProfileFolder } from '@core/profile'
 import { onboardingProfile, updateOnboardingProfile } from '../stores'
-import { removeProfileFolder } from '@core/profile'
-
-export async function initialiseProfileManagerFromOnboardingProfile(checkForExistingManager?: boolean): Promise<void> {
-    const existingManager = get(profileManager)
-    if (existingManager) {
-        if (!checkForExistingManager) {
-            await existingManager.destroy()
-            removeProfileFolder(existingManager.id)
+
+// TODO(2.0) Fix this, profile manager is gone
+export async function initialiseOnboardingProfileWithSecretManager(checkForExistingSecretManager?: boolean): Promise<void> {
+    const secretManager = get(onboardingProfileSecretManager)
+    const activeOnboardingProfile = get(onboardingProfile)
+
+    if (!activeOnboardingProfile) {
+        return
+    }
+
+    if (secretManager) {
+        if (!checkForExistingSecretManager) {
+            removeProfileFolder(activeOnboardingProfile.id)
         } else {
             return
         }
     }
 
-    const profileManagerOptions = await buildProfileManagerOptionsFromProfileData(get(onboardingProfile))
-    const { storagePath, coinType, clientOptions, secretManager } = profileManagerOptions
-    const { id } = get(onboardingProfile)
-    const manager = await initialiseProfileManager(id, storagePath, coinType, clientOptions, secretManager)
-    profileManager.set(manager)
-    updateOnboardingProfile({ hasInitialisedProfileManager: true })
+    const storagePath = await getStorageDirectoryOfProfile(activeOnboardingProfile.id)
+
+    const secretManagerOptions = getSecretManagerFromProfileType(activeOnboardingProfile.type, storagePath)
+
+    updateOnboardingProfile({ secretManagerOptions, hasInitialisedProfileManager: true })
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/migrateStrongholdFromOnboardingProfile.ts b/packages/shared/lib/contexts/onboarding/actions/migrateStrongholdFromOnboardingProfile.ts
index bc89a960054..7f44dcffe03 100644
--- a/packages/shared/lib/contexts/onboarding/actions/migrateStrongholdFromOnboardingProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/migrateStrongholdFromOnboardingProfile.ts
@@ -1,18 +1,18 @@
 import { get } from 'svelte/store'
 
-import { getStorageDirectoryOfProfile } from '@core/profile/utils'
-import { destroyProfileManager } from '@core/profile-manager/actions'
-import { api } from '@core/profile-manager/api'
-import { getSecretManagerPath } from '@core/profile-manager/utils'
+import { getSecretManagerPath, getStorageDirectoryOfProfile } from '@core/profile/utils'
 import { StrongholdVersion } from '@core/stronghold/enums'
 
 import { copyStrongholdFileToProfileDirectory } from '../helpers'
 import { onboardingProfile, updateOnboardingProfile } from '../stores'
-import { initialiseProfileManagerFromOnboardingProfile } from './initialiseProfileManagerFromOnboardingProfile'
+import { initialiseOnboardingProfileWithSeretManager } from './initialiseProfileManagerFromOnboardingProfile'
+import { api } from '@core/api'
+import { clearProfileFromMemory } from '@core/profile'
 
 export async function migrateStrongholdFromOnboardingProfile(password: string): Promise<void> {
     const profile = get(onboardingProfile)
     const profileDirectory = await getStorageDirectoryOfProfile(profile?.id)
+    // TODO(2.0) Update getSecretManagerPath
     const secretManagerPath = getSecretManagerPath(profileDirectory)
 
     await copyStrongholdFileToProfileDirectory(profileDirectory, profile?.importFilePath ?? '')
@@ -23,6 +23,6 @@ export async function migrateStrongholdFromOnboardingProfile(password: string):
         updateOnboardingProfile({ strongholdVersion: StrongholdVersion.V3 })
     }
 
-    await destroyProfileManager()
-    await initialiseProfileManagerFromOnboardingProfile()
+    await clearProfileFromMemory()
+    await initialiseOnboardingProfileWithSeretManager()
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/resetOnboardingProfileWithAlreadyStoredMnemonic.ts b/packages/shared/lib/contexts/onboarding/actions/resetOnboardingProfileWithAlreadyStoredMnemonic.ts
index 76d8916b273..280e684dcc9 100644
--- a/packages/shared/lib/contexts/onboarding/actions/resetOnboardingProfileWithAlreadyStoredMnemonic.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/resetOnboardingProfileWithAlreadyStoredMnemonic.ts
@@ -1,15 +1,14 @@
+import { setStrongholdPassword } from '@core/wallet'
 import { get } from 'svelte/store'
 
-import { setStrongholdPassword } from '@core/profile-manager'
-
 import { onboardingProfile, updateOnboardingProfile } from '../stores'
 
-import { initialiseProfileManagerFromOnboardingProfile } from './initialiseProfileManagerFromOnboardingProfile'
+import { initialiseOnboardingProfileWithSeretManager } from './initialiseProfileManagerFromOnboardingProfile'
 import { resetOnboardingProfile } from './resetOnboardingProfile'
 
 export async function resetOnboardingProfileWithAlreadyStoredMnemonic(): Promise<void> {
     await resetOnboardingProfile()
-    await initialiseProfileManagerFromOnboardingProfile()
+    await initialiseOnboardingProfileWithSeretManager()
     await setStrongholdPassword(get(onboardingProfile)?.strongholdPassword)
     updateOnboardingProfile({ hasStoredMnemonic: false })
 }
diff --git a/packages/shared/lib/contexts/onboarding/actions/restoreBackupForShimmerClaimingProfileManager.ts b/packages/shared/lib/contexts/onboarding/actions/restoreBackupForShimmerClaimingProfileManager.ts
index c337c17444f..71fca4d4f81 100644
--- a/packages/shared/lib/contexts/onboarding/actions/restoreBackupForShimmerClaimingProfileManager.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/restoreBackupForShimmerClaimingProfileManager.ts
@@ -1,5 +1,4 @@
 import { NetworkId } from '@core/network/enums'
-import { profileManager } from '@core/profile-manager'
 import { getStorageDirectoryOfProfile } from '@core/profile/utils'
 import { get } from 'svelte/store'
 import {
@@ -9,6 +8,7 @@ import {
 } from '../helpers'
 import { onboardingProfile, shimmerClaimingProfileManager } from '../stores'
 
+// TODO(2.0) Fix this
 export async function restoreBackupForShimmerClaimingProfileManager(strongholdPassword: string): Promise<void> {
     try {
         const { id, importFilePath, clientOptions } = get(onboardingProfile)
diff --git a/packages/shared/lib/contexts/onboarding/actions/restoreBackupFromStrongholdFile.ts b/packages/shared/lib/contexts/onboarding/actions/restoreBackupFromStrongholdFile.ts
index 4d8b756cb5a..1f70fb44bf7 100644
--- a/packages/shared/lib/contexts/onboarding/actions/restoreBackupFromStrongholdFile.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/restoreBackupFromStrongholdFile.ts
@@ -1,9 +1,10 @@
 import { getStorageDirectoryOfProfile } from '@core/profile'
-import { profileManager, restoreBackup } from '@core/profile-manager'
 import { get } from 'svelte/store'
 import { restoreBackupByCopyingFile } from '../helpers'
 import { onboardingProfile } from '../stores'
 
+// TODO(2.0) Fix this
+
 export async function restoreBackupFromStrongholdFile(strongholdPassword: string): Promise<void> {
     const { id, importFilePath, clientOptions, network } = get(onboardingProfile)
     try {
diff --git a/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts
index 09381f36a97..e18c5fac5b3 100644
--- a/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/subscribeToWalletApiEventsForShimmerClaiming.ts
@@ -1,12 +1,12 @@
 import { get } from 'svelte/store'
 import { WalletEventType } from '@iota/sdk/out/types'
 
-import { handleTransactionProgressEvent, subscribeToWalletApiEvents, WalletApiEventMap } from '@core/profile-manager'
-
 import { shimmerClaimingProfileManager } from '../stores'
 
 import { handleTransactionInclusionEventForShimmerClaiming } from './handleTransactionInclusionEventForShimmerClaiming'
+import { handleTransactionProgressEvent, subscribeToWalletApiEvents, WalletApiEventMap } from '@core/wallet'
 
+// TODO(2.0) Fix
 export function subscribeToWalletApiEventsForShimmerClaiming(): void {
     const profileManager = get(shimmerClaimingProfileManager)
     const eventMap: WalletApiEventMap = {
diff --git a/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
index ae003e641f0..9c65333fbc0 100644
--- a/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/syncShimmerClaimingAccount.ts
@@ -1,8 +1,6 @@
 import { get } from 'svelte/store'
 
 import { localize } from '@core/i18n'
-import { IAccount } from '@core/account'
-import { getAccount, profileManager } from '@core/profile-manager'
 
 import { MissingShimmerClaimingProfileManagerError } from '../errors'
 import { prepareShimmerClaimingAccount } from '../helpers'
@@ -10,15 +8,17 @@ import { getOnboardingBaseToken, shimmerClaimingProfileManager, updateShimmerCla
 import { setTotalUnclaimedShimmerRewards } from '@contexts/onboarding'
 import { formatTokenAmountBestMatch } from '@core/wallet/utils'
 import { showAppNotification } from '@auxiliary/notification'
+import { getWallet, IWallet } from 'shared/lib/core/profile'
 
-export async function syncShimmerClaimingAccount(account: IAccount): Promise<void> {
+// TODO(2.0) Fix
+export async function syncShimmerClaimingAccount(wallet: IWallet): Promise<void> {
     const _shimmerClaimingProfileManager = get(shimmerClaimingProfileManager)
     if (!_shimmerClaimingProfileManager) {
         throw new MissingShimmerClaimingProfileManagerError()
     }
-    const { index } = account?.getMetadata() ?? {}
-    const boundShimmerClaimingAccount = await getAccount(index, shimmerClaimingProfileManager)
-    const boundTwinAccount = await getAccount(index, profileManager)
+    const { index } = wallet?.getMetadata() ?? {} // TODO(2.0) Indexes are gone...
+    const boundShimmerClaimingAccount = await getWallet(index, shimmerClaimingProfileManager) // TODO(2.0) What should we be passing instead?
+    const boundTwinAccount = await getWallet(index, profileManager)
 
     const syncedShimmerClaimingAccount = await prepareShimmerClaimingAccount(
         boundShimmerClaimingAccount,
diff --git a/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts b/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
index 15e5a4c5b4a..e0191632e1c 100644
--- a/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
+++ b/packages/shared/lib/contexts/onboarding/actions/verifyAndStoreMnemonic.ts
@@ -1,4 +1,4 @@
-import { storeMnemonic, verifyMnemonic } from '@core/profile-manager'
+import { storeMnemonic, verifyMnemonic } from '@core/secret-manager'
 import { get } from 'svelte/store'
 import { onboardingProfile } from '../stores'
 
diff --git a/packages/shared/lib/contexts/onboarding/enums/shimmer-claiming-account-state.enum.ts b/packages/shared/lib/contexts/onboarding/enums/shimmer-claiming-account-state.enum.ts
index dbe1e8c11c4..c548bea10b1 100644
--- a/packages/shared/lib/contexts/onboarding/enums/shimmer-claiming-account-state.enum.ts
+++ b/packages/shared/lib/contexts/onboarding/enums/shimmer-claiming-account-state.enum.ts
@@ -1,4 +1,4 @@
-export enum ShimmerClaimingAccountState {
+export enum ShimmerClaimingWalletState {
     Claiming = 'claiming',
     Failed = 'failed',
     FullyClaimed = 'fullyClaimed',
diff --git a/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts b/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
index c1d94fef604..da8ded0b733 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/convertOnboardingProfileToPersistedProfile.ts
@@ -22,8 +22,8 @@ export function convertOnboardingProfileToPersistedProfile(
         }),
         ...(onboardingProfile?.isDeveloperProfile && { isDeveloperProfile: onboardingProfile.isDeveloperProfile }),
         ...(onboardingProfile?.hasVisitedDashboard && { hasVisitedDashboard: onboardingProfile.hasVisitedDashboard }),
-        ...(onboardingProfile?.lastUsedAccountIndex && {
-            lastUsedAccountIndex: onboardingProfile.lastUsedAccountIndex,
+        ...(onboardingProfile?.lastUsedWalletId && {
+            lastUsedAccountIndex: onboardingProfile.lastUsedWalletId,
         }),
         ...(onboardingProfile?.clientOptions && { clientOptions: onboardingProfile.clientOptions }),
     }
diff --git a/packages/shared/lib/contexts/onboarding/helpers/copyStrongholdFileToProfileDirectory.ts b/packages/shared/lib/contexts/onboarding/helpers/copyStrongholdFileToProfileDirectory.ts
index fa11d4f030d..10e70b7b395 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/copyStrongholdFileToProfileDirectory.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/copyStrongholdFileToProfileDirectory.ts
@@ -1,8 +1,10 @@
-import { getSecretManagerPath } from '@core/profile-manager'
 import { Platform } from '@core/app'
+import { getSecretManagerPath } from '@core/profile/utils'
 
 import { UnableToCopyStrongholdBackupFileError } from '../errors'
 
+// TODO(2.0) Fix getSecretManagerPath
+
 export async function copyStrongholdFileToProfileDirectory(
     profileDirectory: string,
     importFilePath: string
diff --git a/packages/shared/lib/contexts/onboarding/helpers/deriveShimmerClaimingAccountState.ts b/packages/shared/lib/contexts/onboarding/helpers/deriveShimmerClaimingAccountState.ts
deleted file mode 100644
index 7258d87f433..00000000000
--- a/packages/shared/lib/contexts/onboarding/helpers/deriveShimmerClaimingAccountState.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { ShimmerClaimingAccountState } from '../enums'
-
-export function deriveShimmerClaimingAccountState(
-    claimedRewards: number,
-    unclaimedRewards: number
-): ShimmerClaimingAccountState {
-    /**
-     * NOTE: The "Failed" state is NOT used here; only
-     * when the Shimmer claiming transaction fails, it is
-     * explicitly set then.
-     */
-    if (claimedRewards > 0) {
-        return unclaimedRewards > 0
-            ? ShimmerClaimingAccountState.PartiallyClaimed
-            : ShimmerClaimingAccountState.FullyClaimed
-    } else {
-        return unclaimedRewards > 0
-            ? ShimmerClaimingAccountState.UnclaimedWithRewards
-            : ShimmerClaimingAccountState.UnclaimedWithoutRewards
-    }
-}
diff --git a/packages/shared/lib/contexts/onboarding/helpers/deriveShimmerClaimingWalletState.ts b/packages/shared/lib/contexts/onboarding/helpers/deriveShimmerClaimingWalletState.ts
new file mode 100644
index 00000000000..e7dded3f275
--- /dev/null
+++ b/packages/shared/lib/contexts/onboarding/helpers/deriveShimmerClaimingWalletState.ts
@@ -0,0 +1,21 @@
+import { ShimmerClaimingWalletState } from '../enums'
+
+export function deriveShimmerClaimingWalletState(
+    claimedRewards: number,
+    unclaimedRewards: number
+): ShimmerClaimingWalletState {
+    /**
+     * NOTE: The "Failed" state is NOT used here; only
+     * when the Shimmer claiming transaction fails, it is
+     * explicitly set then.
+     */
+    if (claimedRewards > 0) {
+        return unclaimedRewards > 0
+            ? ShimmerClaimingWalletState.PartiallyClaimed
+            : ShimmerClaimingWalletState.FullyClaimed
+    } else {
+        return unclaimedRewards > 0
+            ? ShimmerClaimingWalletState.UnclaimedWithRewards
+            : ShimmerClaimingWalletState.UnclaimedWithoutRewards
+    }
+}
diff --git a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
index cdf705698c1..0cb2153a104 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/getSortedRenamedBoundAccounts.ts
@@ -1,12 +1,12 @@
 import { Writable } from 'svelte/store'
 
-import { getBoundAccount, IAccount } from '@core/account'
 import { localize } from '@core/i18n'
-import { IProfileManager, profileManager as _profileManager } from '@core/profile-manager'
 import { sortAccountsByIndex } from '@core/utils'
+import { IWallet } from 'shared/lib/core/profile'
 
+// TODO(2.0) Fix this, account indexes are gone
 export async function getSortedRenamedBoundAccounts(
-    accounts: IAccount[],
+    wallets: IWallet[],
     profileManager: Writable<IProfileManager> = _profileManager
 ): Promise<IAccount[]> {
     return (
diff --git a/packages/shared/lib/contexts/onboarding/helpers/index.ts b/packages/shared/lib/contexts/onboarding/helpers/index.ts
index 9a3efad8f34..8bb90181be3 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/index.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/index.ts
@@ -1,7 +1,7 @@
 export * from './buildInitialOnboardingProfile'
 export * from './convertOnboardingProfileToPersistedProfile'
 export * from './copyStrongholdFileToProfileDirectory'
-export * from './deriveShimmerClaimingAccountState'
+export * from './deriveShimmerClaimingWalletState'
 export * from './getSortedRenamedBoundAccounts'
 export * from './getTemporaryProfileManagerStorageDirectory'
 export * from './prepareShimmerClaimingAccount'
diff --git a/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts b/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
index 65037bad03c..1a7bb4ddc18 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/prepareShimmerClaimingAccount.ts
@@ -2,23 +2,27 @@ import { get } from 'svelte/store'
 
 import { Transaction } from '@iota/sdk/out/types'
 
-import { IAccount, sumTotalFromOutputs, syncAccountsInParallel, syncAccountsInSeries } from '@core/account'
 import { filterShimmerClaimingOutputs } from '@core/utils'
 
 import { SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS } from '../constants'
-import { ShimmerClaimingAccountState } from '../enums'
-import { IShimmerClaimingAccount } from '../interfaces'
+import { ShimmerClaimingWalletState } from '../enums'
+import { IShimmerClaimingWallet } from '../interfaces'
 import { isOnboardingLedgerProfile } from '../stores'
 
-import { deriveShimmerClaimingAccountState } from './deriveShimmerClaimingAccountState'
+import { deriveShimmerClaimingWalletState } from './deriveShimmerClaimingWalletState'
+import { IWallet } from '@core/profile'
+import { syncWalletsInSeries, syncWalletsInParallel } from '@core/wallet/utils'
+import { sumTotalFromOutputs } from '@core/wallet'
+
+// TODO(2.0) Fix code
 
 export async function prepareShimmerClaimingAccount(
-    account: IAccount,
-    twinAccount?: IAccount,
+    wallet: IWallet,
+    twinWallet?: IWallet,
     syncAccounts?: boolean,
-    state?: ShimmerClaimingAccountState,
+    state?: ShimmerClaimingWalletState,
     claimingTransaction?: Transaction
-): Promise<IShimmerClaimingAccount> {
+): Promise<IShimmerClaimingWallet> {
     if (syncAccounts) {
         if (get(isOnboardingLedgerProfile)) {
             /**
@@ -27,13 +31,13 @@ export async function prepareShimmerClaimingAccount(
              * the device from multiple profile managers at once),
              * we sync the accounts in series.
              */
-            await syncAccountsInSeries(SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS, account, twinAccount)
+            await syncWalletsInSeries(SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS, wallet, twinWallet)
         } else {
-            await syncAccountsInParallel(SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS, account, twinAccount)
+            await syncWalletsInParallel(SHIMMER_CLAIMING_ACCOUNT_SYNC_OPTIONS, wallet, twinWallet)
         }
     }
 
-    const twinUnspentOutputs = await twinAccount?.unspentOutputs()
+    const twinUnspentOutputs = await twinWallet?.unspentOutputs()
     const claimedRewards = sumTotalFromOutputs(twinUnspentOutputs)
 
     /**
@@ -43,7 +47,7 @@ export async function prepareShimmerClaimingAccount(
     const unspentOutputs = (await account?.unspentOutputs())?.filter(filterShimmerClaimingOutputs)
     const unclaimedRewards = sumTotalFromOutputs(unspentOutputs)
 
-    state = state ?? deriveShimmerClaimingAccountState(claimedRewards, unclaimedRewards)
+    state = state ?? deriveShimmerClaimingWalletState(claimedRewards, unclaimedRewards)
 
     return {
         ...account,
diff --git a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
index 5e691dd582d..7734eb5563e 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/restoreBackupByCopyingFile.ts
@@ -3,11 +3,11 @@ import { get, Writable } from 'svelte/store'
 import { IClientOptions } from '@iota/sdk/out/types'
 
 import { ClientError, CLIENT_ERROR_REGEXES } from '@core/error'
-import { IProfileManager } from '@core/profile-manager'
 
 import { copyStrongholdFileToProfileDirectory } from '../helpers'
 import { StrongholdMigrationRequiredError, UnableToRestoreBackupForProfileManagerError } from '../errors'
 
+// TODO(2.0) Fix this, profile manager is gone
 export async function restoreBackupByCopyingFile(
     importFilePath: string,
     storageDirectory: string,
diff --git a/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts b/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts
index beb49f543d7..64c62018c33 100644
--- a/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts
+++ b/packages/shared/lib/contexts/onboarding/helpers/validateStrongholdCoinType.ts
@@ -1,23 +1,18 @@
-import { localize } from '@core/i18n'
 import { COIN_TYPE, NetworkId } from '@core/network'
-import { createAccount, getAccounts, IProfileManager } from '@core/profile-manager'
-import { get, Writable } from 'svelte/store'
+import { getWallets } from 'shared/lib/core/profile'
+import { get } from 'svelte/store'
 import { OnboardingType } from '../enums'
 import { CannotRestoreWithMismatchedCoinTypeError } from '../errors'
 import { onboardingProfile } from '../stores'
 
+// Todo(2.0) Fix this
 export async function validateStrongholdCoinType(
-    profileManager: Writable<IProfileManager>,
     networkId: NetworkId
 ): Promise<void> {
-    const accounts = await getAccounts(profileManager)
-    if (accounts?.length === 0) {
-        const alias = `${localize('general.account')} 1`
-        const account = await createAccount({ alias }, profileManager)
-        accounts.push(account)
-    }
+    const wallets = await getWallets() // TODO (2.0) Should we be passing like a profile ID or something here?
 
-    if (accounts[0]?.getMetadata()?.coinType !== COIN_TYPE[networkId]) {
+    // TODO(2.0) Fix this
+    if (wallets[0]?.coinType !== COIN_TYPE[networkId]) {
         const isClaiming = get(onboardingProfile)?.onboardingType === OnboardingType.Claim
         throw new CannotRestoreWithMismatchedCoinTypeError(isClaiming)
     }
diff --git a/packages/shared/lib/contexts/onboarding/interfaces/onboarding-profile.interface.ts b/packages/shared/lib/contexts/onboarding/interfaces/onboarding-profile.interface.ts
index 965cf55bdf3..21114cb2a84 100644
--- a/packages/shared/lib/contexts/onboarding/interfaces/onboarding-profile.interface.ts
+++ b/packages/shared/lib/contexts/onboarding/interfaces/onboarding-profile.interface.ts
@@ -1,9 +1,12 @@
-import { IPersistedProfile } from '@core/profile'
+import { IPersistedProfile, ProfileType } from '@core/profile'
 import { CreateProfileType, OnboardingType, RestoreProfileType } from '../enums'
 import { ImportFile, Mnemonic } from '../types'
-import { IShimmerClaimingAccount } from './shimmer-claiming-account.interface'
+import { IShimmerClaimingWallet } from './shimmer-claiming-account.interface'
+
+export interface IOnboardingProfile extends Omit<Partial<IPersistedProfile>, 'id' | 'type'> {
+    id: string
+    type: ProfileType
 
-export interface IOnboardingProfile extends IPersistedProfile {
     // Onboarding flow indicators
     onboardingType?: OnboardingType
     createProfileType?: CreateProfileType
@@ -22,7 +25,7 @@ export interface IOnboardingProfile extends IPersistedProfile {
     strongholdPassword?: string
 
     // Shimmer claiming data
-    shimmerClaimingAccounts?: IShimmerClaimingAccount[]
+    shimmerClaimingAccounts?: IShimmerClaimingWallet[]
 
     hasInitialisedProfileManager?: boolean
 }
diff --git a/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts b/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
index 31b22a12bd7..7ff19afabbe 100644
--- a/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
+++ b/packages/shared/lib/contexts/onboarding/interfaces/shimmer-claiming-account.interface.ts
@@ -1,12 +1,11 @@
 import { Transaction } from '@iota/sdk/out/types'
+import { IWallet } from '@core/profile'
 
-import { IAccount } from '@core/account'
+import { ShimmerClaimingWalletState } from '../enums'
 
-import { ShimmerClaimingAccountState } from '../enums'
-
-export interface IShimmerClaimingAccount extends IAccount {
-    twinAccount: IAccount
-    state: ShimmerClaimingAccountState
+export interface IShimmerClaimingWallet extends IWallet {
+    twinAccount: IWallet
+    state: ShimmerClaimingWalletState
     claimedRewards: number
     unclaimedRewards: number
     claimingTransaction?: Transaction
diff --git a/packages/shared/lib/contexts/onboarding/stores/index.ts b/packages/shared/lib/contexts/onboarding/stores/index.ts
index d46fbb5aa00..d8a20c14a30 100644
--- a/packages/shared/lib/contexts/onboarding/stores/index.ts
+++ b/packages/shared/lib/contexts/onboarding/stores/index.ts
@@ -1,3 +1,4 @@
 export * from './onboarding-profile.store'
+export * from './onboarding-secret-manager.store'
 export * from './shimmer-claiming-profile-manager.store'
 export * from './shimmer-claiming-transactions.store'
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
index 05bb340800d..99401932818 100644
--- a/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
+++ b/packages/shared/lib/contexts/onboarding/stores/onboarding-profile.store.ts
@@ -2,11 +2,11 @@ import { derived, get, Readable, writable } from 'svelte/store'
 
 import { isLedgerProfile } from '@core/profile'
 
-import { IOnboardingProfile, IShimmerClaimingAccount } from '../interfaces'
-import { IBaseToken } from '@core/wallet/interfaces'
+import { IOnboardingProfile, IShimmerClaimingWallet } from '../interfaces'
+import { IBaseToken, IPersistedWalletData } from '@core/wallet/interfaces'
 import { IPersistedNetwork } from '@core/network'
 
-export const onboardingProfile = writable<Partial<IOnboardingProfile>>(null)
+export const onboardingProfile = writable<IOnboardingProfile | null>(null)
 
 export const isOnboardingLedgerProfile: Readable<boolean> = derived(onboardingProfile, ($onboardingProfile) =>
     isLedgerProfile($onboardingProfile?.type)
@@ -21,7 +21,7 @@ export function updateOnboardingProfile(payload: Partial<IOnboardingProfile>): v
     return onboardingProfile.update((state) => ({ ...state, ...payload }))
 }
 
-export function updateShimmerClaimingAccount(shimmerClaimingAccount: IShimmerClaimingAccount): void {
+export function updateShimmerClaimingAccount(shimmerClaimingAccount: IShimmerClaimingWallet): void {
     let shimmerClaimingAccounts = get(onboardingProfile)?.shimmerClaimingAccounts ?? []
     const claimingAccountIndex = shimmerClaimingAccount?.getMetadata()?.index
     const isNewShimmerClaimingAccount = !shimmerClaimingAccounts.some(
@@ -40,3 +40,16 @@ export function updateShimmerClaimingAccount(shimmerClaimingAccount: IShimmerCla
 export function getOnboardingBaseToken(): IBaseToken {
     return get(onboardingProfile)?.network?.baseToken
 }
+
+export function addWalletPersistedDataToOnboardingProfile(
+    walletId: string,
+    walletPersistedData: IPersistedWalletData
+): void {
+    onboardingProfile?.update((state) => {
+        if (!state?.accountPersistedData) {
+            state.accountPersistedData = {}
+        }
+        state.accountPersistedData[walletId] = walletPersistedData
+        return state
+    })
+}
diff --git a/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts
new file mode 100644
index 00000000000..9c2e996543c
--- /dev/null
+++ b/packages/shared/lib/contexts/onboarding/stores/onboarding-secret-manager.store.ts
@@ -0,0 +1,21 @@
+import { onboardingProfile } from '@contexts/onboarding/stores';
+import { api } from '@core/api';
+import { SecretManager } from '@iota/sdk';
+import { Readable, derived, get } from 'svelte/store';
+
+const onboardingProfileSecretManagerOptions = derived(onboardingProfile, (onboardingProfile) => onboardingProfile?.secretManagerOptions);
+
+export const onboardingProfileSecretManager: Readable<SecretManager | null> = derived(onboardingProfileSecretManagerOptions, (onboardingProfileSecretManagerOptions, set) => {
+    if (onboardingProfileSecretManagerOptions) {
+        api.createSecretManager(onboardingProfileSecretManagerOptions)
+            .then((secretManager) => {
+                set(secretManager)
+            })
+    } else {
+        set(null)
+    }
+})
+
+export function isOnboardingSecretManagerInitialized(): boolean {
+    return !!get(onboardingProfileSecretManager)
+}
diff --git a/packages/shared/lib/contexts/onboarding/stores/shimmer-claiming-profile-manager.store.ts b/packages/shared/lib/contexts/onboarding/stores/shimmer-claiming-profile-manager.store.ts
index 6d74bb8cc5f..dc4af20f5a3 100644
--- a/packages/shared/lib/contexts/onboarding/stores/shimmer-claiming-profile-manager.store.ts
+++ b/packages/shared/lib/contexts/onboarding/stores/shimmer-claiming-profile-manager.store.ts
@@ -1,5 +1,4 @@
 import { writable } from 'svelte/store'
 
-import { IProfileManager } from '@core/profile-manager'
-
+// TODO(2.0) Fix this
 export const shimmerClaimingProfileManager = writable<IProfileManager>(null)
diff --git a/packages/shared/lib/contexts/onboarding/utils/canUserClaimRewards.ts b/packages/shared/lib/contexts/onboarding/utils/canUserClaimRewards.ts
index 3e8c38218da..1c90bfb521b 100644
--- a/packages/shared/lib/contexts/onboarding/utils/canUserClaimRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/canUserClaimRewards.ts
@@ -1,12 +1,12 @@
-import { IShimmerClaimingAccount, ShimmerClaimingAccountState } from '@contexts/onboarding'
+import { IShimmerClaimingWallet, ShimmerClaimingWalletState } from '@contexts/onboarding'
 
-export function canUserClaimRewards(shimmerClaimingAccounts: IShimmerClaimingAccount[]): boolean {
+export function canUserClaimRewards(shimmerClaimingAccounts: IShimmerClaimingWallet[]): boolean {
     return shimmerClaimingAccounts?.some((shimmerClaimingAccount) => {
         const { state } = shimmerClaimingAccount
         return (
-            state === ShimmerClaimingAccountState.UnclaimedWithRewards ||
-            state === ShimmerClaimingAccountState.PartiallyClaimed ||
-            state === ShimmerClaimingAccountState.Failed
+            state === ShimmerClaimingWalletState.UnclaimedWithRewards ||
+            state === ShimmerClaimingWalletState.PartiallyClaimed ||
+            state === ShimmerClaimingWalletState.Failed
         )
     })
 }
diff --git a/packages/shared/lib/contexts/onboarding/utils/canUserRecoverFromShimmerClaiming.ts b/packages/shared/lib/contexts/onboarding/utils/canUserRecoverFromShimmerClaiming.ts
index 878138fc589..cd466029e26 100644
--- a/packages/shared/lib/contexts/onboarding/utils/canUserRecoverFromShimmerClaiming.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/canUserRecoverFromShimmerClaiming.ts
@@ -1,11 +1,11 @@
-import { IShimmerClaimingAccount, ShimmerClaimingAccountState } from '@contexts/onboarding'
+import { IShimmerClaimingWallet, ShimmerClaimingWalletState } from '@contexts/onboarding'
 
-export function canUserRecoverFromShimmerClaiming(shimmerClaimingAccounts: IShimmerClaimingAccount[]): boolean {
+export function canUserRecoverFromShimmerClaiming(shimmerClaimingAccounts: IShimmerClaimingWallet[]): boolean {
     return shimmerClaimingAccounts?.every((shimmerClaimingAccount) => {
         const { state } = shimmerClaimingAccount
         return (
-            state === ShimmerClaimingAccountState.UnclaimedWithoutRewards ||
-            state === ShimmerClaimingAccountState.FullyClaimed
+            state === ShimmerClaimingWalletState.UnclaimedWithoutRewards ||
+            state === ShimmerClaimingWalletState.FullyClaimed
         )
     })
 }
diff --git a/packages/shared/lib/contexts/onboarding/utils/hasUserClaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/hasUserClaimedRewards.ts
index e6c11c046dd..d6c9ea07c64 100644
--- a/packages/shared/lib/contexts/onboarding/utils/hasUserClaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/hasUserClaimedRewards.ts
@@ -1,12 +1,12 @@
-import { IShimmerClaimingAccount, ShimmerClaimingAccountState } from '@contexts/onboarding'
+import { IShimmerClaimingWallet, ShimmerClaimingWalletState } from '@contexts/onboarding'
 
-export function hasUserClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingAccount[]): boolean {
+export function hasUserClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingWallet[]): boolean {
     let hasAtLeastOneClaimingTransaction = false
     const hasClaimedAllRewards = shimmerClaimingAccounts.every((shimmerClaimingAccount) => {
         const { state, claimingTransaction } = shimmerClaimingAccount
-        if (state === ShimmerClaimingAccountState.UnclaimedWithoutRewards) {
+        if (state === ShimmerClaimingWalletState.UnclaimedWithoutRewards) {
             return true
-        } else if (state === ShimmerClaimingAccountState.FullyClaimed) {
+        } else if (state === ShimmerClaimingWalletState.FullyClaimed) {
             if (claimingTransaction) {
                 /**
                  * NOTE: This side effect is here to avoid iterating more than once in
diff --git a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
index 5d3082bb4a8..5273cdd18e3 100644
--- a/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/sumTotalClaimedRewards.ts
@@ -1,11 +1,11 @@
 import { tryNumberOrZero } from '@core/utils'
 
-import { IShimmerClaimingAccount } from '../interfaces'
+import { IShimmerClaimingWallet } from '../interfaces'
 import { Output, RegularTransactionEssence } from '@iota/sdk/out/types'
 
-export function sumTotalClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingAccount[]): number {
+export function sumTotalClaimedRewards(shimmerClaimingAccounts: IShimmerClaimingWallet[]): number {
     return shimmerClaimingAccounts?.reduce(
-        (total: number, curr: IShimmerClaimingAccount) =>
+        (total: number, curr: IShimmerClaimingWallet) =>
             total +
             tryNumberOrZero(
                 (curr?.claimingTransaction?.payload?.essence as RegularTransactionEssence).outputs?.reduce(
diff --git a/packages/shared/lib/contexts/onboarding/utils/sumTotalUnclaimedRewards.ts b/packages/shared/lib/contexts/onboarding/utils/sumTotalUnclaimedRewards.ts
index 27db100f8ff..0658266fd50 100644
--- a/packages/shared/lib/contexts/onboarding/utils/sumTotalUnclaimedRewards.ts
+++ b/packages/shared/lib/contexts/onboarding/utils/sumTotalUnclaimedRewards.ts
@@ -1,11 +1,12 @@
-import { IAccount, sumTotalFromOutputs } from '@core/account'
 import { filterShimmerClaimingOutputs } from '@core/utils'
+import { IWallet } from '@core/profile'
+import { sumTotalFromOutputs } from '@core/wallet/utils'
 
-export async function sumTotalUnclaimedRewards(accounts: IAccount[]): Promise<number> {
+export async function sumTotalUnclaimedRewards(wallets: IWallet[]): Promise<number> {
     let totalUnclaimedRewards = 0
 
-    for (const account of accounts) {
-        const unspentOutputs = (await account?.unspentOutputs())?.filter(filterShimmerClaimingOutputs)
+    for (const wallet of wallets) {
+        const unspentOutputs = (await wallet?.unspentOutputs())?.filter(filterShimmerClaimingOutputs)
         totalUnclaimedRewards += sumTotalFromOutputs(unspentOutputs)
     }
 
diff --git a/packages/shared/lib/contexts/settings/actions/exportStronghold.ts b/packages/shared/lib/contexts/settings/actions/exportStronghold.ts
index fb2fc0e7661..ccbc39b7ec6 100644
--- a/packages/shared/lib/contexts/settings/actions/exportStronghold.ts
+++ b/packages/shared/lib/contexts/settings/actions/exportStronghold.ts
@@ -1,7 +1,7 @@
 import { updateActiveProfile } from '@core/profile'
-import { backup } from '@core/profile-manager'
 import { Platform } from '@core/app'
 import { getDefaultStrongholdName } from '@core/stronghold'
+import { backup } from '@core/wallet/actions'
 
 export async function exportStronghold(
     password: string,
diff --git a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-outputs.store.ts b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-outputs.store.ts
index 20cb99ac254..cb6165d12c4 100644
--- a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-outputs.store.ts
+++ b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-outputs.store.ts
@@ -1,13 +1,14 @@
-import { selectedAccount } from '@core/account/stores'
+import { selectedWallet } from '@core/wallet/stores/selected-wallet.store'
 import { Readable, derived } from 'svelte/store'
 import { AddressWithVestingOutputs } from '../interfaces'
 import { getVestingType, isVestingOutput, mapBasicOutputToVestingOutput, sortVestingOutputs } from '../utils'
 
-export const selectedAccountVestingOutputs: Readable<AddressWithVestingOutputs[]> = derived(
-    selectedAccount,
-    ($selectedAccount) => {
+// TODO(2.0) Fix this and all usages
+export const selectedWalletVestingOutputs: Readable<AddressWithVestingOutputs[]> = derived(
+    selectedWallet,
+    ($selectedWallet) => {
         const addressesWithVestingOutputs =
-            $selectedAccount?.addressesWithOutputs?.filter((addressWithOutputs) =>
+            $selectedWallet?.addressesWithOutputs?.filter((addressWithOutputs) =>
                 addressWithOutputs.outputs?.find(isVestingOutput)
             ) ?? []
         return addressesWithVestingOutputs.map((addressWithOutputs) => {
diff --git a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-overview.store.ts b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-overview.store.ts
index 2281b4a600c..858954c7fc5 100644
--- a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-overview.store.ts
+++ b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-overview.store.ts
@@ -2,18 +2,18 @@ import { Readable, derived } from 'svelte/store'
 import NEW_SUPPLY_IOTA_STARDUST from '../assets/new_supply_iota_stardust.json'
 import { VestingOutputStatus } from '../enums'
 import { IRewardsPerAddresses, IVestingOverview } from '../interfaces'
-import { selectedAccountVestingOutputs, selectedAccountVestingPayouts } from './'
+import { selectedWalletVestingOutputs, selectedWalletVestingPayouts } from './'
 
-export const selectedAccountVestingOverview: Readable<IVestingOverview> = derived(
-    [selectedAccountVestingPayouts, selectedAccountVestingOutputs],
-    ([$selectedAccountVestingPayouts, $selectedAccountVestingOutputs]) => {
+export const selectedWalletVestingOverview: Readable<IVestingOverview> = derived(
+    [selectedWalletVestingPayouts, selectedWalletVestingOutputs],
+    ([$selectedWalletVestingPayouts, $selectedWalletVestingOutputs]) => {
         const remainingPayout =
-            $selectedAccountVestingPayouts?.reduce(
+            $selectedWalletVestingPayouts?.reduce(
                 (acc, { totalAmount, status }) => (status === VestingOutputStatus.Locked ? acc + totalAmount : acc),
                 0
             ) ?? 0
         // get the total rewards from the snapshot file
-        const vestingAddresses = $selectedAccountVestingOutputs?.map(({ address }) => address) ?? []
+        const vestingAddresses = $selectedWalletVestingOutputs?.map(({ address }) => address) ?? []
         let rewardsPerAddresses: IRewardsPerAddresses[] =
             vestingAddresses.map((address) => {
                 const amount = (NEW_SUPPLY_IOTA_STARDUST as { [address: string]: string })?.[address] ?? '0'
@@ -27,7 +27,7 @@ export const selectedAccountVestingOverview: Readable<IVestingOverview> = derive
             // if the total rewards are 0, we can't calculate the accumulated payout so we estimate it
             // this is a dev only solution that affects addresses that are not in the new supply snapshot
             const accumulatedScheduledPayout =
-                $selectedAccountVestingPayouts?.reduce(
+                $selectedWalletVestingPayouts?.reduce(
                     (acc, { totalAmount, status }) =>
                         status === VestingOutputStatus.Unlocked ? acc + totalAmount : acc,
                     0
@@ -35,7 +35,7 @@ export const selectedAccountVestingOverview: Readable<IVestingOverview> = derive
             // note: we add the initial payout to the total rewards, 10% of the total rewards are paid out immediately
             totalRewards = ((accumulatedScheduledPayout + remainingPayout) * 100) / 90
             rewardsPerAddresses = vestingAddresses.map((vestingAddress) => {
-                const amountsPerAddress = $selectedAccountVestingPayouts.map(({ amounts }) =>
+                const amountsPerAddress = $selectedWalletVestingPayouts.map(({ amounts }) =>
                     amounts.find(({ address }) => address === vestingAddress)
                 )
                 const totalAmount =
diff --git a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-payouts.store.ts b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-payouts.store.ts
index 462f145fcf8..02522b46f39 100644
--- a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-payouts.store.ts
+++ b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-payouts.store.ts
@@ -1,23 +1,23 @@
 import { Readable, derived } from 'svelte/store'
-import { selectedAccountVestingOutputs } from '.'
+import { selectedWalletVestingOutputs } from '.'
 import { STAKER_VESTING_DURATION, VESTING_PAYOUTS_IN_1_YEAR, VESTING_PAYOUT_SCHEDULE_MILLISECONDS } from '../constants'
 import { VestingOutputStatus, VestingType } from '../enums'
 import { IVestingPayout } from '../interfaces'
 import { getTotalVestingPayouts } from '../utils'
 
-export const selectedAccountVestingPayouts: Readable<IVestingPayout[]> = derived(
-    selectedAccountVestingOutputs,
-    ($selectedAccountVestingOutputs) => {
+export const selectedWalletVestingPayouts: Readable<IVestingPayout[]> = derived(
+    selectedWalletVestingOutputs,
+    ($selectedWalletVestingOutputs) => {
         const now = new Date()
         const payouts: IVestingPayout[] = []
-        if ($selectedAccountVestingOutputs?.length) {
+        if ($selectedWalletVestingOutputs?.length) {
             // Calculate the total number of vesting payouts
             const numberOfPayouts = getTotalVestingPayouts()
             // Find the latest unlock time among the selected account vesting outputs
             // This is used to calculate the unlock time for each payout
             const lastUnlockTime = new Date(
                 Math.max(
-                    ...$selectedAccountVestingOutputs.map(({ lastOutput }) => lastOutput?.unlockTime?.getTime() ?? 0)
+                    ...$selectedWalletVestingOutputs.map(({ lastOutput }) => lastOutput?.unlockTime?.getTime() ?? 0)
                 )
             )
             if (numberOfPayouts && lastUnlockTime) {
@@ -25,9 +25,9 @@ export const selectedAccountVestingPayouts: Readable<IVestingPayout[]> = derived
                 for (let i = 0; i < numberOfPayouts; i++) {
                     // If the payout is in the staking years, include all vesting outputs
                     // If the payout is in the vesting only years, include only investor vesting outputs
-                    let addressSetToCompute = $selectedAccountVestingOutputs
+                    let addressSetToCompute = $selectedWalletVestingOutputs
                     if (i >= VESTING_PAYOUTS_IN_1_YEAR * STAKER_VESTING_DURATION) {
-                        addressSetToCompute = $selectedAccountVestingOutputs.filter(
+                        addressSetToCompute = $selectedWalletVestingOutputs.filter(
                             ({ type }) => type === VestingType.Investor
                         )
                     }
diff --git a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-unclaimed-funds.store.ts b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-unclaimed-funds.store.ts
index 7d1afb53945..ad2f1bbbee7 100644
--- a/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-unclaimed-funds.store.ts
+++ b/packages/shared/lib/contexts/vesting/stores/selected-account-vesting-unclaimed-funds.store.ts
@@ -1,12 +1,12 @@
 import { derived, Readable } from 'svelte/store'
-import { selectedAccountVestingOutputs } from '.'
+import { selectedWalletVestingOutputs } from '.'
 import { IVestingOutput } from '../interfaces'
 import { isVestingOutputTimeLocked } from '../utils'
 
-export const selectedAccountVestingUnclaimedFunds: Readable<number> = derived(
-    selectedAccountVestingOutputs,
-    ($selectedAccountVestingOutputs) => {
-        const allVestingOutputs = $selectedAccountVestingOutputs.flatMap(({ outputs }) => outputs) ?? []
+export const selectedWalletVestingUnclaimedFunds: Readable<number> = derived(
+    selectedWalletVestingOutputs,
+    ($selectedWalletVestingOutputs) => {
+        const allVestingOutputs = $selectedWalletVestingOutputs.flatMap(({ outputs }) => outputs) ?? []
         const unclaimedOutputs = allVestingOutputs.filter(
             (output) => !isVestingOutputTimeLocked(output) && !output.isSpent
         )
diff --git a/packages/shared/lib/contexts/vesting/utils/getTotalVestingPayouts.ts b/packages/shared/lib/contexts/vesting/utils/getTotalVestingPayouts.ts
index 542e2a42b07..d6e44f4ae42 100644
--- a/packages/shared/lib/contexts/vesting/utils/getTotalVestingPayouts.ts
+++ b/packages/shared/lib/contexts/vesting/utils/getTotalVestingPayouts.ts
@@ -1,15 +1,15 @@
 import { get } from 'svelte/store'
 import { INVESTOR_VESTING_DURATION, STAKER_VESTING_DURATION, VESTING_PAYOUTS_IN_1_YEAR } from '../constants'
 import { VestingType } from '../enums'
-import { selectedAccountVestingOutputs } from '../stores'
+import { selectedWalletVestingOutputs } from '../stores'
 
 export function getTotalVestingPayouts(): number {
-    const $selectedAccountVestingOutputs = get(selectedAccountVestingOutputs)
-    if (!$selectedAccountVestingOutputs?.length) {
+    const $selectedWalletVestingOutputs = get(selectedWalletVestingOutputs)
+    if (!$selectedWalletVestingOutputs?.length) {
         return 0
     } else {
         let vestingType = VestingType.Staker
-        if ($selectedAccountVestingOutputs.find(({ type }) => type === VestingType.Investor)) {
+        if ($selectedWalletVestingOutputs.find(({ type }) => type === VestingType.Investor)) {
             vestingType = VestingType.Investor
         }
         const vestingDuration = vestingType === VestingType.Staker ? STAKER_VESTING_DURATION : INVESTOR_VESTING_DURATION
diff --git a/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts b/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts
deleted file mode 100644
index 50c8f76e241..00000000000
--- a/packages/shared/lib/core/account/actions/buildAccountStateAndPersistedData.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { localize } from '@core/i18n'
-import { IAccount, IAccountState, IPersistedAccountData } from '../interfaces'
-import { getRandomAccountColor } from '../utils'
-import { buildAccountState } from './buildAccountState'
-
-export async function buildAccountStateAndPersistedData(
-    account: IAccount,
-    name?: string,
-    color?: string
-): Promise<[IAccountState, IPersistedAccountData]> {
-    const index = 0; // TODO: CHANGE THIS
-    const persistedAccountData: IPersistedAccountData = {
-        name: name || `${localize('general.account')} ${index + 1}`,
-        color: color || getRandomAccountColor(),
-        hidden: false,
-        shouldRevote: false,
-    }
-    const accountState = await buildAccountState(account, persistedAccountData)
-    return [accountState, persistedAccountData]
-}
diff --git a/packages/shared/lib/core/account/actions/createNewAccount.ts b/packages/shared/lib/core/account/actions/createNewAccount.ts
deleted file mode 100644
index 4ddb4671d79..00000000000
--- a/packages/shared/lib/core/account/actions/createNewAccount.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { localize } from '@core/i18n'
-import { activeAccounts, addAccountPersistedDataToActiveProfile, addAccountToActiveAccounts } from '@core/profile'
-import { createAccount } from '@core/profile-manager'
-import { addEmptyAccountActivitiesToAllAccountActivities } from '@core/wallet/stores'
-import { get } from 'svelte/store'
-
-import { DEFAULT_SYNC_OPTIONS } from '../constants'
-import { IAccountState } from '../interfaces'
-
-import { buildAccountStateAndPersistedData } from './buildAccountStateAndPersistedData'
-
-export async function createNewAccount(name?: string, color?: string): Promise<IAccountState> {
-    const account = await createAccount({
-        alias: name || `${localize('general.account')} ${(get(activeAccounts)?.length ?? 0) + 1}`,
-    })
-
-    //await account.sync(DEFAULT_SYNC_OPTIONS)
-   
-
-    const [newAccount, accountPersistedData] = await buildAccountStateAndPersistedData(account, name, color)
-    
-    const accountIndex = 0 // TODO: CHANGE THIS
-   
-    addAccountToActiveAccounts(newAccount)
-    addAccountPersistedDataToActiveProfile(accountIndex, accountPersistedData)
-    addEmptyAccountActivitiesToAllAccountActivities(accountIndex)
- 
-
-    return newAccount
-}
diff --git a/packages/shared/lib/core/account/actions/index.ts b/packages/shared/lib/core/account/actions/index.ts
deleted file mode 100644
index f06ad973da5..00000000000
--- a/packages/shared/lib/core/account/actions/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './buildAccountState'
-export * from './buildAccountStateAndPersistedData'
-export * from './createNewAccount'
-export * from './loadAccount'
-export * from './resetSelectedAccountIndex'
-export * from './setNextSelectedAccount'
-export * from './setSelectedAccount'
-export * from './syncBalance'
-export * from './syncVotingPower'
-export * from './tryCreateAdditionalAccount'
-export * from './getAddressesWithOutputs'
-export * from './findBalances'
diff --git a/packages/shared/lib/core/account/actions/loadAccount.ts b/packages/shared/lib/core/account/actions/loadAccount.ts
deleted file mode 100644
index a3b0314559f..00000000000
--- a/packages/shared/lib/core/account/actions/loadAccount.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { addAccountPersistedDataToActiveProfile, getActiveProfilePersistedAccountData } from '@core/profile'
-import { DEFAULT_SYNC_OPTIONS } from '../constants'
-import { IAccount, IAccountState } from '../interfaces'
-import { buildAccountState } from './buildAccountState'
-import { buildAccountStateAndPersistedData } from './buildAccountStateAndPersistedData'
-
-export async function loadAccount(account: IAccount): Promise<IAccountState> {
-    // Temporary sync on load until we enable background sync and event listeners
-    const accountIndex = account.getMetadata().index
-    const addresses = await account.addresses()
-    await account.sync({ ...DEFAULT_SYNC_OPTIONS, addresses: addresses.map((a) => a.address) })
-    const accountPersistedData = getActiveProfilePersistedAccountData(accountIndex)
-    let accountState: IAccountState
-    if (accountPersistedData) {
-        accountState = await buildAccountState(account, accountPersistedData)
-    } else {
-        const [newAccountState, accountPersistedData] = await buildAccountStateAndPersistedData(account)
-        addAccountPersistedDataToActiveProfile(accountIndex, accountPersistedData)
-        accountState = newAccountState
-    }
-    return accountState
-}
diff --git a/packages/shared/lib/core/account/actions/resetSelectedAccountIndex.ts b/packages/shared/lib/core/account/actions/resetSelectedAccountIndex.ts
deleted file mode 100644
index 209b786e789..00000000000
--- a/packages/shared/lib/core/account/actions/resetSelectedAccountIndex.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { selectedAccountIndex } from '../stores'
-
-export function resetSelectedAccountIndex(): void {
-    selectedAccountIndex.set(null)
-}
diff --git a/packages/shared/lib/core/account/actions/setNextSelectedAccount.ts b/packages/shared/lib/core/account/actions/setNextSelectedAccount.ts
deleted file mode 100644
index 83cda7cd429..00000000000
--- a/packages/shared/lib/core/account/actions/setNextSelectedAccount.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { selectedAccount, setSelectedAccount } from '@core/account'
-import { nonHiddenActiveAccounts } from '@core/profile'
-import { get } from 'svelte/store'
-
-export function setNextSelectedAccount(): void {
-    const account = get(selectedAccount)
-    const otherAccounts = get(nonHiddenActiveAccounts)
-    if (otherAccounts.length > 0) {
-        if (account?.hidden) {
-            const nextSelectedAccountIndex =
-                otherAccounts[account?.index]?.index ?? otherAccounts[otherAccounts?.length - 1]?.index
-            setSelectedAccount(nextSelectedAccountIndex)
-        }
-    } else {
-        throw new Error('No accounts to select from')
-    }
-}
diff --git a/packages/shared/lib/core/account/actions/setSelectedAccount.ts b/packages/shared/lib/core/account/actions/setSelectedAccount.ts
deleted file mode 100644
index 9b04b379a16..00000000000
--- a/packages/shared/lib/core/account/actions/setSelectedAccount.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { get } from 'svelte/store'
-import { activeAccounts, updateActiveProfile } from '@core/profile/stores'
-import { resetSendOptionIndex } from '@core/wallet/stores'
-
-import { selectedAccountIndex } from '../stores'
-import { clearFilters } from '@core/utils'
-import { resetNftDownloadQueue } from '@core/nfts'
-
-export function setSelectedAccount(index: number): void {
-    resetNftDownloadQueue(true)
-
-    const account = get(activeAccounts)?.find((_account) => _account.index === index)
-    if (account) {
-        selectedAccountIndex.set(index)
-        updateActiveProfile({ lastUsedAccountIndex: index })
-        clearFilters()
-        resetSendOptionIndex()
-    } else {
-        throw new Error(`Account with ID ${index} cannot be found!`)
-    }
-}
diff --git a/packages/shared/lib/core/account/actions/syncBalance.ts b/packages/shared/lib/core/account/actions/syncBalance.ts
deleted file mode 100644
index ad25435189f..00000000000
--- a/packages/shared/lib/core/account/actions/syncBalance.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { getBalance } from '../api/getBalance'
-import { selectedAccount, updateSelectedAccount } from '../stores'
-import { updateActiveAccount } from '@core/profile'
-import { get } from 'svelte/store'
-
-export async function syncBalance(accountIndex: number): Promise<void> {
-    const balances = await getBalance(accountIndex)
-    if (get(selectedAccount)?.index === accountIndex) {
-        updateSelectedAccount({ balances })
-    } else {
-        updateActiveAccount(accountIndex, { balances })
-    }
-    return
-}
diff --git a/packages/shared/lib/core/account/actions/syncVotingPower.ts b/packages/shared/lib/core/account/actions/syncVotingPower.ts
deleted file mode 100644
index 2776da58172..00000000000
--- a/packages/shared/lib/core/account/actions/syncVotingPower.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get } from 'svelte/store'
-import { selectedAccountIndex, updateSelectedAccount } from '../stores'
-import { getVotingPower } from '../api/getVotingPower'
-import { updateActiveAccount } from '@core/profile'
-
-export async function syncVotingPower(accountIndex = get(selectedAccountIndex)): Promise<void> {
-    const votingPower = await getVotingPower(accountIndex)
-    if (get(selectedAccountIndex) === accountIndex) {
-        updateSelectedAccount({ votingPower })
-    } else {
-        updateActiveAccount(accountIndex, { votingPower })
-    }
-    return
-}
diff --git a/packages/shared/lib/core/account/api/createAliasIfNecessary.ts b/packages/shared/lib/core/account/api/createAliasIfNecessary.ts
deleted file mode 100644
index bf9d068bf00..00000000000
--- a/packages/shared/lib/core/account/api/createAliasIfNecessary.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { IAccountState } from '@core/account/interfaces'
-
-export async function createAliasIfNecessary(account: IAccountState): Promise<void> {
-    const { aliases } = await account.getBalance()
-    if (aliases.length === 0) {
-        await account.prepareCreateAliasOutput()
-        await new Promise((resolve) => setTimeout(resolve, 7500))
-    }
-}
diff --git a/packages/shared/lib/core/account/api/getBalance.ts b/packages/shared/lib/core/account/api/getBalance.ts
deleted file mode 100644
index 468e6bf0b22..00000000000
--- a/packages/shared/lib/core/account/api/getBalance.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { Balance } from '@iota/sdk/out/types'
-import { getAccount } from '@core/profile-manager'
-
-export async function getBalance(index?: number): Promise<Balance> {
-    return (await getAccount(index))?.getBalance()
-}
diff --git a/packages/shared/lib/core/account/api/getParticipationOverview.ts b/packages/shared/lib/core/account/api/getParticipationOverview.ts
deleted file mode 100644
index c883f785346..00000000000
--- a/packages/shared/lib/core/account/api/getParticipationOverview.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { ParticipationOverview } from '@iota/sdk/out/types'
-
-import { getAccount } from '@core/profile-manager/api'
-
-export async function getParticipationOverview(accountIndex: number, eventId?: string): Promise<ParticipationOverview> {
-    return (await getAccount(accountIndex))?.getParticipationOverview(eventId ? [eventId] : undefined)
-}
diff --git a/packages/shared/lib/core/account/api/getVotingPower.ts b/packages/shared/lib/core/account/api/getVotingPower.ts
deleted file mode 100644
index f3511b240fa..00000000000
--- a/packages/shared/lib/core/account/api/getVotingPower.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { getBalance } from '@core/account/api'
-
-export async function getVotingPower(index?: number): Promise<string> {
-    const balance = await getBalance(index)
-    return balance.baseCoin.votingPower
-}
diff --git a/packages/shared/lib/core/account/api/index.ts b/packages/shared/lib/core/account/api/index.ts
deleted file mode 100644
index 73051d7343b..00000000000
--- a/packages/shared/lib/core/account/api/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './createAliasIfNecessary'
-export * from './getBalance'
-export * from './getParticipationOverview'
-export * from './getVotingPower'
-export * from './prepareOutput'
diff --git a/packages/shared/lib/core/account/constants/index.ts b/packages/shared/lib/core/account/constants/index.ts
deleted file mode 100644
index 1a4ff88c301..00000000000
--- a/packages/shared/lib/core/account/constants/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './default-sync-options.constant'
-export * from './max-account-name-length.constant'
diff --git a/packages/shared/lib/core/account/constants/max-account-name-length.constant.ts b/packages/shared/lib/core/account/constants/max-account-name-length.constant.ts
deleted file mode 100644
index 6c934622745..00000000000
--- a/packages/shared/lib/core/account/constants/max-account-name-length.constant.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const MAX_ACCOUNT_NAME_LENGTH = 20
diff --git a/packages/shared/lib/core/account/enums/index.ts b/packages/shared/lib/core/account/enums/index.ts
deleted file mode 100644
index a88b9ad8d57..00000000000
--- a/packages/shared/lib/core/account/enums/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './account-colors.enum'
-export * from './search-algorithm.enum'
diff --git a/packages/shared/lib/core/account/errors/index.ts b/packages/shared/lib/core/account/errors/index.ts
deleted file mode 100644
index 2c5ddd6a5eb..00000000000
--- a/packages/shared/lib/core/account/errors/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './unable-to-get-bound-account.error'
diff --git a/packages/shared/lib/core/account/index.ts b/packages/shared/lib/core/account/index.ts
deleted file mode 100644
index 391307033be..00000000000
--- a/packages/shared/lib/core/account/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './actions'
-export * from './api'
-export * from './constants'
-export * from './enums'
-export * from './errors'
-export * from './interfaces'
-export * from './stores'
-export * from './utils'
diff --git a/packages/shared/lib/core/account/interfaces/account-balances.interface.ts b/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
deleted file mode 100644
index b81ba9cf4b2..00000000000
--- a/packages/shared/lib/core/account/interfaces/account-balances.interface.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { RequiredStorageDeposit } from '@iota/sdk/out/types'
-
-export interface IAccountBalances {
-    aliases: unknown[]
-    available: number
-    foundries: unknown[]
-    nativeToken: Record<string, unknown>
-    nfts: unknown[]
-    potentiallLockedOutputs: unknown[]
-    requiredStorageDeposit: RequiredStorageDeposit
-    total: number
-}
diff --git a/packages/shared/lib/core/account/interfaces/account.interface.ts b/packages/shared/lib/core/account/interfaces/account.interface.ts
deleted file mode 100644
index 34f231a9ab4..00000000000
--- a/packages/shared/lib/core/account/interfaces/account.interface.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Client } from '@iota/sdk'
-import type {
-    AccountMetadata,
-    AddressWithUnspentOutputs,
-    AliasOutputParams,
-    Balance,
-    CreateNativeTokenParams,
-    ConsolidationParams,
-    FilterOptions,
-    GenerateAddressOptions,
-    MintNftParams,
-    OutputData,
-    OutputParams,
-    OutputsToClaim,
-    ParticipationEventMap,
-    ParticipationEventRegistrationOptions,
-    ParticipationEventStatus,
-    ParticipationEventWithNodes,
-    ParticipationOverview,
-    PreparedTransactionData,
-    SendNativeTokensParams,
-    SendNftParams,
-    SendParams,
-    SignedTransactionEssence,
-    SyncOptions,
-    Transaction,
-    TransactionOptions,
-    FoundryOutput,
-    HexEncodedAmount,
-    Output,
-    INode,
-    AccountAddress,
-    PreparedTransaction,
-    PreparedCreateNativeTokenTransaction,
-    ParticipationEventType,
-    ParticipationEventId,
-    Burn,
-} from '@iota/sdk/out/types'
-
-export interface IAccount {
-    isStrongholdPasswordAvailable(): Promise<boolean>
-    getClient(): Promise<Client>
-    setStrongholdPassword(password: string): Promise<void>
-    setStrongholdPasswordClearInterval(intervalInMilliseconds?: number): Promise<void>
-    changeStrongholdPassword(currentPassword: string, newPassword: string): Promise<void>
-    clearStrongholdPassword(): Promise<void>
-    addresses(): Promise<AccountAddress[]>
-    addressesWithUnspentOutputs(): Promise<AddressWithUnspentOutputs[]>
-    prepareBurn(burn: Burn, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
-    prepareBurnNativeToken(
-        tokenId: string,
-        burnAmount: HexEncodedAmount,
-        transactionOptions?: TransactionOptions
-    ): Promise<PreparedTransaction>
-    prepareBurnNft(nftId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
-    claimOutputs(outputIds: string[]): Promise<Transaction>
-    prepareConsolidateOutputs(params: ConsolidationParams): Promise<PreparedTransaction>
-    prepareCreateAliasOutput(
-        params?: AliasOutputParams,
-        transactionOptions?: TransactionOptions
-    ): Promise<PreparedTransaction>
-    prepareMeltNativeToken(
-        tokenId: string,
-        meltAmount: HexEncodedAmount,
-        transactionOptions?: TransactionOptions
-    ): Promise<Transaction>
-    prepareDecreaseVotingPower(amount: string): Promise<PreparedTransaction>
-    deregisterParticipationEvent(eventId: string): Promise<void>
-    prepareDestroyAlias(aliasId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
-    prepareDestroyFoundry(foundryId: string, transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
-    generateEd25519Addresses(amount: number, options?: GenerateAddressOptions): Promise<AccountAddress[]>
-    getBalance(): Promise<Balance>
-    getFoundryOutput(tokenId: string): Promise<FoundryOutput>
-    getIncomingTransaction(transactionId: string): Promise<Transaction>
-    getMetadata(): AccountMetadata
-    getOutput(outputId: string): Promise<OutputData>
-    claimableOutputs(outputs: OutputsToClaim): Promise<string[]>
-    getParticipationEvent(eventId: string): Promise<ParticipationEventWithNodes>
-    getParticipationEventIds(node: INode, eventType?: ParticipationEventType): Promise<ParticipationEventId[]>
-    getParticipationEvents(): Promise<ParticipationEventMap>
-    getParticipationEventStatus(eventId: string): Promise<ParticipationEventStatus>
-    getParticipationOverview(eventIds?: string[]): Promise<ParticipationOverview>
-    getTransaction(transactionId: string): Promise<Transaction>
-    incomingTransactions(): Promise<Transaction[]>
-    prepareMintNativeToken(
-        tokenId: string,
-        mintAmount: HexEncodedAmount,
-        transactionOptions?: TransactionOptions
-    ): Promise<PreparedTransaction>
-    prepareIncreaseVotingPower(amount: string): Promise<PreparedTransaction>
-    prepareCreateNativeToken(
-        params: CreateNativeTokenParams,
-        transactionOptions?: TransactionOptions
-    ): Promise<PreparedCreateNativeTokenTransaction>
-    prepareMintNfts(params: MintNftParams[], transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
-    outputs(filterOptions?: FilterOptions): Promise<OutputData[]>
-    prepareOutput(params: OutputParams, transactionOptions?: TransactionOptions): Promise<Output>
-    pendingTransactions(): Promise<Transaction[]>
-    prepareSend(params: SendParams[], options?: TransactionOptions): Promise<PreparedTransaction>
-    prepareTransaction(outputs: Output[], options?: TransactionOptions): Promise<PreparedTransaction>
-    registerParticipationEvents(options: ParticipationEventRegistrationOptions): Promise<ParticipationEventMap>
-    retryTransactionUntilIncluded(transactionId: string, interval?: number, maxAttempts?: number): Promise<string>
-    send(amount: bigint | string, address: string, transactionOptions?: TransactionOptions): Promise<Transaction>
-    sendWithParams(params: SendParams[], transactionOptions?: TransactionOptions): Promise<Transaction>
-    prepareSendNativeTokens(
-        params: SendNativeTokensParams[],
-        transactionOptions?: TransactionOptions
-    ): Promise<PreparedTransaction>
-    prepareSendNft(params: SendNftParams[], transactionOptions?: TransactionOptions): Promise<PreparedTransaction>
-    sendOutputs(outputs: Output[], transactionOptions?: TransactionOptions): Promise<Transaction>
-    setAlias(alias: string): Promise<void>
-    setDefaultSyncOptions(options: SyncOptions): Promise<void>
-    signTransactionEssence(preparedTransactionData: PreparedTransactionData): Promise<SignedTransactionEssence>
-    prepareStopParticipating(eventId: string): Promise<PreparedTransaction>
-    signAndSubmitTransaction(preparedTransactionData: PreparedTransactionData): Promise<Transaction>
-    submitAndStoreTransaction(signedTransactionData: SignedTransactionEssence): Promise<Transaction>
-    sync(options?: SyncOptions): Promise<Balance>
-    transactions(): Promise<Transaction[]>
-    unspentOutputs(filterOptions?: FilterOptions): Promise<OutputData[]>
-    prepareVote(eventId?: string, answers?: number[]): Promise<PreparedTransaction>
-}
diff --git a/packages/shared/lib/core/account/interfaces/index.ts b/packages/shared/lib/core/account/interfaces/index.ts
deleted file mode 100644
index 96cac9a4d35..00000000000
--- a/packages/shared/lib/core/account/interfaces/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './account-state.interface'
-export * from './account.interface'
-export * from './address-with-outputs.interface'
-export * from './persisted-account-data.interface'
diff --git a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts b/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
deleted file mode 100644
index f3052b8d0e1..00000000000
--- a/packages/shared/lib/core/account/interfaces/persisted-account-data.interface.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { ParticipationEventId } from '@iota/sdk/out/types'
-
-export interface IPersistedAccountData {
-    name: string
-    color: string
-    hidden: boolean
-    shouldRevote: boolean
-    removedProposalIds?: ParticipationEventId[]
-}
diff --git a/packages/shared/lib/core/account/stores/index.ts b/packages/shared/lib/core/account/stores/index.ts
deleted file mode 100644
index b716a39369c..00000000000
--- a/packages/shared/lib/core/account/stores/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './selected-account-id.store'
-export * from './selected-account.store'
diff --git a/packages/shared/lib/core/account/stores/selected-account-id.store.ts b/packages/shared/lib/core/account/stores/selected-account-id.store.ts
deleted file mode 100644
index a29b9f53542..00000000000
--- a/packages/shared/lib/core/account/stores/selected-account-id.store.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { writable } from 'svelte/store'
-
-export const selectedAccountIndex = writable<number>(null)
diff --git a/packages/shared/lib/core/account/stores/selected-account.store.ts b/packages/shared/lib/core/account/stores/selected-account.store.ts
deleted file mode 100644
index a71d692aae2..00000000000
--- a/packages/shared/lib/core/account/stores/selected-account.store.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { derived, get, Readable } from 'svelte/store'
-import type { IAccountState } from '../interfaces'
-import { selectedAccountIndex } from '../stores'
-import { activeAccounts, updateActiveAccount } from '@core/profile/stores'
-
-export const selectedAccount: Readable<IAccountState | undefined> = derived(
-    [selectedAccountIndex, activeAccounts],
-    ([$selectedAccountIndex, $activeAccounts]) => {
-        return $activeAccounts?.find((account) => account.index === $selectedAccountIndex)
-    }
-)
-
-export function getSelectedAccount(): IAccountState | undefined {
-    return get(selectedAccount)
-}
-
-export function updateSelectedAccount(payload: Partial<IAccountState>): void {
-    updateActiveAccount(get(selectedAccountIndex), payload)
-}
diff --git a/packages/shared/lib/core/account/tests/buildBip32Path.test.ts b/packages/shared/lib/core/account/tests/buildBip32Path.test.ts
deleted file mode 100644
index 010ac0c6459..00000000000
--- a/packages/shared/lib/core/account/tests/buildBip32Path.test.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { buildBip32Path } from '../utils/buildBip32Path'
-
-describe('File: buildBip32Path.ts', () => {
-    it('should correctly give BIP32 path', () => {
-        const coinType = 60
-        const accountIndex = 1
-        const bip32Path = buildBip32Path(coinType, accountIndex)
-        const expectedBip32Path = "44'/60'/1'/0/0"
-
-        expect(expectedBip32Path).toStrictEqual(bip32Path)
-    })
-})
diff --git a/packages/shared/lib/core/account/tests/deconstructBip32Path.test.ts b/packages/shared/lib/core/account/tests/deconstructBip32Path.test.ts
deleted file mode 100644
index b56ce77d85e..00000000000
--- a/packages/shared/lib/core/account/tests/deconstructBip32Path.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { deconstructBip32Path } from '../utils/deconstructBip32Path'
-
-describe('File: deconstructBip32Path.ts', () => {
-    it('should throw error if path not long enough', () => {
-        expect(() => {
-            deconstructBip32Path(`44'/60'`)
-        }).toThrow()
-    })
-
-    it('should correctly give BIP32 path', () => {
-        const bip32Path = deconstructBip32Path(`44/60'/0/1/2`)
-        const expectedBip32Path = {
-            coinType: 60,
-            accountIndex: 0,
-            change: 1,
-            addressIndex: 2,
-        }
-
-        expect(expectedBip32Path).toStrictEqual(bip32Path)
-    })
-})
diff --git a/packages/shared/lib/core/account/utils/buildBip32Path.ts b/packages/shared/lib/core/account/utils/buildBip32Path.ts
deleted file mode 100644
index 04d38f8216a..00000000000
--- a/packages/shared/lib/core/account/utils/buildBip32Path.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function buildBip32Path(coinType: number, accountIndex: number): string {
-    return `44'/${coinType}'/${accountIndex}'/0/0`
-}
diff --git a/packages/shared/lib/core/account/utils/deconstructBip32Path.ts b/packages/shared/lib/core/account/utils/deconstructBip32Path.ts
deleted file mode 100644
index 29f64cea5f4..00000000000
--- a/packages/shared/lib/core/account/utils/deconstructBip32Path.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-const BIP_32_LEVELS = 5
-
-export function deconstructBip32Path(path: string): {
-    coinType: number
-    accountIndex: number
-    change: number
-    addressIndex: number
-} {
-    const pathArray = path.split('/')
-    if (pathArray.length !== BIP_32_LEVELS) {
-        throw new Error('Invalid BIP-32 path length')
-    }
-
-    const _path = pathArray.map((p) => {
-        // eslint-disable-next-line quotes
-        const sanitizedPath = p.replace("'", '')
-        return Number(sanitizedPath)
-    })
-
-    return {
-        coinType: _path[1],
-        accountIndex: _path[2],
-        change: _path[3],
-        addressIndex: _path[4],
-    }
-}
diff --git a/packages/shared/lib/core/account/utils/getAccountColorById.ts b/packages/shared/lib/core/account/utils/getAccountColorById.ts
deleted file mode 100644
index e17c09fddc6..00000000000
--- a/packages/shared/lib/core/account/utils/getAccountColorById.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { visibleActiveAccounts } from '@core/profile/stores/active-accounts.store'
-import { get } from 'svelte/store'
-
-export function getAccountColorById(id: number): string {
-    return get(visibleActiveAccounts)?.find((account) => account.index === id)?.color
-}
diff --git a/packages/shared/lib/core/account/utils/getBoundAccount.ts b/packages/shared/lib/core/account/utils/getBoundAccount.ts
deleted file mode 100644
index 5b27e1d54b0..00000000000
--- a/packages/shared/lib/core/account/utils/getBoundAccount.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { IAccount, UnableToGetBoundAccountError } from '@core/account'
-import { createAccount, getAccount, profileManager as _profileManager } from '@core/profile-manager'
-
-export async function getBoundAccount(
-    accountIndex: number,
-    createAccountsIfNotFound: boolean = false,
-    profileManager = _profileManager
-): Promise<IAccount> {
-    try {
-        /**
-         * CAUTION: Do NOT remove the `await` keyword here.
-         * It is needed in the case of handling an AccountNotFound
-         * error by creating more accounts.
-         */
-        const account = await getAccount(accountIndex ?? 0, profileManager)
-        return account
-    } catch (err) {
-        // TODO: Update error type when sdk Error enum has been updated
-        if (err?.type === 'wallet' && createAccountsIfNotFound) {
-            for (let indexToCreateAccount = 0; indexToCreateAccount < accountIndex; indexToCreateAccount++) {
-                const account = await createAccount({}, profileManager)
-                if (account?.getMetadata()?.index === accountIndex) {
-                    return account
-                }
-            }
-            throw new UnableToGetBoundAccountError()
-        } else {
-            throw err
-        }
-    }
-}
diff --git a/packages/shared/lib/core/account/utils/getDepositAddress.ts b/packages/shared/lib/core/account/utils/getDepositAddress.ts
deleted file mode 100644
index f5c854d5302..00000000000
--- a/packages/shared/lib/core/account/utils/getDepositAddress.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { IAccount } from '@core/account'
-
-export async function getDepositAddress(account: IAccount): Promise<string> {
-    const addresses = await account.addresses()
-    const address = addresses.find((address) => address.internal === false && address.keyIndex === 0)
-    return address.address
-}
diff --git a/packages/shared/lib/core/account/utils/getRandomAccountColor.ts b/packages/shared/lib/core/account/utils/getRandomAccountColor.ts
deleted file mode 100644
index 23b3f5d337f..00000000000
--- a/packages/shared/lib/core/account/utils/getRandomAccountColor.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { AccountColors } from '../enums'
-
-export function getRandomAccountColor(): string {
-    const colors = Object.values(AccountColors).filter((_, i) => !(i % 2))
-    return colors[Math.floor(Math.random() * colors.length)].toString()
-}
diff --git a/packages/shared/lib/core/account/utils/index.ts b/packages/shared/lib/core/account/utils/index.ts
deleted file mode 100644
index 28d10cf8981..00000000000
--- a/packages/shared/lib/core/account/utils/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export * from './buildBip32Path'
-export * from './deconstructBip32Path'
-export * from './getAccountColorById'
-export * from './getBoundAccount'
-export * from './getDepositAddress'
-export * from './getIconColorFromString'
-export * from './getRandomAccountColor'
-export * from './sumBalanceForAccounts'
-export * from './sumTotalFromOutputs'
-export * from './syncAccountsInParallel'
-export * from './syncAccountsInSeries'
-export * from './validateAccountName'
diff --git a/packages/shared/lib/core/account/utils/sumBalanceForAccounts.ts b/packages/shared/lib/core/account/utils/sumBalanceForAccounts.ts
deleted file mode 100644
index 12966e538a7..00000000000
--- a/packages/shared/lib/core/account/utils/sumBalanceForAccounts.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { IAccountState } from '@core/account'
-
-export function sumBalanceForAccounts(accounts: IAccountState[]): number {
-    return accounts.reduce(
-        (total: number, account: IAccountState) => (total += Number(account.balances.baseCoin.total)),
-        0
-    )
-}
diff --git a/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts b/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
deleted file mode 100644
index 1e256fc8321..00000000000
--- a/packages/shared/lib/core/account/utils/syncAccountsInParallel.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Balance, SyncOptions } from '@iota/sdk/out/types'
-
-import { IAccount } from '../interfaces'
-
-export async function syncAccountsInParallel(syncOptions: SyncOptions, ...accounts: IAccount[]): Promise<Balance[]> {
-    return Promise.all(accounts.map((account) => account?.sync(syncOptions)))
-}
diff --git a/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts b/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
deleted file mode 100644
index a1dfa4d3d75..00000000000
--- a/packages/shared/lib/core/account/utils/syncAccountsInSeries.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Balance, SyncOptions } from '@iota/sdk/out/types'
-
-import { IAccount } from '@core/account'
-
-export async function syncAccountsInSeries(syncOptions: SyncOptions, ...accounts: IAccount[]): Promise<Balance[]> {
-    const accountBalances: Balance[] = []
-    for (const account of accounts) {
-        const balance = await account?.sync(syncOptions)
-        accountBalances.push(balance)
-    }
-    return accountBalances
-}
diff --git a/packages/shared/lib/core/account/utils/validateAccountName.ts b/packages/shared/lib/core/account/utils/validateAccountName.ts
deleted file mode 100644
index 337a3031934..00000000000
--- a/packages/shared/lib/core/account/utils/validateAccountName.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { localize } from '@core/i18n'
-import { activeAccounts } from '@core/profile'
-import { getTrimmedLength } from '@core/utils'
-import { get } from 'svelte/store'
-import { MAX_ACCOUNT_NAME_LENGTH } from '../constants'
-
-export function validateAccountName(
-    name: string,
-    validateLength = true,
-    validateDuplicate = true
-): Promise<void | string> {
-    if (validateLength && getTrimmedLength(name) > MAX_ACCOUNT_NAME_LENGTH) {
-        return Promise.reject(
-            new Error(
-                localize('error.account.length', {
-                    values: {
-                        length: MAX_ACCOUNT_NAME_LENGTH,
-                    },
-                })
-            )
-        )
-    }
-    if (validateDuplicate && get(activeAccounts)?.find((existingAccount) => existingAccount.name === name)) {
-        return Promise.reject(new Error(localize('error.account.duplicate')))
-    }
-    return Promise.resolve()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/api.ts b/packages/shared/lib/core/api/api.ts
similarity index 77%
rename from packages/shared/lib/core/profile-manager/api/api.ts
rename to packages/shared/lib/core/api/api.ts
index 18bb1fe9833..f325f3e5bf0 100644
--- a/packages/shared/lib/core/profile-manager/api/api.ts
+++ b/packages/shared/lib/core/api/api.ts
@@ -1,4 +1,4 @@
-import { IApi } from '../interfaces'
+import { IApi } from './interfaces'
 
 declare global {
     interface Window {
diff --git a/packages/shared/lib/core/api/index.ts b/packages/shared/lib/core/api/index.ts
new file mode 100644
index 00000000000..aef4bcdadba
--- /dev/null
+++ b/packages/shared/lib/core/api/index.ts
@@ -0,0 +1,2 @@
+export * from './api'
+export * from './interfaces'
diff --git a/packages/shared/lib/core/api/interfaces/api.interface.ts b/packages/shared/lib/core/api/interfaces/api.interface.ts
new file mode 100644
index 00000000000..22200274516
--- /dev/null
+++ b/packages/shared/lib/core/api/interfaces/api.interface.ts
@@ -0,0 +1,43 @@
+import { SecretManager } from '@iota/sdk'
+import {
+    AccountId,
+    FoundryId,
+    HexEncodedString,
+    NftId,
+    Output,
+    OutputId,
+    SecretManagerType,
+    TransactionId,
+    WalletOptions,
+    Bech32Address,
+} from '@iota/sdk/out/types'
+import { IWallet } from '@core/profile/interfaces'
+
+// TODO(2.0): Every method should return a promise (maybe except Utils, needs research)
+export interface IApi {
+    createSecretManager(options: SecretManagerType): Promise<SecretManager>
+    createWallet(id: string, payload: WalletOptions): Promise<IWallet>
+    deleteWallet(id: string): void
+    getWallet(id: string, walletOptions: WalletOptions): Promise<IWallet>
+    clearWalletsFromMemory(): void
+    migrateStrongholdSnapshotV2ToV3(
+        currentPath: string,
+        currentPassword: string,
+        newPath: string,
+        newPassword: string
+    ): Promise<void>
+    migrateDbChrysalisToStardust(path: string, pinCode: string): Promise<Record<string, unknown>>
+    // Mapped from sdk#Utils
+    generateMnemonic(): Promise<string>
+    verifyMnemonic(mnemonic: string): Promise<void>
+    hexToBech32(hex: HexEncodedString, bech32Hrp: string): Bech32Address
+    bech32ToHex(bech32: Bech32Address): HexEncodedString
+    computeAccountId(outputId: string): AccountId
+    computeFoundryId(accountId: AccountId, serialNumber: number, tokenSchemeType: number): Promise<FoundryId>
+    computeNftId(outputId: string): NftId
+    hexPublicKeyToBech32Address(hex: HexEncodedString, bech32Hrp: string): Bech32Address
+    accountIdToBech32(accountId: AccountId, bech32Hrp: string): Bech32Address
+    nftIdToBech32(nftId: string, bech32Hrp: string): Bech32Address
+    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
+    outputHexBytes(output: Output): Promise<HexEncodedString>
+}
diff --git a/packages/shared/lib/core/api/interfaces/index.ts b/packages/shared/lib/core/api/interfaces/index.ts
new file mode 100644
index 00000000000..8502d426161
--- /dev/null
+++ b/packages/shared/lib/core/api/interfaces/index.ts
@@ -0,0 +1 @@
+export * from './api.interface'
diff --git a/packages/shared/lib/core/layer-2/utils/evmAddressToAgentID.ts b/packages/shared/lib/core/layer-2/utils/evmAddressToAgentID.ts
index 5b947f541b7..6893ba60fad 100644
--- a/packages/shared/lib/core/layer-2/utils/evmAddressToAgentID.ts
+++ b/packages/shared/lib/core/layer-2/utils/evmAddressToAgentID.ts
@@ -1,5 +1,5 @@
-import { api } from '@core/profile-manager'
 import { Converter } from '@iota/util.js'
+import { api } from '@core/api'
 import { EXTERNALLY_OWNED_ACCOUNT_TYPE_ID } from '../constants'
 
 export function evmAddressToAgentID(evmStoreAccount: string, aliasAddress: string): Uint8Array {
diff --git a/packages/shared/lib/core/layer-2/utils/outputHexBytes.ts b/packages/shared/lib/core/layer-2/utils/outputHexBytes.ts
index 96092720b52..b5803ad8ee0 100644
--- a/packages/shared/lib/core/layer-2/utils/outputHexBytes.ts
+++ b/packages/shared/lib/core/layer-2/utils/outputHexBytes.ts
@@ -1,5 +1,5 @@
-import { api } from '@core/profile-manager'
 import { HexEncodedString, Output } from '@iota/sdk/out/types'
+import { api } from '@core/api'
 
 export function outputHexBytes(output: Output): Promise<HexEncodedString> {
     return api.outputHexBytes(output)
diff --git a/packages/shared/lib/core/ledger/actions/getAndUpdateLedgerNanoStatus.ts b/packages/shared/lib/core/ledger/actions/getAndUpdateLedgerNanoStatus.ts
index 731586f4595..7edca0c9bdb 100644
--- a/packages/shared/lib/core/ledger/actions/getAndUpdateLedgerNanoStatus.ts
+++ b/packages/shared/lib/core/ledger/actions/getAndUpdateLedgerNanoStatus.ts
@@ -1,8 +1,7 @@
-import { profileManager as _profileManager } from '@core/profile-manager'
-import { getLedgerNanoStatus } from '@lib/core/profile-manager/api'
 
 import { resetLedgerNanoStatus, updateLedgerNanoStatus } from '../stores'
 
+// TODO(2.0) Fix this, profile manager is gone
 export async function getAndUpdateLedgerNanoStatus(
     profileManager = _profileManager,
     forwardErrors = false
diff --git a/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts b/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts
index a9a6222d723..153b1b67176 100644
--- a/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts
+++ b/packages/shared/lib/core/ledger/actions/getLedgerDeviceStatus.ts
@@ -1,7 +1,7 @@
 import { get } from 'svelte/store'
-import { getLedgerNanoStatus } from '@lib/core/profile-manager/api'
 import { closePopup, popupState } from '@auxiliary/popup'
 import { ledgerNanoStatus, updateLedgerNanoStatus } from '../stores'
+import { getLedgerNanoStatus } from '@core/secret-manager'
 
 export async function getLedgerDeviceStatus(
     onConnected = (): void => {},
diff --git a/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts b/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts
index e13183c59cf..e3249fff054 100644
--- a/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts
+++ b/packages/shared/lib/core/ledger/helpers/deconstructLedgerNanoStatusPollingConfiguration.ts
@@ -1,8 +1,7 @@
-import { profileManager as _profileManager } from '@core/profile-manager/stores'
-
 import { DEFAULT_LEDGER_NANO_STATUS_POLL_INTERVAL } from '../constants'
 import { ILedgerNanoStatusPollingConfiguration } from '../interfaces'
 
+// TODO(2.0) Fix this
 export function deconstructLedgerNanoStatusPollingConfiguration(
     config: ILedgerNanoStatusPollingConfiguration
 ): ILedgerNanoStatusPollingConfiguration {
diff --git a/packages/shared/lib/core/ledger/interfaces/ledger-nano-status-polling-configuration.interface.ts b/packages/shared/lib/core/ledger/interfaces/ledger-nano-status-polling-configuration.interface.ts
index 0da66b01c3f..da2c8808753 100644
--- a/packages/shared/lib/core/ledger/interfaces/ledger-nano-status-polling-configuration.interface.ts
+++ b/packages/shared/lib/core/ledger/interfaces/ledger-nano-status-polling-configuration.interface.ts
@@ -1,7 +1,6 @@
 import { Writable } from 'svelte/store'
 
-import { IProfileManager } from '@core/profile-manager'
-
+// TODO(2.0) Fix this
 export interface ILedgerNanoStatusPollingConfiguration {
     pollInterval?: number
     profileManager?: Writable<IProfileManager>
diff --git a/packages/shared/lib/core/ledger/stores/ledger-app-name.store.ts b/packages/shared/lib/core/ledger/stores/ledger-app-name.store.ts
index 88136c82dc4..49787c03c55 100644
--- a/packages/shared/lib/core/ledger/stores/ledger-app-name.store.ts
+++ b/packages/shared/lib/core/ledger/stores/ledger-app-name.store.ts
@@ -1,5 +1,5 @@
 import { Readable, derived } from 'svelte/store'
-import { profileNetwork } from '@core/profile'
+import { profileNetwork } from '@core/profile/stores/profile-network.store'
 import { onboardingProfileNetwork } from '@contexts/onboarding'
 import { LedgerAppName } from '@core/ledger'
 import { NetworkId } from '@core/network'
diff --git a/packages/shared/lib/core/ledger/utils/isLedgerDeviceMatchingActiveProfile.ts b/packages/shared/lib/core/ledger/utils/isLedgerDeviceMatchingActiveProfile.ts
index 4aa41daf9f6..509ca7004d3 100644
--- a/packages/shared/lib/core/ledger/utils/isLedgerDeviceMatchingActiveProfile.ts
+++ b/packages/shared/lib/core/ledger/utils/isLedgerDeviceMatchingActiveProfile.ts
@@ -1,22 +1,26 @@
-import { getSelectedAccount } from '@core/account/stores'
-import { getProfileManager } from '@core/profile-manager/stores'
-
+import { getSecretManager } from '@core/secret-manager'
+import { getSelectedWallet } from '@core/wallet'
 import { LedgerAppName } from '../enums'
 import { isLedgerAppOpen } from './isLedgerAppOpen'
 
 export async function isLedgerDeviceMatchingActiveProfile(): Promise<boolean | undefined> {
     if (isLedgerAppOpen(LedgerAppName.Shimmer)) {
         try {
-            const account = getSelectedAccount()
-            if (!account) {
+            const wallet = getSelectedWallet()
+            if (!wallet) {
                 return undefined
             }
 
-            const cachedAddress = account?.depositAddress
-            const generatedAddress = await getProfileManager()?.generateEd25519Address(account.index, 0, {
-                internal: false,
-                ledgerNanoPrompt: false,
+            const cachedAddress = wallet?.depositAddress
+            const secretManager = getSecretManager();
+            const generatedAddresses = await secretManager.generateEd25519Addresses({
+                accountIndex: 0,
+                options: {
+                    internal: false,
+                    ledgerNanoPrompt: false,
+                }
             })
+            const generatedAddress = generatedAddresses[0]
 
             return cachedAddress === generatedAddress
         } catch (err) {
diff --git a/packages/shared/lib/core/network/actions/getAndUpdateNodeInfo.ts b/packages/shared/lib/core/network/actions/getAndUpdateNodeInfo.ts
index e52eb059e9c..cfcafceb4e3 100644
--- a/packages/shared/lib/core/network/actions/getAndUpdateNodeInfo.ts
+++ b/packages/shared/lib/core/network/actions/getAndUpdateNodeInfo.ts
@@ -1,4 +1,4 @@
-import { getNodeInfo } from '@core/profile-manager'
+import { getNodeInfo } from '@core/wallet/actions'
 import { INodeInfoResponse } from '../interfaces/node-info-response.interface'
 import { setNodeInfo } from '../stores/node-info.store'
 
diff --git a/packages/shared/lib/core/network/actions/updateClientOptions.ts b/packages/shared/lib/core/network/actions/updateClientOptions.ts
index 0647626765c..a51db0994a4 100644
--- a/packages/shared/lib/core/network/actions/updateClientOptions.ts
+++ b/packages/shared/lib/core/network/actions/updateClientOptions.ts
@@ -1,7 +1,7 @@
 import { ClientOptions } from '@core/network'
 import { activeProfile, updateActiveProfile } from '@core/profile'
-import { setClientOptions } from '@core/profile-manager'
 import { get } from 'svelte/store'
+import { setClientOptions } from '@core/wallet'
 
 /**
  * Update the client options for a profile.
diff --git a/packages/shared/lib/core/network/interfaces/auth.interface.ts b/packages/shared/lib/core/network/interfaces/auth.interface.ts
deleted file mode 100644
index 026e8f8afdd..00000000000
--- a/packages/shared/lib/core/network/interfaces/auth.interface.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface IAuth {
-    jwt?: string
-    basicAuthNamePwd?: [string, string]
-}
diff --git a/packages/shared/lib/core/network/interfaces/index.ts b/packages/shared/lib/core/network/interfaces/index.ts
index 228da613644..d9244a4e24a 100644
--- a/packages/shared/lib/core/network/interfaces/index.ts
+++ b/packages/shared/lib/core/network/interfaces/index.ts
@@ -1,4 +1,3 @@
-export * from './auth.interface'
 export * from './chain-metadata.interface'
 export * from './connected-chain.interface'
 export * from './client-options.interface'
diff --git a/packages/shared/lib/core/nfts/actions/addNftsToDownloadQueue.ts b/packages/shared/lib/core/nfts/actions/addNftsToDownloadQueue.ts
index 242e5d7c1e1..152787218a6 100644
--- a/packages/shared/lib/core/nfts/actions/addNftsToDownloadQueue.ts
+++ b/packages/shared/lib/core/nfts/actions/addNftsToDownloadQueue.ts
@@ -3,27 +3,28 @@ import { INft } from '../interfaces'
 import { addNftToDownloadQueue } from '../stores'
 import { checkIfNftShouldBeDownloaded } from '../utils/checkIfNftShouldBeDownloaded'
 
-export function addNftsToDownloadQueue(accountIndex: number, nfts: INft[], forceDownload: boolean = true): void {
+// TODO(2.0) Use wallets instead of acounts
+export function addNftsToDownloadQueue(walletId: string, nfts: INft[], forceDownload: boolean = true): void {
     for (const nft of nfts) {
         const shouldNotDownloadNft =
             nft?.downloadMetadata?.isLoaded || !!nft?.downloadMetadata?.error || !!nft?.downloadMetadata?.warning
         if (shouldNotDownloadNft && !forceDownload) {
             continue
         } else {
-            void validateNftThenAddToQueue(accountIndex, nft)
+            void validateNftThenAddToQueue(walletId, nft)
         }
     }
 }
 
-async function validateNftThenAddToQueue(accountIndex: number, nft: INft): Promise<void> {
+async function validateNftThenAddToQueue(walletId: string, nft: INft): Promise<void> {
     try {
         const { shouldDownload, downloadMetadata, downloadUrl } = await checkIfNftShouldBeDownloaded(nft)
         nft.downloadMetadata = downloadMetadata
         nft.downloadUrl = downloadUrl
-        updateNftInAllAccountNfts(accountIndex, nft.id, { downloadMetadata })
+        updateNftInAllAccountNfts(walletId, nft.id, { downloadMetadata })
 
         if (shouldDownload) {
-            addNftToDownloadQueue({ nft: nft, downloadUrl, path: nft.filePath, accountIndex })
+            addNftToDownloadQueue({ nft: nft, downloadUrl, path: nft.filePath, walletId })
         }
     } catch (error) {
         console.error(error)
diff --git a/packages/shared/lib/core/nfts/actions/addOrUpdateNftInAllAccountNfts.ts b/packages/shared/lib/core/nfts/actions/addOrUpdateNftInAllAccountNfts.ts
index ca858165454..3cbca244f00 100644
--- a/packages/shared/lib/core/nfts/actions/addOrUpdateNftInAllAccountNfts.ts
+++ b/packages/shared/lib/core/nfts/actions/addOrUpdateNftInAllAccountNfts.ts
@@ -1,16 +1,16 @@
-import { allAccountNfts } from '../stores'
+import { allWalletNfts } from '../stores'
 import { INft } from '../interfaces'
 
-export function addOrUpdateNftInAllAccountNfts(accountIndex: number, newNft: INft): void {
-    allAccountNfts.update((state) => {
-        if (!state[accountIndex]) {
-            state[accountIndex] = []
+export function addOrUpdateNftInAllAccountNfts(walletId: string, newNft: INft): void {
+    allWalletNfts.update((state) => {
+        if (!state[walletId]) {
+            state[walletId] = []
         }
-        const nft = state[accountIndex].find((_nft) => _nft.id === newNft.id)
+        const nft = state[walletId].find((_nft) => _nft.id === newNft.id)
         if (nft) {
             Object.assign(nft, newNft)
         } else {
-            state[accountIndex].push(newNft)
+            state[walletId].push(newNft)
         }
         return state
     })
diff --git a/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts b/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts
index 88504d2156f..f7a485cb0a2 100644
--- a/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts
+++ b/packages/shared/lib/core/nfts/actions/getNftByIdFromAllAccountNfts.ts
@@ -1,7 +1,7 @@
-import { allAccountNfts } from '../stores'
+import { allWalletNfts } from '../stores'
 import { INft } from '../interfaces'
 import { get } from 'svelte/store'
 
-export function getNftByIdFromAllAccountNfts(accountIndex: number, nftId: string): INft | undefined {
-    return get(allAccountNfts)[accountIndex]?.find((_nft) => _nft.id === nftId)
+export function getNftByIdFromAllAccountNfts(walletId: string, nftId: string): INft | undefined {
+    return get(allWalletNfts)[walletId]?.find((_nft) => _nft.id === nftId)
 }
diff --git a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
index 91727543741..29566653b8c 100644
--- a/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
+++ b/packages/shared/lib/core/nfts/actions/loadNftsForActiveProfile.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account/interfaces'
+import { IWalletState } from '@core/wallet/interfaces'
 import { activeAccounts } from '@core/profile/stores'
 import { getNftId } from '@core/wallet/utils'
 import { IWrappedOutput } from '@core/wallet/interfaces'
@@ -15,7 +15,7 @@ export async function loadNftsForActiveProfile(): Promise<void> {
     }
 }
 
-async function loadNftsForAccount(account: IAccountState): Promise<void> {
+async function loadNftsForAccount(account: IWalletState): Promise<void> {
     const accountNfts: INft[] = []
     const unspentOutputs = await account.unspentOutputs()
     for (const outputData of unspentOutputs) {
diff --git a/packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts b/packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts
index df972aaed0f..b8561682a8f 100644
--- a/packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts
+++ b/packages/shared/lib/core/nfts/actions/setAccountNftsInAllAccountNfts.ts
@@ -1,8 +1,8 @@
-import { allAccountNfts } from '../stores'
+import { allWalletNfts } from '../stores'
 import { INft } from '../interfaces'
 
 export function setAccountNftsInAllAccountNfts(accountIndex: number, accountNfts: INft[]): void {
-    allAccountNfts.update((state) => {
+    allWalletNfts.update((state) => {
         state[accountIndex] = accountNfts
         return state
     })
diff --git a/packages/shared/lib/core/nfts/actions/updateNftInAllAccountNfts.ts b/packages/shared/lib/core/nfts/actions/updateNftInAllAccountNfts.ts
index 62f63dd2936..915635561da 100644
--- a/packages/shared/lib/core/nfts/actions/updateNftInAllAccountNfts.ts
+++ b/packages/shared/lib/core/nfts/actions/updateNftInAllAccountNfts.ts
@@ -1,12 +1,13 @@
-import { allAccountNfts } from '../stores'
+import { allWalletNfts } from '../stores'
 import { INft } from '../interfaces'
 
-export function updateNftInAllAccountNfts(accountIndex: number, nftId: string, partialNft: Partial<INft>): void {
-    allAccountNfts.update((state) => {
-        if (!state[accountIndex]) {
-            state[accountIndex] = []
+// TODO(2.0) Fix usages
+export function updateNftInAllAccountNfts(walletId: string, nftId: string, partialNft: Partial<INft>): void {
+    allWalletNfts.update((state) => {
+        if (!state[walletId]) {
+            state[walletId] = []
         }
-        const nft = state[accountIndex].find((_nft) => _nft.id === nftId)
+        const nft = state[walletId].find((_nft) => _nft.id === nftId)
         if (nft) {
             Object.assign(nft, { ...nft, ...partialNft })
         }
diff --git a/packages/shared/lib/core/nfts/interfaces/download-queue-nft-item.interface.ts b/packages/shared/lib/core/nfts/interfaces/download-queue-nft-item.interface.ts
index b1898471e1a..471a3b815bb 100644
--- a/packages/shared/lib/core/nfts/interfaces/download-queue-nft-item.interface.ts
+++ b/packages/shared/lib/core/nfts/interfaces/download-queue-nft-item.interface.ts
@@ -4,5 +4,5 @@ export interface DownloadQueueNftItem {
     nft: INft
     downloadUrl: string
     path: string
-    accountIndex: number
+    walletId: string
 }
diff --git a/packages/shared/lib/core/nfts/stores/all-account-nfts.store.ts b/packages/shared/lib/core/nfts/stores/all-wallet-nfts.store.ts
similarity index 54%
rename from packages/shared/lib/core/nfts/stores/all-account-nfts.store.ts
rename to packages/shared/lib/core/nfts/stores/all-wallet-nfts.store.ts
index 43d5e3cbe49..b3dd9e326bd 100644
--- a/packages/shared/lib/core/nfts/stores/all-account-nfts.store.ts
+++ b/packages/shared/lib/core/nfts/stores/all-wallet-nfts.store.ts
@@ -2,4 +2,4 @@ import { writable } from 'svelte/store'
 
 import { INft } from '../interfaces'
 
-export const allAccountNfts = writable<INft[][]>([])
+export const allWalletNfts = writable<Record<string, INft[]>>({})
diff --git a/packages/shared/lib/core/nfts/stores/index.ts b/packages/shared/lib/core/nfts/stores/index.ts
index b0750304272..961b5eb6f54 100644
--- a/packages/shared/lib/core/nfts/stores/index.ts
+++ b/packages/shared/lib/core/nfts/stores/index.ts
@@ -1,6 +1,6 @@
-export * from './all-account-nfts.store'
+export * from './all-wallet-nfts.store'
 export * from './downloading-nft.store'
 export * from './nft-download-queue.store'
 export * from './persisted-nft-data.store'
-export * from './selected-account-nfts.store'
+export * from './selected-wallet-nfts.store'
 export * from './selected-nft.store'
diff --git a/packages/shared/lib/core/nfts/stores/selected-account-nfts.store.ts b/packages/shared/lib/core/nfts/stores/selected-wallet-nfts.store.ts
similarity index 52%
rename from packages/shared/lib/core/nfts/stores/selected-account-nfts.store.ts
rename to packages/shared/lib/core/nfts/stores/selected-wallet-nfts.store.ts
index 278649b81ae..396798d62db 100644
--- a/packages/shared/lib/core/nfts/stores/selected-account-nfts.store.ts
+++ b/packages/shared/lib/core/nfts/stores/selected-wallet-nfts.store.ts
@@ -1,24 +1,24 @@
 import { derived, Readable, Writable, writable } from 'svelte/store'
 
-import { selectedAccount } from '@core/account/stores'
-
 import { INft } from '../interfaces'
-import { allAccountNfts } from './all-account-nfts.store'
+import { allWalletNfts } from './all-wallet-nfts.store'
 import { time } from '@core/app/stores/time.store'
-
-export const selectedAccountNfts: Readable<INft[]> = derived(
-    [selectedAccount, allAccountNfts],
-    ([$selectedAccount, $allAccountNfts]) => {
-        if ($selectedAccount) {
-            return $allAccountNfts[$selectedAccount.index] ?? []
+import { selectedWalletId } from '@core/wallet/stores/selected-wallet-id.store'
+
+// TODO(2.0) Rename this
+export const selectedWalletNfts: Readable<INft[]> = derived(
+    [selectedWalletId, allWalletNfts],
+    ([$selectedWalletId, $allWalletNfts]) => {
+        if ($selectedWalletId) {
+            return $allWalletNfts[$selectedWalletId] ?? []
         } else {
             return []
         }
     }
 )
 
-export const ownedNfts: Readable<INft[]> = derived([selectedAccountNfts, time], ([$selectedAccountNfts, $time]) =>
-    $selectedAccountNfts.filter((nft) => nft.isSpendable || nft.timelockTime > $time.getTime())
+export const ownedNfts: Readable<INft[]> = derived([selectedWalletNfts, time], ([$selectedWalletNfts, $time]) =>
+    $selectedWalletNfts.filter((nft) => nft.isSpendable || nft.timelockTime > $time.getTime())
 )
 
 export const nftSearchTerm: Writable<string> = writable('')
diff --git a/packages/shared/lib/core/nfts/utils/isNftOwnedByAnyAccount.ts b/packages/shared/lib/core/nfts/utils/isNftOwnedByAnyAccount.ts
index 7e3a952f895..2b30770fdb5 100644
--- a/packages/shared/lib/core/nfts/utils/isNftOwnedByAnyAccount.ts
+++ b/packages/shared/lib/core/nfts/utils/isNftOwnedByAnyAccount.ts
@@ -1,8 +1,8 @@
 import { get } from 'svelte/store'
-import { allAccountNfts } from '../stores'
+import { allWalletNfts } from '../stores'
 
 export function isNftOwnedByAnyAccount(nftId: string): boolean {
-    for (const accountNfts of get(allAccountNfts) ?? []) {
+    for (const accountNfts of get(allWalletNfts) ?? []) {
         const nft = accountNfts.find((nft) => nft.id === nftId)
         if (nft?.isSpendable) {
             return true
diff --git a/packages/shared/lib/core/profile-manager/actions/deleteAccount.ts b/packages/shared/lib/core/profile-manager/actions/deleteAccount.ts
deleted file mode 100644
index 9bd50dd4c0a..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/deleteAccount.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { get } from 'svelte/store'
-
-import { setSelectedAccount } from '@core/account/actions'
-import { AppContext } from '@core/app/enums'
-import { removeAccountFromActiveAccounts, visibleActiveAccounts } from '@core/profile/stores'
-import { CannotRemoveAccountError, RemoveNotLastAccountError } from '@core/profile-manager/errors'
-import { removeLatestAccount } from '@core/profile-manager/api'
-import { routerManager } from '@core/router/stores'
-
-export async function deleteAccount(index: number): Promise<void> {
-    const accountToBeDeleted = get(visibleActiveAccounts).find((account) => account?.index === index)
-    const accounts = get(visibleActiveAccounts)
-
-    if (accountToBeDeleted !== accounts[accounts.length - 1]) {
-        throw new RemoveNotLastAccountError()
-    }
-
-    try {
-        await removeLatestAccount()
-        removeAccountFromActiveAccounts(index)
-        setSelectedAccount(get(visibleActiveAccounts)?.[0]?.index ?? null)
-        get(routerManager).resetRouterForAppContext(AppContext.Dashboard)
-    } catch (err) {
-        throw new CannotRemoveAccountError()
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts
deleted file mode 100644
index bbd9e108765..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/destroyProfileManager.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { get, Writable } from 'svelte/store'
-
-import { api } from '../api'
-import { IProfileManager } from '../interfaces'
-import { profileManager } from '../stores'
-
-export async function destroyProfileManager(
-    _profileManager: Writable<IProfileManager> = profileManager
-): Promise<void> {
-    const manager = get(_profileManager)
-    if (!manager) return
-
-    _profileManager.set(null)
-    api.deleteWallet(manager?.id)
-    await manager.destroy()
-}
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
deleted file mode 100644
index 50c15627698..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { AliasOutput, Event, NewOutputWalletEvent, OutputType, WalletEventType } from '@iota/sdk/out/types'
-
-import { getAddressesWithOutputs } from '@core/account'
-import { syncBalance } from '@core/account/actions/syncBalance'
-import { addNftsToDownloadQueue, addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput } from '@core/nfts'
-import { checkAndRemoveProfilePicture } from '@core/profile/actions'
-import { activeAccounts, updateActiveAccount } from '@core/profile/stores'
-import {
-    ActivityType,
-    IWrappedOutput,
-    addPersistedAsset,
-    generateActivities,
-    getOrRequestAssetFromPersistedAssets,
-} from '@core/wallet'
-import {
-    addActivitiesToAccountActivitiesInAllAccountActivities,
-    allAccountActivities,
-} from '@core/wallet/stores/all-account-activities.store'
-import { getBech32AddressFromAddressTypes } from '@core/wallet/utils/getBech32AddressFromAddressTypes'
-import { preprocessGroupedOutputs } from '@core/wallet/utils/outputs/preprocessGroupedOutputs'
-import { get } from 'svelte/store'
-import { validateWalletApiEvent } from '../../utils'
-
-export function handleNewOutputEvent(error: Error, rawEvent: Event): void {
-    const { accountIndex, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.NewOutput)
-    const type = payload.type
-    if (type === WalletEventType.NewOutput) {
-        void handleNewOutputEventInternal(accountIndex, payload as NewOutputWalletEvent)
-    }
-}
-
-export async function handleNewOutputEventInternal(accountIndex: number, payload: NewOutputWalletEvent): Promise<void> {
-    const account = get(activeAccounts)?.find((account) => account.index === accountIndex)
-    const outputData = payload.output
-
-    if (!account || !outputData) return
-
-    const output = outputData.output as AliasOutput
-
-    const address = getBech32AddressFromAddressTypes(outputData.address)
-    const isNewAliasOutput =
-        output.type === OutputType.Alias &&
-        output.stateIndex === 0 &&
-        !get(allAccountActivities)[accountIndex].find((_activity) => _activity.id === outputData.outputId)
-    const isNftOutput = output.type === OutputType.Nft
-
-    if ((account?.depositAddress === address && !outputData?.remainder) || isNewAliasOutput) {
-        await syncBalance(account.index)
-        const addressesWithOutputs = await getAddressesWithOutputs(account)
-        updateActiveAccount(account.index, { addressesWithOutputs })
-
-        const processedOutput = preprocessGroupedOutputs([outputData], payload?.transactionInputs ?? [], account)
-
-        const activities = await generateActivities(processedOutput, account)
-        for (const activity of activities) {
-            if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
-                const asset = await getOrRequestAssetFromPersistedAssets(activity.assetId)
-                if (asset) {
-                    addPersistedAsset(asset)
-                }
-            }
-        }
-        addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
-    }
-
-    if (isNftOutput) {
-        const wrappedOutput = outputData as unknown as IWrappedOutput
-        const nft = buildNftFromNftOutput(wrappedOutput, account.depositAddress)
-        addOrUpdateNftInAllAccountNfts(account.index, nft)
-        void addNftsToDownloadQueue(accountIndex, [nft])
-
-        checkAndRemoveProfilePicture()
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
deleted file mode 100644
index 7d2d1ed5af9..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleSpentOutputEvent.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { Event, SpentOutputWalletEvent, WalletEventType } from '@iota/sdk/out/types'
-
-import { syncBalance } from '@core/account/actions/syncBalance'
-import { getNftByIdFromAllAccountNfts, updateNftInAllAccountNfts } from '@core/nfts'
-import { activeAccounts, updateActiveAccount } from '@core/profile/stores'
-import { ActivityAsyncStatus, ActivityType } from '@core/wallet'
-import { allAccountActivities, updateAsyncDataByTransactionId } from '@core/wallet/stores/all-account-activities.store'
-import { get } from 'svelte/store'
-import { validateWalletApiEvent } from '../../utils'
-import { getAddressesWithOutputs } from '@core/account'
-
-export async function handleSpentOutputEvent(error: Error, rawEvent: Event): Promise<void> {
-    const { accountIndex, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.SpentOutput)
-    const type = payload.type
-    if (type === WalletEventType.SpentOutput) {
-        await handleSpentOutputEventInternal(accountIndex, payload as SpentOutputWalletEvent)
-    }
-}
-
-export async function handleSpentOutputEventInternal(
-    accountIndex: number,
-    payload: SpentOutputWalletEvent
-): Promise<void> {
-    const account = get(activeAccounts)?.find((account) => account.index === accountIndex)
-    const output = payload.output
-    await syncBalance(accountIndex)
-    if (account) {
-        const addressesWithOutputs = await getAddressesWithOutputs(account)
-        updateActiveAccount(account.index, { addressesWithOutputs })
-    }
-    const outputId = output?.outputId
-    const activity = get(allAccountActivities)?.[accountIndex]?.find((_activity) => _activity.outputId === outputId)
-
-    if (activity && activity.asyncData?.asyncStatus === ActivityAsyncStatus.Unclaimed) {
-        const transactionId = output?.metadata?.transactionId
-        updateAsyncDataByTransactionId(accountIndex, transactionId, {
-            asyncStatus: ActivityAsyncStatus.Claimed,
-        })
-    }
-
-    if (activity?.type === ActivityType.Nft) {
-        const previousOutputId = getNftByIdFromAllAccountNfts(accountIndex, activity.nftId)?.latestOutputId
-        const previousOutput = await account.getOutput(previousOutputId)
-        if (output.metadata.milestoneTimestampBooked > previousOutput.metadata.milestoneTimestampBooked) {
-            updateNftInAllAccountNfts(accountIndex, activity.nftId, { isSpendable: false })
-        }
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
deleted file mode 100644
index 9e26bb663b7..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionInclusionEvent.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
-import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
-
-import { updateParticipationOverview } from '@contexts/governance/stores'
-import { isAccountVoting } from '@contexts/governance/utils/isAccountVoting'
-import { syncVotingPower } from '@core/account'
-import { updateNftInAllAccountNfts } from '@core/nfts'
-import { updateActiveAccountPersistedData } from '@core/profile/actions'
-import { activeAccounts, updateActiveAccount } from '@core/profile/stores'
-import { ActivityAction, ActivityDirection, ActivityType, GovernanceActivity, InclusionState } from '@core/wallet'
-import { updateClaimingTransactionInclusion } from '@core/wallet/actions/activities/updateClaimingTransactionInclusion'
-import {
-    getActivityByTransactionId,
-    updateActivityByTransactionId,
-} from '@core/wallet/stores/all-account-activities.store'
-import { get } from 'svelte/store'
-import { validateWalletApiEvent } from '../../utils'
-
-export function handleTransactionInclusionEvent(error: Error, rawEvent: Event): void {
-    const { accountIndex, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionInclusion)
-    const type = payload?.type
-    if (type === WalletEventType.TransactionInclusion) {
-        handleTransactionInclusionEventInternal(accountIndex, payload as TransactionInclusionWalletEvent)
-    }
-}
-
-export function handleTransactionInclusionEventInternal(
-    accountIndex: number,
-    payload: TransactionInclusionWalletEvent
-): void {
-    const { inclusionState, transactionId } = payload
-    updateActivityByTransactionId(accountIndex, transactionId, { inclusionState })
-
-    const activity = getActivityByTransactionId(accountIndex, transactionId)
-
-    if (activity?.type === ActivityType.Nft) {
-        const isSpendable =
-            (activity.direction === ActivityDirection.Incoming ||
-                activity.direction === ActivityDirection.SelfTransaction) &&
-            activity.action !== ActivityAction.Burn
-        updateNftInAllAccountNfts(accountIndex, activity.nftId, { isSpendable })
-    }
-
-    if (activity?.type === ActivityType.Governance) {
-        handleGovernanceTransactionInclusionEvent(accountIndex, inclusionState, activity)
-    }
-
-    if (activity?.type === ActivityType.Consolidation) {
-        handleConsolidationTransactionInclusionEvent(accountIndex, inclusionState)
-    }
-
-    updateClaimingTransactionInclusion(transactionId, inclusionState, accountIndex)
-}
-
-function handleGovernanceTransactionInclusionEvent(
-    accountIndex: number,
-    inclusionState: InclusionState,
-    activity: GovernanceActivity
-): void {
-    if (inclusionState === InclusionState.Confirmed) {
-        // TODO: Normally we update active account after a wallet.rs returns a transaction
-        // With governance we wait for the transaction confirmation
-        // we should think about making this consistent in the future
-        updateActiveAccount(accountIndex, { isTransferring: false })
-        // TODO: move this
-        closePopup(true)
-
-        const account = get(activeAccounts)?.find((_account) => _account.index === accountIndex)
-        if (!account) {
-            return
-        }
-        if (account.hasVotingPowerTransactionInProgress) {
-            updateActiveAccount(accountIndex, { hasVotingPowerTransactionInProgress: false })
-            if (isAccountVoting(accountIndex) && activity.votingPower !== 0) {
-                updateActiveAccountPersistedData(accountIndex, { shouldRevote: true })
-                openPopup({ id: PopupId.Revote })
-            }
-        } else {
-            updateActiveAccount(accountIndex, { hasVotingTransactionInProgress: false })
-            updateActiveAccountPersistedData(accountIndex, { shouldRevote: false })
-        }
-        void updateParticipationOverview(accountIndex)
-    }
-    syncVotingPower(accountIndex)
-}
-
-function handleConsolidationTransactionInclusionEvent(accountIndex: number, inclusionState: InclusionState): void {
-    if (inclusionState === InclusionState.Confirmed) {
-        // TODO: Normally we update active account after a the sdk returns a transaction
-        // With output consolidation we wait for the transaction confirmation to improve the UX of the vesting tab
-        // we should think about making this consistent in the future
-        updateActiveAccount(accountIndex, { isTransferring: false })
-        const account = get(activeAccounts)?.find((_account) => _account.index === accountIndex)
-        if (!account) {
-            return
-        }
-        if (account?.hasConsolidatingOutputsTransactionInProgress) {
-            updateActiveAccount(accountIndex, { hasConsolidatingOutputsTransactionInProgress: false })
-        }
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/actions/index.ts b/packages/shared/lib/core/profile-manager/actions/index.ts
deleted file mode 100644
index 57b2bde5829..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export * from './events-handlers'
-
-export * from './changePasswordAndUnlockStronghold'
-export * from './deleteAccount'
-export * from './destroyProfileManager'
-export * from './initialiseProfileManager'
-export * from './subscribeToWalletApiEvents'
-export * from './unsubscribeFromWalletApiEvents'
diff --git a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts b/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
deleted file mode 100644
index 480c13a13b6..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/initialiseProfileManager.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { IClientOptions, CoinType, SecretManagerType, GenerateAddressOptions, Bip44 } from '@iota/sdk/out/types'
-
-import { generateRandomId } from '@core/utils'
-
-import { IProfileManager } from '../interfaces'
-import { api } from '../api';
-import { SecretManager } from '@iota/sdk';
-
-// TODO: Rename this to something like WalletManager or whatever
-class ProfileManager {
-    storagePath: string;
-    clientOptions?: IClientOptions;
-    secretManager?: SecretManagerType;
-    secretManagerBind?: SecretManager;
-    bipPath: Bip44
-    id: string
-
-    constructor( storagePath: string,
-        id: string,
-        secretManager?: SecretManagerType,
-        clientOptions?: IClientOptions,
-        coinType?: CoinType,
-        secretManagerBind?: SecretManager
-){
-            this.id = id;
-            this.storagePath = storagePath;
-            this.clientOptions = clientOptions;
-            this.bipPath = {
-                coinType: coinType
-            }
-            this.secretManager = secretManager;
-            this.secretManagerBind = secretManagerBind;
-        }
-
-        async generateEd25519Address(
-            accountIndex: number,
-            options: GenerateAddressOptions,
-            bech32Hrp: string
-        ): Promise<string> {
-            if(!this.secretManager){
-                return undefined
-            }
-            // Ledger secret manager doesn't support this
-            return (await this.secretManagerBind?.generateEd25519Addresses({
-                accountIndex, options, bech32Hrp,
-                range: {
-                    start: 0,
-                    end: 1,
-                },
-            }))[0]
-        }
-
-        async storeMnemonic(mnemonic: string): Promise<void> {
-            return this.secretManagerBind?.storeMnemonic(mnemonic)
-        }
-
-        getSecretManagerOptions(){
-            return {
-                storagePath: this.storagePath,
-                clientOptions: this.clientOptions,
-                bipPath: this.bipPath,
-                secretManager: this.secretManager
-            }
-        }
-}
-
-export async function initialiseProfileManager(
-    id: string,
-    storagePath: string,
-    coinType: CoinType,
-    clientOptions?: IClientOptions,
-    secretManager?: SecretManagerType,
-): Promise<IProfileManager> {
-
-    const secretManagerBind = await api.createSecretManager(secretManager); 
-
-    const profileManager = new ProfileManager( 
-        storagePath,
-        id,
-        secretManager,
-        clientOptions,
-        coinType,
-        secretManagerBind
-   );
-
-    return profileManager as unknown as IProfileManager;
-}
diff --git a/packages/shared/lib/core/profile-manager/actions/unsubscribeFromWalletApiEvents.ts b/packages/shared/lib/core/profile-manager/actions/unsubscribeFromWalletApiEvents.ts
deleted file mode 100644
index 60fe4553e5f..00000000000
--- a/packages/shared/lib/core/profile-manager/actions/unsubscribeFromWalletApiEvents.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { get, Writable } from 'svelte/store'
-
-import { IProfileManager } from '../interfaces'
-import { profileManager as _profileManager } from '../stores'
-
-export async function unsubscribeFromWalletApiEvents(
-    profileManager: Writable<IProfileManager> = _profileManager
-): Promise<void> {
-    await get(profileManager)?.clearListeners([])
-}
diff --git a/packages/shared/lib/core/profile-manager/api/changeStrongholdPassword.ts b/packages/shared/lib/core/profile-manager/api/changeStrongholdPassword.ts
deleted file mode 100644
index 9e617c6d989..00000000000
--- a/packages/shared/lib/core/profile-manager/api/changeStrongholdPassword.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { profileManager } from '@core/profile-manager/stores'
-import { get } from 'svelte/store'
-
-export async function changeStrongholdPassword(currentPassword: string, newPassword: string): Promise<void> {
-    const manager = get(profileManager)
-    await manager.changeStrongholdPassword(currentPassword, newPassword)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/clearStrongholdPassword.ts b/packages/shared/lib/core/profile-manager/api/clearStrongholdPassword.ts
deleted file mode 100644
index 77767117a15..00000000000
--- a/packages/shared/lib/core/profile-manager/api/clearStrongholdPassword.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export async function clearStrongholdPassword(): Promise<void> {
-    const manager = get(profileManager)
-    // TODO: Find the root cause that makes the profileManager be `null` https://github.com/iotaledger/firefly/issues/7456
-    await manager?.clearStrongholdPassword()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/createAccount.ts b/packages/shared/lib/core/profile-manager/api/createAccount.ts
deleted file mode 100644
index 0ac6083403c..00000000000
--- a/packages/shared/lib/core/profile-manager/api/createAccount.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { get, Writable } from 'svelte/store'
-
-import { CreateAccountPayload } from '@iota/sdk/out/types'
-
-import { IAccount } from '@core/account'
-
-import { api, IProfileManager, profileManager } from '..'
-import { generateRandomId } from '@core/utils'
-
-export function createAccount(
-    payload: CreateAccountPayload,
-    manager: Writable<IProfileManager> = profileManager
-): Promise<IAccount> {
-    const profileManager = get(manager)
-    const id = `${profileManager.id}-0`;
-    return api.createAccount(id, {
-        ...payload,
-        ...profileManager.getSecretManagerOptions()
-    })
-}
diff --git a/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts b/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts
deleted file mode 100644
index ab7168a2da4..00000000000
--- a/packages/shared/lib/core/profile-manager/api/generateMnemonic.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { api } from '../api'
-
-export function generateMnemonic(): Promise<string> {
-    return api.generateMnemonic()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/getAccount.ts b/packages/shared/lib/core/profile-manager/api/getAccount.ts
deleted file mode 100644
index 4342c30242c..00000000000
--- a/packages/shared/lib/core/profile-manager/api/getAccount.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { get } from 'svelte/store'
-
-import { IAccount } from '@core/account'
-
-import { api } from './api'
-import { profileManager } from '../stores'
-
-export function getAccount(index: number, manager = profileManager): Promise<IAccount> {
-    const { id } = get(manager) ?? {}
-    if (id) {
-        return api.getAccount(id, index)
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/api/getAccounts.ts b/packages/shared/lib/core/profile-manager/api/getAccounts.ts
deleted file mode 100644
index 3dfb3454b73..00000000000
--- a/packages/shared/lib/core/profile-manager/api/getAccounts.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { IAccount } from '@core/account'
-import { api } from './api'
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export async function getAccounts(): Promise<IAccount[]> {
-    const manager = get(profileManager)
-    return api.getAccounts(manager.id, {
-        ...manager
-    })
-}
diff --git a/packages/shared/lib/core/profile-manager/api/getClient.ts b/packages/shared/lib/core/profile-manager/api/getClient.ts
deleted file mode 100644
index acd15893488..00000000000
--- a/packages/shared/lib/core/profile-manager/api/getClient.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Client } from '@iota/sdk/out/client'
-import { get } from 'svelte/store'
-import { selectedAccount } from '@core/account'
-
-export function getClient(): Promise<Client> {
-    const account = get(selectedAccount)
-    return account!.getClient()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts b/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
deleted file mode 100644
index 7d4eccf10b8..00000000000
--- a/packages/shared/lib/core/profile-manager/api/getLedgerNanoStatus.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { LedgerNanoStatus } from '@iota/sdk/out/types'
-import { get } from 'svelte/store'
-import { profileManager as _profileManager } from '@core/profile-manager/stores'
-
-export function getLedgerNanoStatus(profileManager = _profileManager): Promise<LedgerNanoStatus> {
-    const manager = get(profileManager)
-    return manager.getLedgerNanoStatus()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts b/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts
deleted file mode 100644
index aefc46d9acf..00000000000
--- a/packages/shared/lib/core/profile-manager/api/getNodeInfo.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { IAuth } from '@core/network'
-import { INodeInfoResponse } from '@core/network/interfaces/node-info-response.interface'
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-import { api } from '../api'
-import { selectedAccount } from '@core/account'
-
-export async function getNodeInfo(url?: string, auth?: IAuth): Promise<INodeInfoResponse> {
-    const wallet = get(selectedAccount)
-    
-    const client = await wallet!.getClient()
-    const nodeUrl = url ?? (await client.getNode()).url
-
-    const nodeInfo = await client.getNodeInfo(nodeUrl, auth)
-
-    return {
-        url: nodeUrl,
-        nodeInfo,
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/api/index.ts b/packages/shared/lib/core/profile-manager/api/index.ts
deleted file mode 100644
index 10c123085b7..00000000000
--- a/packages/shared/lib/core/profile-manager/api/index.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-export * from './api'
-export * from './backup'
-export * from './changeStrongholdPassword'
-export * from './clearStrongholdPassword'
-export * from './createAccount'
-export * from './generateMnemonic'
-export * from './getAccount'
-export * from './getAccounts'
-export * from './getClient'
-export * from './getLedgerNanoStatus'
-export * from './getNodeInfo'
-export * from './isStrongholdUnlocked'
-export * from './recoverAccounts'
-export * from './removeLatestAccount'
-export * from './restoreBackup'
-export * from './setClientOptions'
-export * from './setStrongholdPassword'
-export * from './setStrongholdPasswordClearInterval'
-export * from './startBackgroundSync'
-export * from './storeMnemonic'
-export * from './verifyMnemonic'
diff --git a/packages/shared/lib/core/profile-manager/api/isStrongholdUnlocked.ts b/packages/shared/lib/core/profile-manager/api/isStrongholdUnlocked.ts
deleted file mode 100644
index f2175e222d5..00000000000
--- a/packages/shared/lib/core/profile-manager/api/isStrongholdUnlocked.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export function isStrongholdUnlocked(): Promise<boolean> {
-    const manager = get(profileManager)
-    return manager.isStrongholdPasswordAvailable()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/recoverAccounts.ts b/packages/shared/lib/core/profile-manager/api/recoverAccounts.ts
deleted file mode 100644
index c989821d238..00000000000
--- a/packages/shared/lib/core/profile-manager/api/recoverAccounts.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { get } from 'svelte/store'
-
-import { IAccount } from '@core/account'
-
-import { profileManager } from '../stores'
-import { api } from '../api'
-import { RecoverAccountsPayload } from '../interfaces'
-
-export function recoverAccounts(
-    recoverAccountsPayload: RecoverAccountsPayload,
-    manager = profileManager
-): Promise<IAccount[]> {
-    const { id } = get(manager)
-    return api.recoverAccounts(id, recoverAccountsPayload)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/removeLatestAccount.ts b/packages/shared/lib/core/profile-manager/api/removeLatestAccount.ts
deleted file mode 100644
index 877feb5131f..00000000000
--- a/packages/shared/lib/core/profile-manager/api/removeLatestAccount.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { get } from 'svelte/store'
-
-import { profileManager } from '../stores'
-
-export async function removeLatestAccount(): Promise<void> {
-    const manager = get(profileManager)
-    return manager.removeLatestAccount()
-}
diff --git a/packages/shared/lib/core/profile-manager/api/setClientOptions.ts b/packages/shared/lib/core/profile-manager/api/setClientOptions.ts
deleted file mode 100644
index 2ff3c51c82f..00000000000
--- a/packages/shared/lib/core/profile-manager/api/setClientOptions.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ClientOptions } from '@core/network'
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export async function setClientOptions(clientOptions: Partial<ClientOptions>): Promise<void> {
-    const manager = get(profileManager)
-    await manager.setClientOptions(clientOptions)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/setStrongholdPassword.ts b/packages/shared/lib/core/profile-manager/api/setStrongholdPassword.ts
deleted file mode 100644
index 16bcda6cbcb..00000000000
--- a/packages/shared/lib/core/profile-manager/api/setStrongholdPassword.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { selectedAccount } from '@core/account'
-import { get } from 'svelte/store'
-
-export async function setStrongholdPassword(password: string): Promise<void> {
-    const account = get(selectedAccount)
-    // Otherwise error is thrown, if password is still present in memory
-    await account?.clearStrongholdPassword()
-    await account?.setStrongholdPassword(password)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/setStrongholdPasswordClearInterval.ts b/packages/shared/lib/core/profile-manager/api/setStrongholdPasswordClearInterval.ts
deleted file mode 100644
index 87246f72a3a..00000000000
--- a/packages/shared/lib/core/profile-manager/api/setStrongholdPasswordClearInterval.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export async function setStrongholdPasswordClearInterval(intervalInSeconds: number): Promise<void> {
-    const manager = get(profileManager)
-    await manager.setStrongholdPasswordClearInterval(intervalInSeconds * 1000)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts b/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
deleted file mode 100644
index 9d7c303e7d7..00000000000
--- a/packages/shared/lib/core/profile-manager/api/startBackgroundSync.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { SyncOptions } from '@iota/sdk/out/types'
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export async function startBackgroundSync(options?: SyncOptions, interval?: number): Promise<void> {
-    const manager = get(profileManager)
-    await manager.startBackgroundSync(options, interval)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/storeMnemonic.ts b/packages/shared/lib/core/profile-manager/api/storeMnemonic.ts
deleted file mode 100644
index 16b94c60612..00000000000
--- a/packages/shared/lib/core/profile-manager/api/storeMnemonic.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { get } from 'svelte/store'
-import { profileManager } from '../stores'
-
-export async function storeMnemonic(mnemonic: string): Promise<void> {
-    const manager = get(profileManager)
-    await manager.storeMnemonic(mnemonic)
-}
diff --git a/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts b/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts
deleted file mode 100644
index 3e5e6d125a0..00000000000
--- a/packages/shared/lib/core/profile-manager/api/verifyMnemonic.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { api } from '../api'
-
-export async function verifyMnemonic(mnemonic: string): Promise<void> {
-    return api.verifyMnemonic(mnemonic)
-}
diff --git a/packages/shared/lib/core/profile-manager/errors/cannot-remove-account.error.ts b/packages/shared/lib/core/profile-manager/errors/cannot-remove-account.error.ts
deleted file mode 100644
index 9aeeafe6bcd..00000000000
--- a/packages/shared/lib/core/profile-manager/errors/cannot-remove-account.error.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { BaseError } from '@core/error'
-import { localize } from '@core/i18n'
-
-export class CannotRemoveAccountError extends BaseError {
-    constructor() {
-        super({ message: localize('error.account.cannotRemove'), showNotification: true })
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/errors/index.ts b/packages/shared/lib/core/profile-manager/errors/index.ts
deleted file mode 100644
index 112c40b4b11..00000000000
--- a/packages/shared/lib/core/profile-manager/errors/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './cannot-remove-account.error'
-export * from './missing-transaction-progress-event-payload.error'
-export * from './remove-account-with-balance.error'
-export * from './remove-not-last-account.error'
-export * from './wallet-api-event.error'
-export * from './wallet-api-event-validation.error'
diff --git a/packages/shared/lib/core/profile-manager/errors/remove-account-with-balance.error.ts b/packages/shared/lib/core/profile-manager/errors/remove-account-with-balance.error.ts
deleted file mode 100644
index 91f132c2e50..00000000000
--- a/packages/shared/lib/core/profile-manager/errors/remove-account-with-balance.error.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { BaseError } from '@core/error'
-import { localize } from '@core/i18n'
-
-export class RemoveAccountWithBalanceError extends BaseError {
-    constructor() {
-        super({ message: localize('error.account.withBalance'), logToConsole: true })
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/errors/remove-not-last-account.error.ts b/packages/shared/lib/core/profile-manager/errors/remove-not-last-account.error.ts
deleted file mode 100644
index 47e393b4bf1..00000000000
--- a/packages/shared/lib/core/profile-manager/errors/remove-not-last-account.error.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { BaseError } from '@core/error'
-import { localize } from '@core/i18n'
-
-export class RemoveNotLastAccountError extends BaseError {
-    constructor() {
-        super({ message: localize('error.account.notLast'), logToConsole: true })
-    }
-}
diff --git a/packages/shared/lib/core/profile-manager/index.ts b/packages/shared/lib/core/profile-manager/index.ts
deleted file mode 100644
index c5fb9be2379..00000000000
--- a/packages/shared/lib/core/profile-manager/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './actions'
-export * from './api'
-export * from './errors'
-export * from './interfaces'
-export * from './stores'
-export * from './types'
-export * from './utils'
diff --git a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
deleted file mode 100644
index 1baf0400542..00000000000
--- a/packages/shared/lib/core/profile-manager/interfaces/api.interface.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { WalletOptions, CreateAccountPayload, TransactionId, OutputId } from '@iota/sdk/out/types'
-import { AliasId, Client, FoundryId, HexEncodedString, NftId, Output } from '@iota/sdk'
-import { IAuth } from '@core/network'
-import { INodeInfoResponse } from '@core/network/interfaces'
-
-import { IAccount } from '@core/account'
-
-import { IProfileManager } from './profile-manager.interface'
-import { RecoverAccountsPayload } from './recover-account-payload.interface'
-
-export interface IApi {
-    createSecretManager(options: any): Promise<SecretManager>
-    getNodeInfo(profileManagerId: string, url?: string, auth?: IAuth): Promise<INodeInfoResponse>
-    createAccount(id: string, payload: CreateAccountPayload): Promise<IAccount>
-    deleteWallet(id: string): void
-    getAccount(profileManagerId: string, index: number): Promise<IAccount>
-    getAccounts(profileManagerId: string, payload: CreateAccountPayload): Promise<IAccount[]>
-    recoverAccounts(profileManagerId: string, payload: RecoverAccountsPayload): Promise<IAccount[]>
-    migrateStrongholdSnapshotV2ToV3(
-        currentPath: string,
-        currentPassword: string,
-        newPath: string,
-        newPassword: string
-    ): Promise<void>
-    migrateDbChrysalisToStardust(path: string, pinCode: string): Promise<Record<string, unknown>>
-    // Mapped from sdk#Utils
-    generateMnemonic(): Promise<string>
-    verifyMnemonic(mnemonic: string): Promise<void>
-    hexToBech32(hex: string, bech32Hrp: string): string
-    bech32ToHex(bech32: string): string
-    computeAliasId(outputId: string): AliasId
-    computeFoundryId(aliasId: AliasId, serialNumber: number, tokenSchemeType: number): Promise<FoundryId>
-    computeNftId(outputId: string): NftId
-    hexPublicKeyToBech32Address(hex: string, bech32Hrp: string): string
-    aliasIdToBech32(aliasId: string, bech32Hrp: string): string
-    nftIdToBech32(nftId: string, bech32Hrp: string): string
-    computeOutputId(id: TransactionId, index: number): Promise<OutputId>
-    outputHexBytes(output: Output): Promise<HexEncodedString>
-}
diff --git a/packages/shared/lib/core/profile-manager/interfaces/index.ts b/packages/shared/lib/core/profile-manager/interfaces/index.ts
deleted file mode 100644
index d2d6418db9e..00000000000
--- a/packages/shared/lib/core/profile-manager/interfaces/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './api.interface'
-export * from './profile-manager.interface'
-export * from './recover-account-payload.interface'
-export * from './wallet-api-event-payload-wrapper.interface'
-export * from './wallet-api-event-subscription-configuration.interface'
diff --git a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts b/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
deleted file mode 100644
index 5772d8b9578..00000000000
--- a/packages/shared/lib/core/profile-manager/interfaces/profile-manager.interface.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import type {
-    IClientOptions,
-    GenerateAddressOptions,
-    LedgerNanoStatus,
-    INodeInfoWrapper,
-    SyncOptions,
-    WalletEvent,
-    WalletEventType,
-} from '@iota/sdk/out/types'
-
-import { IAccount } from '@core/account/interfaces'
-import { IAuth } from '@core/network/interfaces'
-
-import { WalletApiEventHandler } from '../types'
-
-export interface IProfileManager {
-    id: string
-    getSecretManagerOptions(): any, // TODO: Use proper type
-    backup(destination: string, password: string): Promise<void>
-    bech32ToHex(bech32Address: string): Promise<string>
-    destroy(): Promise<void>
-    emitTestEvent(event: WalletEvent): Promise<void>
-    generateEd25519Address(
-        accountIndex: number,
-        options?: GenerateAddressOptions,
-        bech32Hrp?: string
-    ): Promise<string>
-    getAccountIndexes(): Promise<number[]>
-    getAccount(accountIndex: number): Promise<IAccount>
-    getAccounts(): Promise<IAccount[]>
-    getNodeInfo(url?: string, auth?: IAuth): Promise<INodeInfoWrapper>
-    getLedgerNanoStatus(): Promise<LedgerNanoStatus>
-    hexToBech32(hex: string, bech32Hrp?: string): Promise<string>
-    listen(eventTypes: WalletEventType[], callback: WalletApiEventHandler): Promise<void>
-    clearListeners(eventTypes: WalletEventType[]): Promise<void>
-    removeLatestAccount(): Promise<void>
-    restoreBackup(
-        source: string,
-        password: string,
-        ignoreIfCoinTypeMismatch: boolean,
-        ignoreIfBech32Mismatch: string
-    ): Promise<void>
-    setClientOptions(options: IClientOptions): Promise<void>
-    startBackgroundSync(options?: SyncOptions, intervalInMilliseconds?: number): Promise<void>
-    stopBackgroundSync(): Promise<void>
-    storeMnemonic(mnemonic: string): Promise<void>
-    updateNodeAuth(url: string, auth?: IAuth): Promise<void>
-}
diff --git a/packages/shared/lib/core/profile-manager/stores/index.ts b/packages/shared/lib/core/profile-manager/stores/index.ts
deleted file mode 100644
index e666a8b5b7e..00000000000
--- a/packages/shared/lib/core/profile-manager/stores/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './profile-manager.store'
diff --git a/packages/shared/lib/core/profile-manager/stores/profile-manager.store.ts b/packages/shared/lib/core/profile-manager/stores/profile-manager.store.ts
deleted file mode 100644
index 84a9619d3b5..00000000000
--- a/packages/shared/lib/core/profile-manager/stores/profile-manager.store.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { get, writable } from 'svelte/store'
-import { IProfileManager } from '../interfaces'
-
-export const profileManager = writable<IProfileManager>(null)
-
-export function getProfileManager(): IProfileManager {
-    return get(profileManager)
-}
diff --git a/packages/shared/lib/core/profile-manager/tests/api.test.ts b/packages/shared/lib/core/profile-manager/tests/api.test.ts
deleted file mode 100644
index d36ab23f511..00000000000
--- a/packages/shared/lib/core/profile-manager/tests/api.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import '@mocks/crypto.mock'
-import { ProfileManagerMock } from '@mocks/profile-manager.mock'
-import { MOCK_MNEMONIC } from '@mocks/api.mock'
-
-import { get } from 'svelte/store'
-
-import { generateRandomId } from '../../../core/utils/'
-
-import { destroyProfileManager } from '../actions'
-import { generateMnemonic, setStrongholdPassword, storeMnemonic, verifyMnemonic, backup, restoreBackup } from '../api'
-import { profileManager } from '../stores'
-import { IApi } from '../interfaces'
-
-describe('File: api.test.ts', () => {
-    let profileManagerMock: ProfileManagerMock
-    let spy: jest.SpyInstance
-    const api: IApi = window['__WALLET__API__']
-
-    const password = 'password'
-
-    beforeEach(() => {
-        const id = generateRandomId()
-        profileManagerMock = new ProfileManagerMock(id)
-        profileManager.set(profileManagerMock)
-    })
-
-    it('should setup the profile manager correctly', () => {
-        expect(profileManager).toBeDefined()
-    })
-
-    it('should destroy the profile manager correctly', async () => {
-        await destroyProfileManager()
-        expect(get(profileManager)).toBeNull()
-    })
-
-    describe('Function: generateMnemonic', () => {
-        it('should execute generateMnemonic correctly', async () => {
-            spy = jest.spyOn(api, 'generateMnemonic')
-            const actual = await generateMnemonic()
-            expect(actual).toEqual(MOCK_MNEMONIC)
-            expect(spy).toHaveBeenCalledTimes(1)
-            spy.mockRestore()
-        })
-    })
-
-    describe('Function: setStrongholdPassword', () => {
-        it('should call setStrongholdPassword', async () => {
-            spy = jest.spyOn(profileManagerMock, 'setStrongholdPassword')
-            await setStrongholdPassword(password)
-            expect(spy).toBeCalledWith(password)
-            expect(spy).toBeCalledTimes(1)
-            spy.mockRestore()
-        })
-    })
-
-    describe('Function: storeMnemonic', () => {
-        it('should execute storeMnemonic', async () => {
-            spy = jest.spyOn(profileManagerMock, 'storeMnemonic')
-            await storeMnemonic(MOCK_MNEMONIC)
-            expect(spy).toBeCalledWith(MOCK_MNEMONIC)
-            expect(spy).toBeCalledTimes(1)
-            spy.mockRestore()
-        })
-    })
-
-    describe('Function: verifyMnemonic', () => {
-        it('should call verifyMnemonic', async () => {
-            spy = jest.spyOn(api, 'verifyMnemonic')
-            await verifyMnemonic(MOCK_MNEMONIC)
-            expect(spy).toBeCalledWith(MOCK_MNEMONIC)
-            expect(spy).toBeCalledTimes(1)
-            spy.mockRestore()
-        })
-    })
-
-    describe('Function: backup', () => {
-        it('should call backup', async () => {
-            spy = jest.spyOn(profileManagerMock, 'backup')
-            const destination = './destination'
-            await backup(destination, password)
-            expect(spy).toBeCalledWith(destination, password)
-            expect(spy).toBeCalledTimes(1)
-            spy.mockRestore()
-        })
-    })
-
-    describe('Function: restoreBackup', () => {
-        it('should call restoreBackup', async () => {
-            spy = jest.spyOn(profileManagerMock, 'restoreBackup')
-            const importFilePath = './backup.stronghold'
-            await restoreBackup(importFilePath, password, 'rms')
-            expect(spy).toBeCalledWith(importFilePath, password, true, 'rms')
-            expect(spy).toBeCalledTimes(1)
-            spy.mockRestore()
-        })
-    })
-})
diff --git a/packages/shared/lib/core/profile-manager/types/index.ts b/packages/shared/lib/core/profile-manager/types/index.ts
deleted file mode 100644
index c891ec9df20..00000000000
--- a/packages/shared/lib/core/profile-manager/types/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './profile-manager-options.type'
-export * from './transaction-progress-event.type'
-export * from './wallet-api-event-handler.type'
-export * from './wallet-api-event-map.type'
diff --git a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts b/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
deleted file mode 100644
index eeba13fe361..00000000000
--- a/packages/shared/lib/core/profile-manager/types/profile-manager-options.type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { ClientOptions } from '@core/network/interfaces'
-import { WalletOptions } from '@iota/sdk/out/types'
-
-export type ProfileManagerOptions = Omit<WalletOptions, 'clientOptions'> & {
-    clientOptions: ClientOptions
-}
diff --git a/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts b/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
deleted file mode 100644
index 2a2ffa52554..00000000000
--- a/packages/shared/lib/core/profile-manager/types/transaction-progress-event.type.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import {
-    SelectingInputsProgress,
-    GeneratingRemainderDepositAddressProgress,
-    PreparedTransactionProgress,
-    PreparedTransactionEssenceHashProgress,
-    SigningTransactionProgress,
-    PerformingPowProgress,
-    BroadcastingProgress,
-} from '@iota/sdk/out/types'
-
-export type TransactionProgressEventPayload =
-    | SelectingInputsProgress
-    | GeneratingRemainderDepositAddressProgress
-    | PreparedTransactionProgress
-    | PreparedTransactionEssenceHashProgress
-    | SigningTransactionProgress
-    | PerformingPowProgress
-    | BroadcastingProgress
diff --git a/packages/shared/lib/core/profile-manager/utils/index.ts b/packages/shared/lib/core/profile-manager/utils/index.ts
deleted file mode 100644
index a6266fa919a..00000000000
--- a/packages/shared/lib/core/profile-manager/utils/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './buildProfileManagerOptionsFromProfileData'
-export * from './getSecretManagerFromProfileType'
-export * from './getSecretManagerPath'
-export * from './validateWalletApiEvent'
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts b/packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts
index 32acd47221c..b9e517d3fd8 100644
--- a/packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts
+++ b/packages/shared/lib/core/profile/actions/active-accounts/findActiveAccountWithAddress.ts
@@ -1,16 +1,16 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { get } from 'svelte/store'
-import { activeAccounts } from '../../stores'
+import { activeWallets } from '../../stores'
 
 /**
- * Find an address in one of our accounts
+ * Find an address in one of our wallets
  * @param address The address to find
- * @returns The wallet account matching the address or undefined if not found
+ * @returns The wallet matching the address or undefined if not found
  */
-export function findActiveAccountWithAddress(address: string): IAccountState {
+export function findActiveAccountWithAddress(address: string): IWalletState {
     if (!address) {
         return
     }
-    const accounts = get(activeAccounts)
-    return accounts.find((account) => account.depositAddress === address)
+    const wallets = get(activeWallets)
+    return wallets.find((wallet) => wallet.depositAddress === address)
 }
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/getWalletColorById.ts b/packages/shared/lib/core/profile/actions/active-accounts/getWalletColorById.ts
new file mode 100644
index 00000000000..8acb27fb37a
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/active-accounts/getWalletColorById.ts
@@ -0,0 +1,7 @@
+import { get } from 'svelte/store'
+import { visibleActiveWallets } from '../../stores'
+
+// TODO(2.0) Fix all usages
+export function getWalletColorById(walletId: string): string {
+    return get(visibleActiveWallets)?.find((wallet) => wallet.id === walletId)?.color as string
+}
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/index.ts b/packages/shared/lib/core/profile/actions/active-accounts/index.ts
index cd6795603e1..88085deb5d3 100644
--- a/packages/shared/lib/core/profile/actions/active-accounts/index.ts
+++ b/packages/shared/lib/core/profile/actions/active-accounts/index.ts
@@ -1,2 +1,3 @@
 export * from './findActiveAccountWithAddress'
 export * from './updateActiveAccountPersistedData'
+export * from './getWalletColorById'
\ No newline at end of file
diff --git a/packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts b/packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
index 38e6680114b..af7c0f5e27e 100644
--- a/packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
+++ b/packages/shared/lib/core/profile/actions/active-accounts/updateActiveAccountPersistedData.ts
@@ -1,14 +1,14 @@
-import { selectedAccountIndex, updateSelectedAccount } from '@core/account/stores'
-import { IPersistedAccountData } from '@core/account/interfaces'
-import { updateAccountPersistedDataOnActiveProfile } from '@core/profile'
+import { updateWalletPersistedDataOnActiveProfile } from '@core/profile'
+import { IPersistedWalletData, updateSelectedWallet, selectedWalletId } from '@core/wallet'
 import { get } from 'svelte/store'
 
+// TODO(2.0) Update this this and fix all usages
 export function updateActiveAccountPersistedData(
-    acccountIndex: number,
-    partialAccountPersistedData: Partial<IPersistedAccountData>
+    walletId: string,
+    partialWalletPersistedData: Partial<IPersistedWalletData>
 ): void {
-    if (get(selectedAccountIndex) === acccountIndex) {
-        updateSelectedAccount(partialAccountPersistedData)
+    if (get(selectedWalletId) === walletId) {
+        updateSelectedWallet(partialWalletPersistedData)
     }
-    updateAccountPersistedDataOnActiveProfile(acccountIndex, partialAccountPersistedData)
+    updateWalletPersistedDataOnActiveProfile(walletId, partialWalletPersistedData)
 }
diff --git a/packages/shared/lib/core/profile/actions/active-profile/index.ts b/packages/shared/lib/core/profile/actions/active-profile/index.ts
index a39cdddbf6d..4f903793ec2 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/index.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/index.ts
@@ -4,7 +4,7 @@ export * from './checkAndUpdateActiveProfileNetwork'
 export * from './getBaseToken'
 export * from './getCoinType'
 export * from './getNetworkHrp'
-export * from './loadAccounts'
+export * from './loadWallets'
 export * from './loadPersistedProfileIntoActiveProfile'
 export * from './lockStronghold'
 export * from './login'
diff --git a/packages/shared/lib/core/profile/actions/active-profile/loadAccounts.ts b/packages/shared/lib/core/profile/actions/active-profile/loadAccounts.ts
deleted file mode 100644
index 91335db9bb8..00000000000
--- a/packages/shared/lib/core/profile/actions/active-profile/loadAccounts.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { loadAccount } from '@core/account'
-import { getAccounts } from '@core/profile-manager'
-import { get } from 'svelte/store'
-import { activeAccounts, activeProfile } from '../../stores'
-
-export async function loadAccounts(): Promise<void> {
-    const { hasLoadedAccounts } = get(activeProfile)
-    const accountsResponse = await getAccounts()
-    if (accountsResponse.length === 0) {
-        hasLoadedAccounts.set(true)
-        return
-    }
-    if (accountsResponse) {
-        const loadedAccounts = await Promise.all(
-            accountsResponse?.map((accountResponse) => loadAccount(accountResponse))
-        )
-        activeAccounts.set(loadedAccounts.sort((a, b) => a.getMetadata().index - b.getMetadata().index))
-        hasLoadedAccounts.set(true)
-    }
-}
diff --git a/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts b/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts
new file mode 100644
index 00000000000..cd7b7a0e1c2
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/active-profile/loadWallets.ts
@@ -0,0 +1,20 @@
+import { loadWallet } from '@core/wallet'
+import { get } from 'svelte/store'
+import { activeAccounts, activeProfile } from '../../stores'
+import { getWallets } from '../getWallets'
+
+export async function loadWallets(): Promise<void> {
+    const { hasLoadedAccounts } = get(activeProfile)
+    const walletResponse = await getWallets()
+    if (walletResponse.length === 0) {
+        hasLoadedAccounts.set(true)
+        return
+    }
+    if (walletResponse) {
+        const loadedWallets = await Promise.all(
+            walletResponse?.map((accountResponse) => loadWallet(accountResponse))
+        )
+        activeAccounts.set(loadedWallets) // TODO(2.0) We can't sort this like this: sort((a, b) => a.getMetadata().index - b.getMetadata().index)
+        hasLoadedAccounts.set(true)
+    }
+}
diff --git a/packages/shared/lib/core/profile/actions/active-profile/lockStronghold.ts b/packages/shared/lib/core/profile/actions/active-profile/lockStronghold.ts
index e92dd0f8ace..a2e810720b6 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/lockStronghold.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/lockStronghold.ts
@@ -1,5 +1,5 @@
 import { activeProfile } from '@core/profile'
-import { clearStrongholdPassword } from '@core/profile-manager'
+import { clearStrongholdPassword } from '@core/secret-manager'
 import { get } from 'svelte/store'
 import { reflectLockedStronghold } from './reflectLockedStronghold'
 
diff --git a/packages/shared/lib/core/profile/actions/active-profile/login.ts b/packages/shared/lib/core/profile/actions/active-profile/login.ts
index 7553b108da4..f741716598f 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/login.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/login.ts
@@ -1,30 +1,16 @@
 import { initializeRegisteredProposals, registerProposalsFromNodes } from '@contexts/governance/actions'
-import { cleanupOnboarding } from '@contexts/onboarding/actions'
-import { createNewAccount, setSelectedAccount } from '@core/account/actions'
-import { DEFAULT_SYNC_OPTIONS } from '@core/account/constants'
-import { IAccount } from '@core/account/interfaces'
+import { cleanupOnboarding, initialiseOnboardingProfileWithSecretManager } from '@contexts/onboarding/actions'
 import { Platform } from '@core/app/classes'
 import { AppContext } from '@core/app/enums'
 import { handleError } from '@core/error/handlers'
 import { pollLedgerNanoStatus } from '@core/ledger/actions'
 import { pollMarketPrices } from '@core/market/actions'
 import { pollNetworkStatus } from '@core/network/actions'
-import { initialiseProfileManager } from '@core/profile-manager/actions'
 import { loadNftsForActiveProfile } from '@core/nfts'
-import {
-    getAccounts,
-    isStrongholdUnlocked,
-    recoverAccounts,
-    setStrongholdPasswordClearInterval,
-    startBackgroundSync,
-} from '@core/profile-manager/api'
-import { RecoverAccountsPayload } from '@core/profile-manager/interfaces'
-import { profileManager } from '@core/profile-manager/stores'
-import { buildProfileManagerOptionsFromProfileData } from '@core/profile-manager/utils'
 import { routerManager } from '@core/router/stores'
 import { SECONDS_PER_MINUTE } from '@core/utils'
 import { sleep } from '@core/utils/os'
-import { generateAndStoreActivitiesForAllAccounts, refreshAccountAssetsForActiveProfile } from '@core/wallet/actions'
+import { createNewWallet, generateAndStoreActivitiesForAllAccounts, isStrongholdUnlocked, refreshAccountAssetsForActiveProfile, setSelectedWallet } from '@core/wallet/actions'
 import { get } from 'svelte/store'
 import {
     CHECK_PREVIOUS_MANAGER_IS_DESTROYED_INTERVAL,
@@ -32,46 +18,46 @@ import {
     DEFAULT_ACCOUNT_RECOVERY_CONFIGURATION,
 } from '../../constants'
 import { ProfileType } from '../../enums'
-import { ILoginOptions } from '../../interfaces'
+import { ILoginOptions, IWallet } from '../../interfaces'
 import {
-    activeAccounts,
     activeProfile,
+    activeWallets,
     incrementLoginProgress,
-    isDestroyingManager,
+    isDestroyingWallets,
     resetLoginProgress,
     setTimeStrongholdLastUnlocked,
     updateActiveProfile,
 } from '../../stores'
 import { isLedgerProfile } from '../../utils'
-import { loadAccounts } from './loadAccounts'
+import { loadWallets } from './loadWallets'
 import { logout } from './logout'
 import { subscribeToWalletApiEventsForActiveProfile } from './subscribeToWalletApiEventsForActiveProfile'
 import { checkAndUpdateActiveProfileNetwork } from './checkAndUpdateActiveProfileNetwork'
 import { checkAndRemoveProfilePicture } from './checkAndRemoveProfilePicture'
-import { checkActiveProfileAuth } from '@core/profile'
+import { checkActiveProfileAuth, getWallets } from '@core/profile'
+import { isOnboardingSecretManagerInitialized } from 'shared/lib/contexts/onboarding'
+import { setStrongholdPasswordClearInterval, startBackgroundSync } from '@core/wallet/actions'
 
+// TODO(2.0) Remove usage of profile manager
 export async function login(loginOptions?: ILoginOptions): Promise<void> {
     const loginRouter = get(routerManager).getRouterForAppContext(AppContext.Login)
     try {
         const _activeProfile = get(activeProfile)
-        const { loggedIn, lastActiveAt, id, isStrongholdLocked, type, lastUsedAccountIndex } = _activeProfile
+        const { loggedIn, lastActiveAt, id, isStrongholdLocked, type, lastUsedWalletId } = _activeProfile
         if (id) {
             // Step 1: create profile manager if its doesn't exist
             incrementLoginProgress()
             await waitForPreviousManagerToBeDestroyed()
-            if (!get(profileManager)) {
-                const profileManagerOptions = await buildProfileManagerOptionsFromProfileData(_activeProfile)
-                const { storagePath, coinType, clientOptions, secretManager } = profileManagerOptions
-                // Make sure the profile has the latest client options that we are using
-                updateActiveProfile({ clientOptions })
-                const manager = await initialiseProfileManager(id, storagePath, coinType, clientOptions, secretManager)
-                profileManager.set(manager)
+            if (!isOnboardingSecretManagerInitialized()) {
+                // TODO(2.0) Not sure about this
+                await initialiseOnboardingProfileWithSecretManager(true)
             }
 
             // Step 3: load and build all the profile data
             incrementLoginProgress()
-            let accounts: IAccount[]
+            let wallets: IWallet[] = []
             if (loginOptions?.isFromOnboardingFlow && loginOptions?.shouldRecoverAccounts) {
+                /*
                 const { initialAccountRange, addressGapLimit } = DEFAULT_ACCOUNT_RECOVERY_CONFIGURATION[type]
                 const recoverAccountsPayload: RecoverAccountsPayload = {
                     accountStartIndex: 0,
@@ -80,14 +66,15 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
                     syncOptions: DEFAULT_SYNC_OPTIONS,
                 }
                 accounts = await recoverAccounts(recoverAccountsPayload)
+                */
             } else {
-                accounts = await getAccounts()
+                wallets = await getWallets()
             }
             /**
              * NOTE: In the case no accounts with funds were recovered, we must
              * create one for the new profile.
              */
-            if (accounts?.length === 0) {
+            if (wallets?.length === 0) {
                 const onUnlocked = new Promise<boolean>((resolve) => {
                     const onSuccess = () => {
                         resolve(true)
@@ -99,7 +86,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
                 })
                 const success = await onUnlocked
                 if (success) {
-                    await createNewAccount()
+                    await createNewWallet()
                 } else {
                     resetLoginProgress()
                     return loginRouter.previous()
@@ -108,16 +95,16 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
 
             // Step 4: load accounts
             incrementLoginProgress()
-            await loadAccounts()
+            await loadWallets()
 
-            let initialSelectedAccountindex = get(activeAccounts)?.[0]?.index
+            let initialSelectedWalletId = get(activeWallets)?.[0]?.id
             if (
-                lastUsedAccountIndex &&
-                get(activeAccounts)?.find((_account) => _account.index === lastUsedAccountIndex)
+                initialSelectedWalletId &&
+                get(activeWallets)?.find((wallet) => wallet.id === initialSelectedWalletId)
             ) {
-                initialSelectedAccountindex = lastUsedAccountIndex
+                initialSelectedWalletId = lastUsedWalletId
             }
-            setSelectedAccount(initialSelectedAccountindex)
+            setSelectedWallet(initialSelectedWalletId)
 
             // Step 2: get node info to check we have a synced node
             incrementLoginProgress()
@@ -174,7 +161,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
             void pollMarketPrices()
             if (Platform.isFeatureFlagEnabled('governance')) {
                 void initializeRegisteredProposals()
-                void registerProposalsFromNodes(get(activeAccounts))
+                void registerProposalsFromNodes(get(activeWallets))
             }
             void cleanupOnboarding()
         } else {
@@ -193,7 +180,7 @@ export async function login(loginOptions?: ILoginOptions): Promise<void> {
 
 async function waitForPreviousManagerToBeDestroyed(): Promise<void> {
     for (let count = 0; count < CHECK_PREVIOUS_MANAGER_IS_DESTROYED_MAX_COUNT; count++) {
-        if (!get(isDestroyingManager)) {
+        if (!get(isDestroyingWallets)) {
             return Promise.resolve()
         }
         await sleep(CHECK_PREVIOUS_MANAGER_IS_DESTROYED_INTERVAL)
diff --git a/packages/shared/lib/core/profile/actions/active-profile/logout.ts b/packages/shared/lib/core/profile/actions/active-profile/logout.ts
index ad204a1ef33..3c1510d03ed 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/logout.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/logout.ts
@@ -1,6 +1,5 @@
 import { get } from 'svelte/store'
 
-import { resetSelectedAccountIndex } from '@core/account/actions'
 import {
     clearSelectedParticipationEventStatus,
     resetProposalOverviews,
@@ -11,15 +10,13 @@ import { isPollingLedgerDeviceStatus } from '@core/ledger/stores'
 import { clearMarketPricesPoll } from '@core/market/actions'
 import { clearNetworkPoll } from '@core/network/actions'
 import { stopDownloadingNftMediaFromQueue } from '@core/nfts/actions'
-import { lockStronghold, resetActiveProfile } from '@core/profile/actions'
-import { activeAccounts, activeProfile, isSoftwareProfile, isDestroyingManager } from '@core/profile/stores'
+import { clearProfileFromMemory, getWallets, lockStronghold, resetActiveProfile } from '@core/profile/actions'
+import { activeProfile, isSoftwareProfile, isDestroyingWallets, activeWallets } from '@core/profile/stores'
 import { isLedgerProfile } from '@core/profile/utils'
-import { destroyProfileManager, unsubscribeFromWalletApiEvents } from '@core/profile-manager/actions'
-import { IProfileManager } from '@core/profile-manager/interfaces'
-import { profileManager } from '@core/profile-manager/stores'
 import { routerManager } from '@core/router/stores'
 import { clearFilters } from '@core/utils/clearFilters'
 import { Platform } from '@core/app'
+import { unsubscribeFromWalletApiEvents, resetSelectedWalletId } from '@core/wallet'
 
 /**
  * Logout from active profile
@@ -37,8 +34,7 @@ export async function logout(clearActiveProfile = true, _lockStronghold = true):
 
     const _activeProfile = get(activeProfile)
     if (_activeProfile) {
-        const manager = get(profileManager)
-        await destroyWalletRsObjects(manager)
+        await logOutProfile()
     }
 
     cleanupProfileState(clearActiveProfile)
@@ -50,7 +46,7 @@ function cleanupProfileState(clearActiveProfile: boolean): void {
     loggedIn.set(false)
     lastActiveAt.set(new Date())
     hasLoadedAccounts.set(false)
-    resetSelectedAccountIndex()
+    resetSelectedWalletId()
 
     void stopDownloadingNftMediaFromQueue()
 
@@ -59,7 +55,7 @@ function cleanupProfileState(clearActiveProfile: boolean): void {
     resetProposalOverviews()
     clearSelectedParticipationEventStatus()
 
-    activeAccounts.set([])
+    activeWallets.set([])
     if (clearActiveProfile) {
         resetActiveProfile()
     }
@@ -67,10 +63,9 @@ function cleanupProfileState(clearActiveProfile: boolean): void {
     get(routerManager).resetRouters()
 }
 
-async function destroyWalletRsObjects(manager: IProfileManager): Promise<void> {
-    isDestroyingManager.set(true)
-    await manager?.stopBackgroundSync()
+async function logOutProfile(): Promise<void> {
+    isDestroyingWallets.set(true)
     await unsubscribeFromWalletApiEvents()
-    await destroyProfileManager()
-    isDestroyingManager.set(false)
+    await clearProfileFromMemory()
+    isDestroyingWallets.set(false)
 }
diff --git a/packages/shared/lib/core/profile/actions/active-profile/migrateStrongholdFromActiveProfile.ts b/packages/shared/lib/core/profile/actions/active-profile/migrateStrongholdFromActiveProfile.ts
index d17b3393e10..7356d6eb4d0 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/migrateStrongholdFromActiveProfile.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/migrateStrongholdFromActiveProfile.ts
@@ -1,14 +1,10 @@
-import { get } from 'svelte/store'
-
-import { api } from '@core/profile-manager/api'
-import { getSecretManagerPath } from '@core/profile-manager/utils'
 import { StrongholdVersion } from '@core/stronghold/enums'
-
-import { getStorageDirectoryOfProfile } from '../../utils'
-import { activeProfile, updateActiveProfile } from '../../stores'
+import { getSecretManagerPath, getStorageDirectoryOfProfile } from '../../utils'
+import { getActiveProfile, updateActiveProfile } from '../../stores'
+import { api } from '@core/api'
 
 export async function migrateStrongholdFromActiveProfile(password: string): Promise<void> {
-    const profile = get(activeProfile)
+    const profile = getActiveProfile();
     const profileDirectory = await getStorageDirectoryOfProfile(profile?.id)
     const secretManagerPath = getSecretManagerPath(profileDirectory)
 
diff --git a/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts b/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts
index 9e9f295b1b8..7d219206c57 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/subscribeToWalletApiEventsForActiveProfile.ts
@@ -1,18 +1,8 @@
-import { get } from 'svelte/store'
 import { WalletEventType } from '@iota/sdk/out/types'
-
-import {
-    handleNewOutputEvent,
-    handleSpentOutputEvent,
-    handleTransactionInclusionEvent,
-    handleTransactionProgressEvent,
-    profileManager as _profileManager,
-    subscribeToWalletApiEvents,
-    WalletApiEventMap,
-} from '@core/profile-manager'
+import { getSelectedWallet, handleNewOutputEvent, handleSpentOutputEvent, handleTransactionInclusionEvent, handleTransactionProgressEvent, subscribeToWalletApiEvents, WalletApiEventMap } from '@core/wallet'
 
 export function subscribeToWalletApiEventsForActiveProfile(): void {
-    const profileManager = get(_profileManager)
+    const wallet = getSelectedWallet();
     const eventMap: WalletApiEventMap = {
         [WalletEventType.NewOutput]: handleNewOutputEvent,
         [WalletEventType.SpentOutput]: handleSpentOutputEvent,
@@ -21,6 +11,6 @@ export function subscribeToWalletApiEventsForActiveProfile(): void {
     }
     subscribeToWalletApiEvents({
         eventMap,
-        profileManager,
+        wallet,
     })
 }
diff --git a/packages/shared/lib/core/profile/actions/active-profile/unlockStronghold.ts b/packages/shared/lib/core/profile/actions/active-profile/unlockStronghold.ts
index 3c70c3207aa..044d25f035f 100644
--- a/packages/shared/lib/core/profile/actions/active-profile/unlockStronghold.ts
+++ b/packages/shared/lib/core/profile/actions/active-profile/unlockStronghold.ts
@@ -1,7 +1,7 @@
-import { setStrongholdPassword } from '@core/profile-manager'
 import { activeProfile, IProfile } from '@core/profile'
 import { get } from 'svelte/store'
 import { setTimeStrongholdLastUnlocked } from '@core/profile/stores'
+import { setStrongholdPassword } from '@core/wallet/actions'
 
 export async function unlockStronghold(password: string, profile: IProfile = get(activeProfile)): Promise<void> {
     const { isStrongholdLocked } = profile
diff --git a/packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts b/packages/shared/lib/core/profile/actions/buildProfileManagerOptionsFromProfileData.ts
similarity index 67%
rename from packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts
rename to packages/shared/lib/core/profile/actions/buildProfileManagerOptionsFromProfileData.ts
index b0e14f7a9ef..81729346e2c 100644
--- a/packages/shared/lib/core/profile-manager/utils/buildProfileManagerOptionsFromProfileData.ts
+++ b/packages/shared/lib/core/profile/actions/buildProfileManagerOptionsFromProfileData.ts
@@ -1,10 +1,12 @@
-import { getStorageDirectoryOfProfile, IPersistedProfile } from '@core/profile'
-import { getSecretManagerFromProfileType, ProfileManagerOptions } from '@core/profile-manager'
+import { getSecretManagerFromProfileType, getStorageDirectoryOfProfile, IPersistedProfile } from '@core/profile'
 import { COIN_TYPE, getDefaultClientOptions } from '@core/network'
+import { WalletOptions } from '@iota/sdk/out/types'
 
-export async function buildProfileManagerOptionsFromProfileData(
+// TODO(2.0) Fix this and all usages
+// - Do we even need this function at all?
+export async function buildProfileOptionsFromProfileData(
     profileData: Partial<IPersistedProfile>
-): Promise<ProfileManagerOptions> {
+): Promise<WalletOptions> {
     const { id, type, network } = profileData
     const storagePath = await getStorageDirectoryOfProfile(id)
     const coinType = network?.coinType ? network?.coinType : network ? COIN_TYPE[network?.id] ?? 1 : 1
@@ -17,7 +19,9 @@ export async function buildProfileManagerOptionsFromProfileData(
 
     return {
         storagePath,
-        coinType,
+        bipPath: {
+            coinType,
+        },
         clientOptions,
         secretManager,
     }
diff --git a/packages/shared/lib/core/profile-manager/actions/changePasswordAndUnlockStronghold.ts b/packages/shared/lib/core/profile/actions/changePasswordAndUnlockStronghold.ts
similarity index 84%
rename from packages/shared/lib/core/profile-manager/actions/changePasswordAndUnlockStronghold.ts
rename to packages/shared/lib/core/profile/actions/changePasswordAndUnlockStronghold.ts
index 9313596222e..729fd9eefcd 100644
--- a/packages/shared/lib/core/profile-manager/actions/changePasswordAndUnlockStronghold.ts
+++ b/packages/shared/lib/core/profile/actions/changePasswordAndUnlockStronghold.ts
@@ -1,6 +1,6 @@
 import { activeProfile, setTimeStrongholdLastUnlocked } from '@core/profile'
 import { get } from 'svelte/store'
-import { changeStrongholdPassword, clearStrongholdPassword } from '../api'
+import { clearStrongholdPassword, changeStrongholdPassword } from '@core/secret-manager'
 
 export async function changePasswordAndUnlockStronghold(currentPassword: string, newPassword: string): Promise<void> {
     // Otherwise password persists in memory
diff --git a/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts b/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts
new file mode 100644
index 00000000000..7fd6db98ee3
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/clearProfileFromMemory.ts
@@ -0,0 +1,5 @@
+import { api } from '@core/api'
+
+export async function clearProfileFromMemory(): Promise<void> {
+    await api.clearWalletsFromMemory()
+}
diff --git a/packages/shared/lib/core/profile/actions/createWallet.ts b/packages/shared/lib/core/profile/actions/createWallet.ts
new file mode 100644
index 00000000000..62a906f21d0
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/createWallet.ts
@@ -0,0 +1,34 @@
+import { api } from '@core/api'
+import { generateRandomId } from '@core/utils'
+import { get } from 'svelte/store'
+import { IWallet } from '../interfaces'
+import { activeProfile as activeProfileStore } from '../stores'
+import { getStorageDirectoryOfProfile } from '../utils'
+
+// TODO(2.0): Fix and finish this method
+/* - __storage__/
+    - profile_id_1
+        - secret manager
+        - __wallet1__/
+        - __wallet2__/
+*/
+export async function createWallet(activeProfile = get(activeProfileStore)): Promise<IWallet> {
+    const id = generateRandomId()
+    const storagePath = await getStorageDirectoryOfProfile(id)
+    const snapshotPath = ''
+
+    const walletOptions = {
+        clientOptions: activeProfile.clientOptions,
+        secretManager: {
+            stronghold: {
+                snapshotPath,
+            },
+        },
+    }
+    const wallet = await api.createWallet(id, {
+        ...walletOptions,
+        storagePath,
+    })
+
+    return wallet
+}
diff --git a/packages/shared/lib/core/profile/actions/deleteWallet.ts b/packages/shared/lib/core/profile/actions/deleteWallet.ts
new file mode 100644
index 00000000000..1d01bee77c4
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/deleteWallet.ts
@@ -0,0 +1,27 @@
+import { get } from 'svelte/store'
+
+import { api } from '@core/api'
+import { AppContext } from '@core/app/enums'
+import { routerManager } from '@core/router/stores'
+import { visibleActiveWallets } from '../stores'
+import { CannotRemoveWalletError, RemoveNotLastWalletError, setSelectedWallet } from '@core/wallet'
+
+// TODO(2.0): replace all its usage, before it was numeric index, now it's id
+export async function deleteWallet(id: string): Promise<void> {
+    const wallets = get(visibleActiveWallets)
+    const walletToBeDeleted = wallets.find((wallet) => wallet?.id === id)
+ 
+
+    if (walletToBeDeleted !== wallets[wallets.length - 1]) {
+        throw new RemoveNotLastWalletError()
+    }
+
+    try {
+        await api.deleteWallet(id)
+        // TODO(2.0) do we need this?: removeAccountFromActiveAccounts(id)
+        setSelectedWallet(wallets[0]?.id ?? null)
+        get(routerManager).resetRouterForAppContext(AppContext.Dashboard)
+    } catch (err) {
+        throw new CannotRemoveWalletError()
+    }
+}
diff --git a/packages/shared/lib/core/profile/actions/getWallet.ts b/packages/shared/lib/core/profile/actions/getWallet.ts
new file mode 100644
index 00000000000..67f31aa9e0d
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/getWallet.ts
@@ -0,0 +1,13 @@
+import { get } from 'svelte/store'
+import { api } from '@core/api'
+import { IPersistedWalletData } from '@core/wallet/interfaces'
+import { IPersistedProfile, IWallet } from '../interfaces'
+import {activeProfile } from '../stores'
+
+// TODO(2.0): Fix all usages of this method, before numeric index, now string
+export async function getWallet(walletId: string): Promise<IWallet> {
+    const profile: IPersistedProfile = get(activeProfile)
+    const persistedWallet: IPersistedWalletData = profile?.accountPersistedData[walletId]
+    const wallet = await api.getWallet(walletId, persistedWallet.walletOptions)
+    return wallet
+}
diff --git a/packages/shared/lib/core/profile/actions/getWallets.ts b/packages/shared/lib/core/profile/actions/getWallets.ts
new file mode 100644
index 00000000000..56c8be15f31
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/getWallets.ts
@@ -0,0 +1,16 @@
+import { api } from '@core/api'
+import { activeProfile } from '@core/profile/stores'
+import { get } from 'svelte/store'
+import { IWallet } from '../interfaces/wallet.interface'
+
+// TODO(2.0): Fix all usages of this method
+// TODO(2.0): Finalize when new profile is ready
+export async function getWallets(): Promise<IWallet[]> {
+    const profile = get(activeProfile)
+    let wallets: IWallet[] = []
+    if (profile.accountPersistedData) {
+        wallets = await Promise.all(Object.entries(profile.accountPersistedData)
+            .map(([id, data]) => api.getWallet(id, data.walletOptions)))
+    }
+    return wallets
+}
diff --git a/packages/shared/lib/core/profile/actions/index.ts b/packages/shared/lib/core/profile/actions/index.ts
index 1cb1c299d84..8c0a1f8d30e 100644
--- a/packages/shared/lib/core/profile/actions/index.ts
+++ b/packages/shared/lib/core/profile/actions/index.ts
@@ -1,3 +1,11 @@
+export * from './createWallet'
+export * from './getWallet'
+export * from './getWallets'
+export * from './recoverWallets'
+export * from './clearProfileFromMemory'
+export * from './deleteWallet'
+export * from './changePasswordAndUnlockStronghold'
+
 export * from './active-accounts'
 export * from './active-profile'
 export * from './profiles'
diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
index 0f700da6207..de38c2cdb08 100644
--- a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
+++ b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateChrysalisProfiles.ts
@@ -1,4 +1,4 @@
-import { IPersistedAccountData } from '@core/account/interfaces'
+import { IPersistedWalletData } from '@core/wallet/interfaces'
 import { MarketCurrency } from '@core/market'
 import { NetworkId, getDefaultClientOptions, getDefaultPersistedNetwork } from '@core/network'
 import { INode } from '@core/network/interfaces'
@@ -40,7 +40,7 @@ export function checkAndMigrateChrysalisProfiles(): boolean {
             // accountPersistedData
             if (chrysalisProfile.accounts) {
                 const accountPersistedData: {
-                    [accountId: string]: IPersistedAccountData
+                    [accountId: string]: IPersistedWalletData
                 } = {}
                 chrysalisProfile.accounts.forEach((account, index) => {
                     accountPersistedData[index] = {
diff --git a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts
index 40c7d1c21aa..9a250e549d1 100644
--- a/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts
+++ b/packages/shared/lib/core/profile/actions/profiles/checkAndMigrateProfiles.ts
@@ -1,4 +1,4 @@
-import { IPersistedAccountData } from '@core/account/interfaces'
+import { IPersistedWalletData } from '@core/wallet/interfaces'
 import {
     COIN_TYPE,
     DEFAULT_CHAIN_CONFIGURATIONS,
@@ -254,7 +254,7 @@ function persistedProfileMigrationToV12(existingProfile: IPersistedProfile): voi
 }
 
 function persistedProfileMigrationToV13(
-    existingProfile: IPersistedProfile & { accountMetadata: (IPersistedAccountData & { index: number })[] }
+    existingProfile: IPersistedProfile & { accountMetadata: (IPersistedWalletData & { index: number })[] }
 ): void {
     const newProfile = {}
     const keysToKeep = [
diff --git a/packages/shared/lib/core/profile/actions/profiles/migrateDbChrysalisToStardust.ts b/packages/shared/lib/core/profile/actions/profiles/migrateDbChrysalisToStardust.ts
index 00cbbcb53be..daef79adb9e 100644
--- a/packages/shared/lib/core/profile/actions/profiles/migrateDbChrysalisToStardust.ts
+++ b/packages/shared/lib/core/profile/actions/profiles/migrateDbChrysalisToStardust.ts
@@ -1,7 +1,7 @@
 import { logAndNotifyError } from '@core/error/actions'
-import { api } from '@core/profile-manager'
 import { updateProfile } from '@core/profile/stores'
 import { getStorageDirectoryOfProfile } from '@core/profile/utils'
+import { api } from '@core/api'
 
 /**
  * Updates the profile underlying DB from chrysalis model to stardust.
diff --git a/packages/shared/lib/core/profile/actions/recoverWallets.ts b/packages/shared/lib/core/profile/actions/recoverWallets.ts
new file mode 100644
index 00000000000..eaae6a4df9e
--- /dev/null
+++ b/packages/shared/lib/core/profile/actions/recoverWallets.ts
@@ -0,0 +1,9 @@
+import { IWallet, RecoverAccountsPayload } from '../interfaces'
+
+// TODO(2.0): Refactor all this, recover accounts has changed completely
+// as it is not provided by the SDK anymore
+export function recoverWallets(
+    _recoverAccountsPayload: RecoverAccountsPayload,
+): Promise<IWallet[]> {
+    return Promise.resolve([])
+}
diff --git a/packages/shared/lib/core/profile/interfaces/index.ts b/packages/shared/lib/core/profile/interfaces/index.ts
index f143d0b8f02..93755be5c23 100644
--- a/packages/shared/lib/core/profile/interfaces/index.ts
+++ b/packages/shared/lib/core/profile/interfaces/index.ts
@@ -4,3 +4,5 @@ export * from './persisted-profile.interface'
 export * from './profile-settings.interface'
 export * from './profile.interface'
 export * from './chrysalis-persisted-profile.interface'
+export * from './recover-account-payload.interface'
+export * from './wallet.interface'
diff --git a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
index 8a3131ed0a1..63ff1070067 100644
--- a/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
+++ b/packages/shared/lib/core/profile/interfaces/persisted-profile.interface.ts
@@ -1,7 +1,8 @@
-import { IPersistedAccountData } from '@core/account'
 import { ClientOptions, IPersistedNetwork } from '@core/network'
 import { INft } from '@core/nfts'
 import { StrongholdVersion } from '@core/stronghold/enums'
+import { SecretManagerType } from '@iota/sdk/out/types'
+import { IPersistedWalletData } from '@core/wallet/interfaces'
 import { ProfileType } from '../enums'
 import { IProfileSettings } from './profile-settings.interface'
 
@@ -12,13 +13,14 @@ export interface IPersistedProfile {
     network: IPersistedNetwork
     lastStrongholdBackupTime: Date
     settings: IProfileSettings
-    accountPersistedData: {
-        [accountId: string]: IPersistedAccountData
+    accountPersistedData: { // TODO(2.0) Shouldn't we rename this field?
+        [accountId: string]: IPersistedWalletData
     }
     isDeveloperProfile: boolean
     hasVisitedDashboard?: boolean
-    lastUsedAccountIndex?: number
+    lastUsedWalletId?: string // Todo(2.0) Fix all usages of lastUsedAccountIndex
     clientOptions: ClientOptions
+    secretManagerOptions: SecretManagerType,
     forceAssetRefresh: boolean
     strongholdVersion?: StrongholdVersion
     needsChrysalisToStardustDbMigration?: boolean
diff --git a/packages/shared/lib/core/profile/interfaces/profile.interface.ts b/packages/shared/lib/core/profile/interfaces/profile.interface.ts
index ec6369fb169..804186f4728 100644
--- a/packages/shared/lib/core/profile/interfaces/profile.interface.ts
+++ b/packages/shared/lib/core/profile/interfaces/profile.interface.ts
@@ -2,7 +2,7 @@ import { Writable } from 'svelte/store'
 import { IPersistedProfile } from './persisted-profile.interface'
 
 export interface IProfile extends IPersistedProfile {
-    hasLoadedAccounts: Writable<boolean>
+    hasLoadedAccounts: Writable<boolean> // TODO(2.0) Shouldn't we rename this field?
     isStrongholdLocked: Writable<boolean>
     shouldOpenProfileModal: Writable<boolean>
     internalTransfersInProgress: Writable<{
diff --git a/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts b/packages/shared/lib/core/profile/interfaces/recover-account-payload.interface.ts
similarity index 72%
rename from packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
rename to packages/shared/lib/core/profile/interfaces/recover-account-payload.interface.ts
index ad00bad51b3..7827bfa23cf 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/recover-account-payload.interface.ts
+++ b/packages/shared/lib/core/profile/interfaces/recover-account-payload.interface.ts
@@ -1,7 +1,7 @@
 import type { SyncOptions } from '@iota/sdk/out/types'
 
 export interface RecoverAccountsPayload {
-    accountStartIndex: number
+    accountStartIndex: number // TODO(2.0) Should this be using index?
     accountGapLimit: number
     addressGapLimit: number
     syncOptions?: SyncOptions
diff --git a/packages/shared/lib/core/profile/interfaces/wallet.interface.ts b/packages/shared/lib/core/profile/interfaces/wallet.interface.ts
new file mode 100644
index 00000000000..779c53ed436
--- /dev/null
+++ b/packages/shared/lib/core/profile/interfaces/wallet.interface.ts
@@ -0,0 +1,6 @@
+import { Wallet } from '@iota/sdk'
+
+// TODO(2.0): rename to IWallet & check all functions in this interface to make sure they still exist
+export interface IWallet extends Wallet {
+    id: string
+}
\ No newline at end of file
diff --git a/packages/shared/lib/core/profile/stores/active-accounts.store.ts b/packages/shared/lib/core/profile/stores/active-accounts.store.ts
deleted file mode 100644
index 2aa6b0993b5..00000000000
--- a/packages/shared/lib/core/profile/stores/active-accounts.store.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { IAccountState } from '@core/account'
-import { derived, Readable, writable } from 'svelte/store'
-import { activeProfile } from './active-profile.store'
-
-export const activeAccounts = writable<IAccountState[]>([])
-
-export function removeAccountFromActiveAccounts(index: number): void {
-    activeAccounts?.update((state) => state.filter((account) => account.index !== index))
-}
-
-export function addAccountToActiveAccounts(account: IAccountState): void {
-    activeAccounts?.update((state) => [...state, account])
-}
-
-export function updateActiveAccount(index: number, partialAccount: Partial<IAccountState>): void {
-    activeAccounts.update((state) => [
-        ...state.map((account) => (account.index === index ? { ...account, ...partialAccount } : account)),
-    ])
-}
-
-export const nonHiddenActiveAccounts: Readable<IAccountState[]> = derived([activeAccounts], ([$activeAccounts]) => {
-    if (!$activeAccounts) {
-        return []
-    }
-    const unsortedNonHiddenAccounts = $activeAccounts?.filter((account) => !account?.hidden)
-    return unsortedNonHiddenAccounts.sort((a, b) => a.index - b.index)
-})
-
-export const visibleActiveAccounts: Readable<IAccountState[]> = derived(
-    [activeAccounts, activeProfile],
-    ([$activeAccounts, $activeProfile]) => {
-        if (!$activeAccounts || !$activeProfile) {
-            return []
-        }
-        const unsortedVisibleAccounts =
-            $activeProfile?.showHiddenAccounts ?? false
-                ? $activeAccounts
-                : $activeAccounts?.filter((account) => !account?.hidden)
-        return unsortedVisibleAccounts.sort((a, b) => a.index - b.index)
-    }
-)
diff --git a/packages/shared/lib/core/profile/stores/active-profile-id.store.ts b/packages/shared/lib/core/profile/stores/active-profile-id.store.ts
index 53b5796e80d..1397705204a 100644
--- a/packages/shared/lib/core/profile/stores/active-profile-id.store.ts
+++ b/packages/shared/lib/core/profile/stores/active-profile-id.store.ts
@@ -1,3 +1,3 @@
 import { persistent } from '@core/utils/store'
 
-export const activeProfileId = persistent<string>('activeProfileId', null)
+export const activeProfileId = persistent<string | null>('activeProfileId', null)
diff --git a/packages/shared/lib/core/profile/stores/active-profile.store.ts b/packages/shared/lib/core/profile/stores/active-profile.store.ts
index fb6b3720540..4629b695962 100644
--- a/packages/shared/lib/core/profile/stores/active-profile.store.ts
+++ b/packages/shared/lib/core/profile/stores/active-profile.store.ts
@@ -1,6 +1,5 @@
 import { get, writable } from 'svelte/store'
-
-import type { IPersistedAccountData } from '@core/account/interfaces'
+import { IPersistedWalletData } from '@core/wallet/interfaces'
 
 import { INITIAL_ACTIVE_PROFILE } from '../constants'
 import type { IProfile, IProfileSettings } from '../interfaces'
@@ -22,34 +21,34 @@ export function updateActiveProfileSettings(payload: Partial<IProfileSettings>):
     }))
 }
 
-export function addAccountPersistedDataToActiveProfile(
-    accountIndex: number,
-    accountPersistedData: IPersistedAccountData
+export function addWalletPersistedDataToActiveProfile(
+    walletId: string,
+    walletPersistedData: IPersistedWalletData
 ): void {
     activeProfile?.update((state) => {
         if (!state?.accountPersistedData) {
             state.accountPersistedData = {}
         }
-        state.accountPersistedData[accountIndex] = accountPersistedData
+        state.accountPersistedData[walletId] = walletPersistedData
         return state
     })
 }
 
-export function getActiveProfilePersistedAccountData(accountIndex: number): IPersistedAccountData | undefined {
-    return get(activeProfile)?.accountPersistedData?.[accountIndex]
+export function getActiveProfilePersistedWalletData(walletId: string): IPersistedWalletData | undefined {
+    return get(activeProfile)?.accountPersistedData?.[walletId]
 }
 
-export function updateAccountPersistedDataOnActiveProfile(
-    accountIndex: number,
-    partialAccountPersistedData: Partial<IPersistedAccountData>
+export function updateWalletPersistedDataOnActiveProfile(
+    walletId: string,
+    partialWalletPersistedData: Partial<IPersistedWalletData>
 ): void {
     activeProfile?.update((state) => {
         if (!state?.accountPersistedData) {
             state.accountPersistedData = {}
         }
-        state.accountPersistedData[accountIndex] = {
-            ...state?.accountPersistedData?.[accountIndex],
-            ...partialAccountPersistedData,
+        state.accountPersistedData[walletId] = {
+            ...state?.accountPersistedData?.[walletId],
+            ...partialWalletPersistedData,
         }
         return state
     })
diff --git a/packages/shared/lib/core/profile/stores/active-wallets.store.ts b/packages/shared/lib/core/profile/stores/active-wallets.store.ts
new file mode 100644
index 00000000000..b6fb83d668f
--- /dev/null
+++ b/packages/shared/lib/core/profile/stores/active-wallets.store.ts
@@ -0,0 +1,41 @@
+import { derived, Readable, writable } from 'svelte/store'
+import { IWalletState } from '@core/wallet/interfaces'
+import { activeProfile } from './active-profile.store'
+
+export const activeWallets = writable<IWalletState[]>([])
+
+export function removewalletFromactiveWallets(walletId: string): void {
+    activeWallets?.update((state) => state.filter((wallet) => wallet.id !== walletId))
+}
+
+export function addwalletToactiveWallets(wallet: IWalletState): void {
+    activeWallets?.update((state) => [...state, wallet])
+}
+
+export function updateActiveWallet(walletId: string, partialwallet: Partial<IWalletState>): void {
+    activeWallets.update((state) => [
+        ...state.map((wallet) => (wallet.id === walletId ? { ...wallet, ...partialwallet } as IWalletState: wallet)),
+    ])
+}
+
+export const nonHiddenActiveWallets: Readable<IWalletState[]> = derived([activeWallets], ([$activeWallets]) => {
+    if (!$activeWallets) {
+        return []
+    }
+    const unsortedNonHiddenwallets = $activeWallets?.filter((wallet) => !wallet?.hidden)
+    return unsortedNonHiddenwallets // TODO(2.0): Sort them: .sort((a, b) => a.index - b.index)
+})
+
+export const visibleActiveWallets: Readable<IWalletState[]> = derived(
+    [activeWallets, activeProfile],
+    ([$activeWallets, $activeProfile]) => {
+        if (!$activeWallets || !$activeProfile) {
+            return []
+        }
+        const unsortedVisiblewallets =
+            $activeProfile?.showHiddenAccounts ?? false
+                ? $activeWallets
+                : $activeWallets?.filter((wallet) => !wallet?.hidden)
+        return unsortedVisiblewallets // TODO(2.0): Sort them: .sort((a, b) => a.index - b.index)
+    }
+)
diff --git a/packages/shared/lib/core/profile/stores/index.ts b/packages/shared/lib/core/profile/stores/index.ts
index 01b4dd1bcaa..9d5438cb996 100644
--- a/packages/shared/lib/core/profile/stores/index.ts
+++ b/packages/shared/lib/core/profile/stores/index.ts
@@ -1,6 +1,6 @@
 export * from './active-profile-id.store'
 export * from './active-profile.store'
-export * from './active-accounts.store'
+export * from './active-wallets.store'
 export * from './current-profile-version.store'
 export * from './is-software-profile.store'
 export * from './is-destroying-manager.store'
diff --git a/packages/shared/lib/core/profile/stores/is-destroying-manager.store.ts b/packages/shared/lib/core/profile/stores/is-destroying-manager.store.ts
index 2e174923ecb..2ef3e948816 100644
--- a/packages/shared/lib/core/profile/stores/is-destroying-manager.store.ts
+++ b/packages/shared/lib/core/profile/stores/is-destroying-manager.store.ts
@@ -1,3 +1,3 @@
 import { writable } from 'svelte/store'
 
-export const isDestroyingManager = writable<boolean>(false)
+export const isDestroyingWallets = writable<boolean>(false)
diff --git a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts b/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
similarity index 91%
rename from packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
rename to packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
index e2441f5229f..5afc870ebfd 100644
--- a/packages/shared/lib/core/profile-manager/utils/getSecretManagerFromProfileType.ts
+++ b/packages/shared/lib/core/profile/utils/getSecretManagerFromProfileType.ts
@@ -3,9 +3,10 @@ import { SecretManagerType } from '@iota/sdk/out/types'
 import { USE_LEDGER_SIMULATOR } from '@core/ledger'
 import { ProfileType } from '@core/profile'
 
+// TODO(2.0) Fix all usages
 export function getSecretManagerFromProfileType(type: ProfileType, storagePath?: string): SecretManagerType {
     const strongholdSecretManager = {
-        stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: "mellamobego", },
+        stronghold: { snapshotPath: `${storagePath}/wallet.stronghold`, password: 'mellamobego' },
     }
     const ledgerSecretManager = {
         ledgerNano: USE_LEDGER_SIMULATOR,
diff --git a/packages/shared/lib/core/profile-manager/utils/getSecretManagerPath.ts b/packages/shared/lib/core/profile/utils/getSecretManagerPath.ts
similarity index 76%
rename from packages/shared/lib/core/profile-manager/utils/getSecretManagerPath.ts
rename to packages/shared/lib/core/profile/utils/getSecretManagerPath.ts
index 6e9a2a5bd0e..71b005c7ffd 100644
--- a/packages/shared/lib/core/profile-manager/utils/getSecretManagerPath.ts
+++ b/packages/shared/lib/core/profile/utils/getSecretManagerPath.ts
@@ -1,3 +1,4 @@
+// TODO(2.0) Fix all usages and rename
 export function getSecretManagerPath(profileDirectory: string): string {
     return `${profileDirectory}/wallet.stronghold`
 }
diff --git a/packages/shared/lib/core/profile/utils/index.ts b/packages/shared/lib/core/profile/utils/index.ts
index 4284bbd46bc..450cb16ab86 100644
--- a/packages/shared/lib/core/profile/utils/index.ts
+++ b/packages/shared/lib/core/profile/utils/index.ts
@@ -4,3 +4,5 @@ export * from './isLedgerProfile'
 export * from './removeProfileFolder'
 export * from './removeProfileFolder'
 export * from './validateProfileName'
+export * from './getSecretManagerPath'
+export * from './getSecretManagerFromProfileType'
diff --git a/packages/shared/lib/core/profile/utils/validateProfileName.ts b/packages/shared/lib/core/profile/utils/validateProfileName.ts
index 355df9a22fb..4903b623698 100644
--- a/packages/shared/lib/core/profile/utils/validateProfileName.ts
+++ b/packages/shared/lib/core/profile/utils/validateProfileName.ts
@@ -14,7 +14,7 @@ export const validateProfileName = (trimmedName: string): void => {
     const validateError = validateFilenameChars(trimmedName)
 
     if (validateError) {
-        throw new Error(localize(`error.account.${validateError}`))
+        throw new Error(localize(`error.wallet.${validateError}`))
     }
 
     if (getTrimmedLength(trimmedName) > MAX_PROFILE_NAME_LENGTH) {
diff --git a/packages/shared/lib/core/secret-manager/actions/changeStrongholdPassword.ts b/packages/shared/lib/core/secret-manager/actions/changeStrongholdPassword.ts
new file mode 100644
index 00000000000..955aaa9aa31
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/changeStrongholdPassword.ts
@@ -0,0 +1,8 @@
+import { get } from 'svelte/store'
+import { activeProfileSecretManager } from '../stores'
+
+export async function changeStrongholdPassword(currentPassword: string, newPassword: string): Promise<void> {
+    const activeProfileSecretManagerInstance = get(activeProfileSecretManager)
+    await activeProfileSecretManagerInstance.changeStrongholdPassword(currentPassword, newPassword)
+}
+
diff --git a/packages/shared/lib/core/secret-manager/actions/clearStrongholdPassword.ts b/packages/shared/lib/core/secret-manager/actions/clearStrongholdPassword.ts
new file mode 100644
index 00000000000..257aed16b20
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/clearStrongholdPassword.ts
@@ -0,0 +1,7 @@
+import { get } from 'svelte/store'
+import { activeProfileSecretManager as activeProfileSecretManagerStore } from '../stores'
+
+export async function clearStrongholdPassword(): Promise<void> {
+    const activeProfileSecretManagerInstance = get(activeProfileSecretManagerStore)
+    await activeProfileSecretManagerInstance?.clearStrongholdPassword()
+}
diff --git a/packages/shared/lib/core/secret-manager/actions/generateEd25519Address.ts b/packages/shared/lib/core/secret-manager/actions/generateEd25519Address.ts
new file mode 100644
index 00000000000..fa6f4059e13
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/generateEd25519Address.ts
@@ -0,0 +1,25 @@
+import { GenerateAddressOptions } from '@iota/sdk/out/types'
+import { activeSecretManager } from '../stores'
+import { get } from 'svelte/store'
+
+// TODO(2.0): Fix all usages
+export async function generateEd25519Address(
+    accountIndex: number,
+    options: GenerateAddressOptions,
+    bech32Hrp: string
+): Promise<string | undefined> {
+    const secretManager = get(activeSecretManager)
+
+    if(!secretManager){
+        return undefined
+    }
+
+    // TODO(2.0) Ledger secret manager doesn't support this
+    return (await secretManager.generateEd25519Addresses({
+        accountIndex, options, bech32Hrp,
+        range: {
+            start: 0,
+            end: 1,
+        },
+    }))[0]
+}
diff --git a/packages/shared/lib/core/secret-manager/actions/getLedgerNanoStatus.ts b/packages/shared/lib/core/secret-manager/actions/getLedgerNanoStatus.ts
new file mode 100644
index 00000000000..7ecaee6e22e
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/getLedgerNanoStatus.ts
@@ -0,0 +1,12 @@
+import { LedgerNanoStatus } from '@iota/sdk/out/types'
+import { get } from 'svelte/store'
+import { activeProfileSecretManager } from '../stores'
+
+// TODO(2.0): Fix all of usages of this
+export async function getLedgerNanoStatus(): Promise<LedgerNanoStatus | null> {
+    const secretManager = get(activeProfileSecretManager)
+    if (!secretManager) {
+        return null
+    }
+    return secretManager.getLedgerNanoStatus()
+}
diff --git a/packages/shared/lib/core/secret-manager/actions/getSecretManager.ts b/packages/shared/lib/core/secret-manager/actions/getSecretManager.ts
new file mode 100644
index 00000000000..5cd0c424f27
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/getSecretManager.ts
@@ -0,0 +1,7 @@
+import { SecretManager } from '@iota/sdk';
+import { get } from 'svelte/store';
+import { activeProfileSecretManager } from '../stores';
+
+export function getSecretManager(): SecretManager {
+    return get(activeProfileSecretManager) as SecretManager
+}
\ No newline at end of file
diff --git a/packages/shared/lib/core/secret-manager/actions/index.ts b/packages/shared/lib/core/secret-manager/actions/index.ts
new file mode 100644
index 00000000000..3601deae84b
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/index.ts
@@ -0,0 +1,6 @@
+export * from './changeStrongholdPassword'
+export * from './clearStrongholdPassword'
+export * from './generateEd25519Address'
+export * from './getLedgerNanoStatus'
+export * from './storeMnemonic'
+export * from './getSecretManager'
\ No newline at end of file
diff --git a/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts b/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
new file mode 100644
index 00000000000..c9fe6006745
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/actions/storeMnemonic.ts
@@ -0,0 +1,11 @@
+import { get } from 'svelte/store'
+import { activeProfileSecretManager } from '../stores'
+
+export async function storeMnemonic(mnemonic: string): Promise<void> {
+    const secretManager = get(activeProfileSecretManager)
+
+    if (!secretManager) {
+        return undefined
+    }
+    return secretManager.storeMnemonic(mnemonic)
+}
diff --git a/packages/shared/lib/core/secret-manager/index.ts b/packages/shared/lib/core/secret-manager/index.ts
new file mode 100644
index 00000000000..0f59de8ed29
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/index.ts
@@ -0,0 +1,3 @@
+export * from './actions'
+export * from './stores'
+export * from './utils'
diff --git a/packages/shared/lib/core/secret-manager/stores/index.ts b/packages/shared/lib/core/secret-manager/stores/index.ts
new file mode 100644
index 00000000000..ed1c6432dfe
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/stores/index.ts
@@ -0,0 +1 @@
+export * from './secret-manager.store';
diff --git a/packages/shared/lib/core/secret-manager/stores/secret-manager.store.ts b/packages/shared/lib/core/secret-manager/stores/secret-manager.store.ts
new file mode 100644
index 00000000000..afa14648b3e
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/stores/secret-manager.store.ts
@@ -0,0 +1,17 @@
+import { api } from '@core/api';
+import { activeProfile } from '@core/profile/stores';
+import { SecretManager } from '@iota/sdk';
+import { Readable, derived } from 'svelte/store';
+
+const activeProfileSecretManagerOptions = derived(activeProfile, ($activeProfile) => $activeProfile.secretManagerOptions);
+
+export const activeProfileSecretManager: Readable<SecretManager | null> = derived(activeProfileSecretManagerOptions, (activeProfileSecretManagerOptions, set) => {
+    if (activeProfileSecretManagerOptions) {
+        api.createSecretManager(activeProfileSecretManagerOptions)
+            .then((secretManager) => {
+                set(secretManager)
+            })
+    } else {
+        set(null)
+    }
+})
diff --git a/packages/shared/lib/core/secret-manager/utils/index.ts b/packages/shared/lib/core/secret-manager/utils/index.ts
new file mode 100644
index 00000000000..ef15f29f397
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/utils/index.ts
@@ -0,0 +1 @@
+export * from './verifyMnemonic'
\ No newline at end of file
diff --git a/packages/shared/lib/core/secret-manager/utils/verifyMnemonic.ts b/packages/shared/lib/core/secret-manager/utils/verifyMnemonic.ts
new file mode 100644
index 00000000000..18f332c01d9
--- /dev/null
+++ b/packages/shared/lib/core/secret-manager/utils/verifyMnemonic.ts
@@ -0,0 +1,5 @@
+import { api } from "@core/api";
+
+export function verifyMnemonic(mnemonic: string): Promise<void> {
+    return api.verifyMnemonic(mnemonic)
+}
\ No newline at end of file
diff --git a/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts b/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
index 12b8fe6f286..a4ac7d96711 100644
--- a/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
+++ b/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
@@ -1,8 +1,8 @@
-import { isStrongholdUnlocked } from '@core/profile-manager'
 import { closePopup, openPopup, PopupId, popupState } from '@auxiliary/popup'
 import { get } from 'svelte/store'
 import { handleError } from '@core/error/handlers/handleError'
 import { IError } from '@core/error'
+import { isStrongholdUnlocked } from '@core/wallet/actions'
 
 export async function checkOrUnlockStronghold(
     callback: () => Promise<unknown> = async (): Promise<void> => {},
diff --git a/packages/shared/lib/core/utils/sort.ts b/packages/shared/lib/core/utils/sort.ts
index 4ba00b6302c..49a20ed4f73 100644
--- a/packages/shared/lib/core/utils/sort.ts
+++ b/packages/shared/lib/core/utils/sort.ts
@@ -1,8 +1,9 @@
-import { IAccount } from '@core/account/interfaces'
+import { IWallet } from '@core/profile'
 
-export function sortAccountsByIndex(account1: IAccount, account2: IAccount): number {
-    const index1 = account1.getMetadata()?.index
-    const index2 = account2.getMetadata()?.index
+// TODO(2.0) Wallets do not have indexes anymore
+export function sortAccountsByIndex(walletA: IWallet, walletB: IWallet): number {
+    const index1 = walletA.getMetadata()?.index
+    const index2 = walletB.getMetadata()?.index
     if (index1 < index2) {
         return -1
     } else if (index1 > index2) {
diff --git a/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts b/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts
index 70f0c07eff1..bd83dee227b 100644
--- a/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/generateActivitiesFromProcessedTransactions.ts
@@ -1,11 +1,11 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { IProcessedTransaction } from '@core/wallet/interfaces/processed-transaction.interface'
 import { Activity } from '@core/wallet/types'
 import { generateActivities } from '@core/wallet/utils'
 
 export async function generateActivitiesFromProcessedTransactions(
     processedTransactions: IProcessedTransaction[],
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const activities: Activity[] = []
     for (const _preparedActivity of processedTransactions) {
diff --git a/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts
index a5b9e471b27..009b3930aaf 100644
--- a/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/generateAndStoreActivitiesForAccount.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account/interfaces'
+import { IWalletState } from '@core/wallet/interfaces'
 
 import { setAccountActivitiesInAllAccountActivities } from '../../stores'
 
@@ -10,7 +10,7 @@ import { hideActivitiesForFoundries } from './hideActivitiesForFoundries'
 import { generateActivitiesFromProcessedTransactions } from './generateActivitiesFromProcessedTransactions'
 import { loadAssetsForAllActivities } from './loadAssetsForAllAccounts'
 
-export async function generateAndStoreActivitiesForAccount(account: IAccountState): Promise<void> {
+export async function generateAndStoreActivitiesForAccount(account: IWalletState): Promise<void> {
     // Step 1: process account transactions and outputs into processed transactions
     const processedTransactions = [
         ...(await preprocessTransactionsForAccount(account)),
diff --git a/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForFoundries.ts b/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForFoundries.ts
index 8aa013b64a0..8cad8f14bd9 100644
--- a/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForFoundries.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForFoundries.ts
@@ -1,10 +1,10 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { updateActivityFromPartialActivity } from '@core/wallet/utils/generateActivity/helper'
 import { get } from 'svelte/store'
 import { ActivityType } from '../../enums'
 import { allAccountActivities } from '../../stores'
 
-export function hideActivitiesForFoundries(account: IAccountState): void {
+export function hideActivitiesForFoundries(account: IWalletState): void {
     const accountActivities = get(allAccountActivities)[account.index]
 
     const activities = accountActivities.filter((activity) => activity.type === ActivityType.Foundry)
diff --git a/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForHiddenAssets.ts b/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForHiddenAssets.ts
index dd4742e024e..18972f98cc5 100644
--- a/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForHiddenAssets.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/hideActivitiesForHiddenAssets.ts
@@ -1,14 +1,13 @@
 import { get } from 'svelte/store'
-import { allAccountActivities, persistedAssets } from '../../stores'
+import { allWalletActivities, persistedAssets, selectedWalletId } from '../../stores'
 import { activeProfile } from '@core/profile'
-import { selectedAccountIndex } from '@core/account'
 import { ActivityType } from '@core/wallet/enums'
 import { updateActivityFromPartialActivity } from '@core/wallet/utils/generateActivity/helper'
 
 export function hideActivitiesForHiddenAssets(): void {
     const assets = get(persistedAssets)?.[get(activeProfile)?.id]
-    allAccountActivities.update((state) => {
-        state[get(selectedAccountIndex)].forEach((_activity) => {
+    allWalletActivities.update((state) => {
+        state[get(selectedWalletId)].forEach((_activity) => {
             if (_activity.type === ActivityType.Basic || _activity.type === ActivityType.Foundry) {
                 const isAssetHidden = !assets[_activity.assetId] || assets[_activity.assetId]?.hidden
                 updateActivityFromPartialActivity(_activity, { isAssetHidden })
diff --git a/packages/shared/lib/core/wallet/actions/activities/index.ts b/packages/shared/lib/core/wallet/actions/activities/index.ts
index 348f4c7b1dc..2dcf831d634 100644
--- a/packages/shared/lib/core/wallet/actions/activities/index.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/index.ts
@@ -6,3 +6,4 @@ export * from './preprocessOutputsForAccount'
 export * from './preprocessTransactionsForAccount'
 export * from './loadAssetsForAllAccounts'
 export * from './setAsyncStatusOfAccountActivities'
+export * from './updateClaimingTransactionInclusion'
diff --git a/packages/shared/lib/core/wallet/actions/activities/linkTransactionsWithClaimingTransactions.ts b/packages/shared/lib/core/wallet/actions/activities/linkTransactionsWithClaimingTransactions.ts
index c07441fd58e..043a5ee338a 100644
--- a/packages/shared/lib/core/wallet/actions/activities/linkTransactionsWithClaimingTransactions.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/linkTransactionsWithClaimingTransactions.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { activeProfileId } from '@core/profile'
 import { ActivityDirection, IProcessedTransaction } from '@core/wallet'
 import { isOutputAsync } from '@core/wallet/utils/outputs/isOutputAsync'
@@ -8,13 +8,13 @@ import { addClaimedActivity, claimedActivities } from '../../stores'
 /**
  * It takes a list of transactions and links the transactions that are claiming async transactions
  * @param {IProcessedTransaction[]} transactions - IProcessedTransaction[]
- * @param {IAccountState} account - IAccountState - the account for which we are processing
+ * @param {IWalletState} account - IWalletState - the account for which we are processing
  * transactions
  * @returns An array of processed transactions
  */
 export function linkTransactionsWithClaimingTransactions(
     transactions: IProcessedTransaction[],
-    account: IAccountState
+    account: IWalletState
 ): IProcessedTransaction[] {
     const resultingTransactions = []
     const transactionsIncludedAsClaimingTransactions = []
diff --git a/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts b/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts
index f9c3e919c95..33727cbd93f 100644
--- a/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/loadAssetsForAllAccounts.ts
@@ -1,11 +1,11 @@
 import { getOrRequestAssetFromPersistedAssets } from '../getOrRequestAssetFromPersistedAssets'
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { get } from 'svelte/store'
 import { ActivityType } from '@core/wallet/enums'
 import { allAccountActivities, addPersistedAsset } from '../../stores'
 import { IPersistedAsset } from '@core/wallet/interfaces'
 
-export async function loadAssetsForAllActivities(account: IAccountState): Promise<void> {
+export async function loadAssetsForAllActivities(account: IWalletState): Promise<void> {
     const accountActivities = get(allAccountActivities)[account.index]
 
     const persistedAssets: IPersistedAsset[] = []
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
index 2de14be755e..f838e5c9032 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessOutputsForAccount.ts
@@ -1,11 +1,11 @@
 import type { OutputData, OutputResponse, Transaction } from '@iota/sdk/out/types'
 
-import { IAccountState } from '@core/account/interfaces'
+import { IWalletState } from '@core/wallet/interfaces'
 
 import { preprocessGroupedOutputs } from '../../utils/outputs'
 import { IProcessedTransaction } from '../../interfaces'
 
-export async function preprocessOutputsForAccount(account: IAccountState): Promise<IProcessedTransaction[]> {
+export async function preprocessOutputsForAccount(account: IWalletState): Promise<IProcessedTransaction[]> {
     const outputs = await account.outputs()
 
     const transactions = await account.transactions()
diff --git a/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts b/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts
index 092e6317466..24d65360f71 100644
--- a/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/preprocessTransactionsForAccount.ts
@@ -1,8 +1,8 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { preprocessOutgoingTransaction } from '../../utils'
 import { IProcessedTransaction } from '../../interfaces/processed-transaction.interface'
 
-export async function preprocessTransactionsForAccount(account: IAccountState): Promise<IProcessedTransaction[]> {
+export async function preprocessTransactionsForAccount(account: IWalletState): Promise<IProcessedTransaction[]> {
     const transactions = await account.transactions()
 
     const processedTransactions: IProcessedTransaction[] = []
diff --git a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts
index 9088cc6dd9e..f0f89406b3f 100644
--- a/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/setAsyncStatusOfAccountActivities.ts
@@ -1,4 +1,4 @@
-import { syncBalance } from '@core/account/actions/syncBalance'
+import { syncBalance } from 'shared/lib/core/wallet/actions/syncBalance'
 import { updateNftInAllAccountNfts } from '@core/nfts'
 import { ActivityAsyncStatus, ActivityDirection, ActivityType } from '@core/wallet/enums'
 import { allAccountActivities } from '../../stores'
diff --git a/packages/shared/lib/core/wallet/actions/activities/updateClaimingTransactionInclusion.ts b/packages/shared/lib/core/wallet/actions/activities/updateClaimingTransactionInclusion.ts
index 956c8d7987e..2b748e6d733 100644
--- a/packages/shared/lib/core/wallet/actions/activities/updateClaimingTransactionInclusion.ts
+++ b/packages/shared/lib/core/wallet/actions/activities/updateClaimingTransactionInclusion.ts
@@ -1,5 +1,5 @@
 import { ActivityAsyncStatus, ActivityType, InclusionState } from '@core/wallet/enums'
-import { addClaimedActivity, allAccountActivities } from '@core/wallet/stores'
+import { addClaimedActivity, allWalletActivities } from '@core/wallet/stores'
 import { showAppNotification } from '@auxiliary/notification'
 import { localize } from '@core/i18n'
 import { updateActivityFromPartialActivity } from '@core/wallet/utils/generateActivity/helper'
@@ -7,10 +7,10 @@ import { updateActivityFromPartialActivity } from '@core/wallet/utils/generateAc
 export function updateClaimingTransactionInclusion(
     transactionId: string,
     inclusionState: InclusionState,
-    accountIndex: number
+    walletId: string
 ): void {
-    allAccountActivities.update((state) => {
-        const activity = state[accountIndex]?.find(
+    allWalletActivities.update((state) => {
+        const activity = state[walletId]?.find(
             (_activity) => _activity.asyncData?.claimingTransactionId === transactionId
         )
 
@@ -25,7 +25,7 @@ export function updateClaimingTransactionInclusion(
                         asyncStatus: ActivityAsyncStatus.Claimed,
                     },
                 })
-                addClaimedActivity(accountIndex, activity?.transactionId, {
+                addClaimedActivity(walletId, activity?.transactionId, {
                     id: activity.id,
                     claimingTransactionId: transactionId,
                     claimedTimestamp: new Date().getTime(),
diff --git a/packages/shared/lib/core/profile-manager/api/backup.ts b/packages/shared/lib/core/wallet/actions/backup.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/api/backup.ts
rename to packages/shared/lib/core/wallet/actions/backup.ts
diff --git a/packages/shared/lib/core/account/actions/buildAccountState.ts b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
similarity index 56%
rename from packages/shared/lib/core/account/actions/buildAccountState.ts
rename to packages/shared/lib/core/wallet/actions/buildWalletState.ts
index 5c704f1eee7..3b921c2dd61 100644
--- a/packages/shared/lib/core/account/actions/buildAccountState.ts
+++ b/packages/shared/lib/core/wallet/actions/buildWalletState.ts
@@ -1,14 +1,15 @@
 import { Balance } from '@iota/sdk/out/types'
+import { IPersistedWalletData } from '../interfaces/persisted-wallet-data.interface';
+import { IWalletState } from '../interfaces/wallet-state.interface';
+import { IWallet } from '@core/profile/interfaces';
+import { getDepositAddress } from '../utils/getDepositAddress';
+import { getAddressesWithOutputs } from './getAddressesWithOutputs';
 
-import { getDepositAddress } from '@core/account/utils'
-
-import { IAccount, IAccountState, IPersistedAccountData } from '../interfaces'
-import { getAddressesWithOutputs } from './getAddressesWithOutputs'
-
-export async function buildAccountState(
-    account: IAccount,
-    accountPersistedData: IPersistedAccountData
-): Promise<IAccountState> {
+// TODO(2.0): Fix usages of buildAccountState
+export async function buildWalletState(
+    wallet: IWallet,
+    walletPersistedData: IPersistedWalletData
+): Promise<IWalletState> {
     let balances: Balance = {
         baseCoin: {
             total: BigInt(0),
@@ -16,7 +17,7 @@ export async function buildAccountState(
             votingPower: '0',
         },
         requiredStorageDeposit: {
-            alias: BigInt(0),
+            account: BigInt(0),
             basic: BigInt(0),
             foundry: BigInt(0),
             nft: BigInt(0),
@@ -25,24 +26,23 @@ export async function buildAccountState(
         nfts: [],
         foundries: [],
         potentiallyLockedOutputs: {},
-        aliases: [],
+        accounts: [],
     }
-    const accountIndex = 0; // TODO: CHANGE THIS
+    
     let depositAddress = ''
     let votingPower = ''
     try {
-        balances = await account.getBalance()
-        depositAddress = await getDepositAddress(account)
+        balances = await wallet.getBalance()
+        depositAddress = await getDepositAddress(wallet)
         votingPower = balances.baseCoin.votingPower
     } catch (err) {
         console.error(err)
     }
-    const addressesWithOutputs = await getAddressesWithOutputs(account)
+    const addressesWithOutputs = await getAddressesWithOutputs(wallet)
 
     return {
-        index: accountIndex,
-        ...account,
-        ...accountPersistedData,
+        ...wallet,
+        ...walletPersistedData,
         depositAddress,
         balances,
         hasVotingPowerTransactionInProgress: false,
@@ -51,5 +51,5 @@ export async function buildAccountState(
         isTransferring: false,
         votingPower,
         addressesWithOutputs,
-    } as IAccountState
+    } as IWalletState
 }
diff --git a/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts b/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts
new file mode 100644
index 00000000000..83167659ea4
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/buildWalletStateAndPersistedData.ts
@@ -0,0 +1,23 @@
+import { localize } from '@core/i18n'
+import { getRandomWalletColor } from '@core/wallet/utils'
+import { IWallet } from '@core/profile/interfaces';
+import { IWalletState } from '../interfaces/wallet-state.interface';
+import { IPersistedWalletData } from '../interfaces/persisted-wallet-data.interface';
+import { buildWalletState } from './buildWalletState'
+
+export async function buildWalletStateAndPersistedData(
+    wallet: IWallet,
+    name?: string,
+    color?: string
+): Promise<[IWalletState, IPersistedWalletData]> {
+
+    const persistedWalletData: IPersistedWalletData = {
+        name: name || `${localize('general.account')}`,
+        color: color || getRandomWalletColor(),
+        hidden: false,
+        shouldRevote: false,
+        walletOptions: {}
+    }
+    const accountState = await buildWalletState(wallet, persistedWalletData)
+    return [accountState, persistedWalletData]
+}
diff --git a/packages/shared/lib/core/wallet/actions/burnAsset.ts b/packages/shared/lib/core/wallet/actions/burnAsset.ts
index ca025f47ba1..fe4b2e9a16c 100644
--- a/packages/shared/lib/core/wallet/actions/burnAsset.ts
+++ b/packages/shared/lib/core/wallet/actions/burnAsset.ts
@@ -1,20 +1,20 @@
 import { PreparedTransaction } from '@iota/sdk/out/types'
 import { plainToInstance } from 'class-transformer'
 
-import { get } from 'svelte/store'
 import { showAppNotification } from '@auxiliary/notification'
-import { selectedAccount, updateSelectedAccount } from '@core/account/stores'
 import { localize } from '@core/i18n'
 import { Converter } from '@core/utils'
 import { handleError } from '@core/error/handlers'
 import { processAndAddToActivities } from '../utils'
+import { getSelectedWallet, updateSelectedWallet } from '../stores'
 
 export async function burnAsset(assetId: string, rawAmount: string): Promise<void> {
-    const account = get(selectedAccount)
+    const wallet = getSelectedWallet();
     try {
-        updateSelectedAccount({ isTransferring: true })
-        const prepareBurnNativeTokenTransaction = await account?.prepareBurnNativeToken(
+        updateSelectedWallet({ isTransferring: true })
+        const prepareBurnNativeTokenTransaction = await wallet?.prepareBurnNativeToken(
             assetId,
+            // TODO(2.0) Fox this
             Converter.decimalToHex(Number(rawAmount))
         )
         const preparedTransaction = plainToInstance(PreparedTransaction, prepareBurnNativeTokenTransaction)
@@ -30,6 +30,6 @@ export async function burnAsset(assetId: string, rawAmount: string): Promise<voi
     } catch (err) {
         handleError(err)
     } finally {
-        updateSelectedAccount({ isTransferring: false })
+        updateSelectedWallet({ isTransferring: false })
     }
 }
diff --git a/packages/shared/lib/core/wallet/actions/burnNft.ts b/packages/shared/lib/core/wallet/actions/burnNft.ts
index 47a8d8b11c7..7d82344e56a 100644
--- a/packages/shared/lib/core/wallet/actions/burnNft.ts
+++ b/packages/shared/lib/core/wallet/actions/burnNft.ts
@@ -2,26 +2,26 @@ import { PreparedTransaction } from '@iota/sdk/out/types'
 import { plainToInstance } from 'class-transformer'
 
 import { showAppNotification } from '@auxiliary/notification'
-import { selectedAccount, updateSelectedAccount } from '@core/account/stores/selected-account.store'
+import { getSelectedWallet, updateSelectedWallet } from '@core/wallet/stores/selected-wallet.store'
 import { localize } from '@core/i18n'
 import { updateNftInAllAccountNfts } from '@core/nfts'
 import { handleError } from '@core/error/handlers'
-import { get } from 'svelte/store'
 import { processAndAddToActivities } from '../utils'
 
+// TODO(2.0) Fix all usages
 export async function burnNft(nftId: string): Promise<void> {
-    const account = get(selectedAccount)
+    const wallet = getSelectedWallet();
     try {
-        updateSelectedAccount({ isTransferring: true })
-        const prepareBurnNftTransaction = await account?.prepareBurnNft(nftId)
+        updateSelectedWallet({ isTransferring: true })
+        const prepareBurnNftTransaction = await wallet?.prepareBurnNft(nftId)
         const preparedTransaction = plainToInstance(PreparedTransaction, prepareBurnNftTransaction)
         const burnNftTransaction = await preparedTransaction?.send()
 
         // Generate Activity
-        await processAndAddToActivities(burnNftTransaction, account)
+        await processAndAddToActivities(burnNftTransaction, wallet)
 
         // Update NFT
-        updateNftInAllAccountNfts(account.index, nftId, { isSpendable: false })
+        updateNftInAllAccountNfts(wallet.id, nftId, { isSpendable: false })
 
         showAppNotification({
             type: 'success',
@@ -32,6 +32,6 @@ export async function burnNft(nftId: string): Promise<void> {
         handleError(err)
         throw err
     } finally {
-        updateSelectedAccount({ isTransferring: false })
+        updateSelectedWallet({ isTransferring: false })
     }
 }
diff --git a/packages/shared/lib/core/wallet/actions/claimActivity.ts b/packages/shared/lib/core/wallet/actions/claimActivity.ts
index 94368c93b77..0e30af7d1fc 100644
--- a/packages/shared/lib/core/wallet/actions/claimActivity.ts
+++ b/packages/shared/lib/core/wallet/actions/claimActivity.ts
@@ -1,28 +1,27 @@
-import { get } from 'svelte/store'
-import { selectedAccount } from '@core/account/stores'
 import { handleError } from '@core/error/handlers'
 
 import {
-    isActivityHiddenForAccountIndex,
+    getSelectedWallet,
+    isActivityHiddenForWalletId,
     removeActivityFromHiddenActivities,
     updateAsyncDataByActivityId,
 } from '../stores'
 import { Activity } from '../types'
 
 export async function claimActivity(activity: Activity): Promise<void> {
-    const account = get(selectedAccount)
+    const wallet = getSelectedWallet();
     try {
-        if (isActivityHiddenForAccountIndex(account.index, activity.id)) {
-            removeActivityFromHiddenActivities(account.index, activity.id)
-            updateAsyncDataByActivityId(account.index, activity.id, { isRejected: false })
+        if (isActivityHiddenForWalletId(wallet.id, activity.id)) {
+            removeActivityFromHiddenActivities(wallet.id, activity.id)
+            updateAsyncDataByActivityId(wallet.id, activity.id, { isRejected: false })
         }
 
-        updateAsyncDataByActivityId(account.index, activity.id, { isClaiming: true })
-        const result = await account.claimOutputs([activity.outputId])
+        updateAsyncDataByActivityId(wallet.id, activity.id, { isClaiming: true })
+        const result = await wallet.claimOutputs([activity.outputId])
         const transactionId = result.transactionId
-        updateAsyncDataByActivityId(account.index, activity.id, { claimingTransactionId: transactionId })
+        updateAsyncDataByActivityId(wallet.id, activity.id, { claimingTransactionId: transactionId })
     } catch (err) {
         handleError(err)
-        updateAsyncDataByActivityId(account.index, activity.id, { isClaiming: false })
+        updateAsyncDataByActivityId(wallet.id, activity.id, { isClaiming: false })
     }
 }
diff --git a/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts b/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
index 506820ca29a..f1a4eb7db28 100644
--- a/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
+++ b/packages/shared/lib/core/wallet/actions/consolidateOutputs.ts
@@ -1,30 +1,29 @@
-import { get } from 'svelte/store'
 import { PreparedTransaction } from '@iota/sdk/out/types'
-import { IAccountState, selectedAccount } from '@core/account'
+import { getSelectedWallet, IWalletState } from '@core/wallet'
 import { handleError } from '@core/error/handlers'
 import { processAndAddToActivities } from '../utils'
 import { plainToInstance } from 'class-transformer'
-import { updateActiveAccount } from '@core/profile'
+import { updateActiveWallet } from '@core/profile'
 
-export async function consolidateOutputs(accountToConsolidate?: IAccountState): Promise<void> {
-    const account = accountToConsolidate || get(selectedAccount)
-    if (!account) return Promise.reject('No account selected')
+export async function consolidateOutputs(accountToConsolidate?: IWalletState): Promise<void> {
+    const wallet = accountToConsolidate || getSelectedWallet()
+    if (!wallet) return Promise.reject('No account selected')
 
     try {
-        updateActiveAccount(account.index, { hasConsolidatingOutputsTransactionInProgress: true, isTransferring: true })
+        updateActiveWallet(wallet.id, { hasConsolidatingOutputsTransactionInProgress: true, isTransferring: true })
 
-        const preparedConsolidateOutputsTransaction = await account.prepareConsolidateOutputs({
+        const preparedConsolidateOutputsTransaction = await wallet.prepareConsolidateOutputs({
             force: false,
             outputThreshold: 2,
-            targetAddress: account.depositAddress,
+            targetAddress: wallet.depositAddress,
         })
         const preparedTransaction = plainToInstance(PreparedTransaction, preparedConsolidateOutputsTransaction)
         const transaction = await preparedTransaction?.send()
 
-        await processAndAddToActivities(transaction, account)
+        await processAndAddToActivities(transaction, wallet)
     } catch (err) {
         handleError(err)
-        updateActiveAccount(account.index, {
+        updateActiveWallet(wallet.id, {
             hasConsolidatingOutputsTransactionInProgress: false,
             isTransferring: false,
         })
diff --git a/packages/shared/lib/core/wallet/actions/createNativeToken.ts b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
index 247885d0c9d..449c9c414db 100644
--- a/packages/shared/lib/core/wallet/actions/createNativeToken.ts
+++ b/packages/shared/lib/core/wallet/actions/createNativeToken.ts
@@ -1,13 +1,12 @@
 import { get } from 'svelte/store'
 import { showAppNotification } from '@auxiliary/notification'
-import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { Converter } from '@core/utils'
 import { CreateNativeTokenParams, PreparedTransaction } from '@iota/sdk/out/types'
 import { VerifiedStatus } from '../enums'
 import { buildPersistedAssetFromMetadata } from '../helpers'
 import { IIrc30Metadata, IPersistedAsset } from '../interfaces'
-import { resetMintTokenDetails } from '../stores'
+import { getSelectedWallet, resetMintTokenDetails, updateSelectedWallet } from '../stores'
 import { addPersistedAsset } from '../stores/persisted-assets.store'
 import { plainToInstance } from 'class-transformer'
 import { getDefaultTransactionOptions, processAndAddToActivities } from '../utils'
@@ -18,15 +17,15 @@ export async function createNativeToken(
     metadata: IIrc30Metadata
 ): Promise<void> {
     try {
-        updateSelectedAccount({ isTransferring: true })
-        const account = get(selectedAccount)
+        updateSelectedWallet({ isTransferring: true })
+        const wallet = getSelectedWallet();
         const params: CreateNativeTokenParams = {
             maximumSupply: BigInt(maximumSupply),
             circulatingSupply: BigInt(circulatingSupply),
             foundryMetadata: Converter.utf8ToHex(JSON.stringify(metadata)),
         }
 
-        const preparedNativeTokenTransaction = await account?.prepareCreateNativeToken(
+        const preparedNativeTokenTransaction = await wallet?.prepareCreateNativeToken(
             params,
             getDefaultTransactionOptions()
         )
@@ -39,7 +38,7 @@ export async function createNativeToken(
         )
         addPersistedAsset(persistedAsset)
 
-        await processAndAddToActivities(transaction, account)
+        await processAndAddToActivities(transaction, wallet)
 
         showAppNotification({
             type: 'success',
@@ -50,6 +49,6 @@ export async function createNativeToken(
     } catch (err) {
         return Promise.reject(err)
     } finally {
-        updateSelectedAccount({ isTransferring: false })
+        updateSelectedWallet({ isTransferring: false })
     }
 }
diff --git a/packages/shared/lib/core/wallet/actions/createNewWallet.ts b/packages/shared/lib/core/wallet/actions/createNewWallet.ts
new file mode 100644
index 00000000000..6b5ddfcb504
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/createNewWallet.ts
@@ -0,0 +1,33 @@
+import { localize } from '@core/i18n'
+import { activeAccounts, addWalletPersistedDataToActiveProfile, addAccountToActiveAccounts, createWallet } from '@core/profile'
+import { addEmptyAccountActivitiesToAllAccountActivities } from '@core/wallet/stores'
+import { get } from 'svelte/store'
+
+import { DEFAULT_SYNC_OPTIONS } from '../../account/constants'
+import { IWalletState } from '../../account/interfaces'
+
+import { buildWalletStateAndPersistedData } from './buildWalletStateAndPersistedData'
+
+export async function createNewWallet(name?: string, color?: string): Promise<IWalletState> {
+    // 1. Get the wallet name
+    const walletName = name || `${localize('general.account')} ${(get(activeAccounts)?.length ?? 0) + 1}`;
+
+    // 2. Create the wallet instance
+    const wallet = await createWallet()
+
+    // 3. Sync the wallet with the Node
+    // TODO(2.0): test & fix sync when we have iota2.0 nodes
+    //await account.sync(DEFAULT_SYNC_OPTIONS)
+
+    // 4. Create a wrapper over the wallet instance and the persisted data
+    const [walletState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet, walletName, color)
+
+    // TODO(2.0) Fix
+    // addAccountToActiveAccounts(walletState)
+    addWalletPersistedDataToActiveProfile(walletState.id, accountPersistedData)
+    // TODO(2.0) Fix
+    // addEmptyAccountActivitiesToAllAccountActivities(walletState.id)
+
+
+    return walletState
+}
diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts
new file mode 100644
index 00000000000..a8c3c756504
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleNewOutputEvent.ts
@@ -0,0 +1,72 @@
+import { Event, NewOutputWalletEvent, OutputType, WalletEventType } from '@iota/sdk/out/types'
+
+import { addNftsToDownloadQueue, addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput } from '@core/nfts'
+import { checkAndRemoveProfilePicture } from '@core/profile/actions'
+import {
+    ActivityType,
+    IWrappedOutput,
+    addPersistedAsset,
+    generateActivities,
+    getOrRequestAssetFromPersistedAssets,
+    allWalletActivities,
+    getAddressesWithOutputs,
+    syncBalance,
+    validateWalletApiEvent,
+     getBech32AddressFromAddressTypes,
+      preprocessGroupedOutputs,
+      addActivitiesToWalletActivitiesInAllWalletActivities
+} from '@core/wallet'
+import { get } from 'svelte/store'
+import { activeWallets, updateActiveWallet } from '@core/profile'
+
+export function handleNewOutputEvent(error: Error, rawEvent: Event): void {
+    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.NewOutput)
+    const type = payload.type
+    if (type === WalletEventType.NewOutput) {
+        void handleNewOutputEventInternal(walletId, payload as NewOutputWalletEvent)
+    }
+}
+
+// TODO(2.0) Use wallet instead of accounts and fix all usages
+export async function handleNewOutputEventInternal(walletId: string, payload: NewOutputWalletEvent): Promise<void> {
+    const wallet = get(activeWallets)?.find((wallet) => wallet.id === walletId)
+    const outputData = payload.output
+
+    if (!wallet || !outputData) return
+
+    const output = outputData.output
+
+    const address = getBech32AddressFromAddressTypes(outputData.address)
+    const isNewAliasOutput =
+        output.type === OutputType.Account &&
+        !get(allWalletActivities)[walletId].find((_activity) => _activity.id === outputData.outputId)
+    const isNftOutput = output.type === OutputType.Nft
+
+    if ((wallet?.depositAddress === address && !outputData?.remainder) || isNewAliasOutput) {
+        await syncBalance(wallet.id)
+        const addressesWithOutputs = await getAddressesWithOutputs(wallet)
+        updateActiveWallet(wallet.id, { addressesWithOutputs })
+
+        const processedOutput = preprocessGroupedOutputs([outputData], payload?.transactionInputs ?? [], account)
+
+        const activities = await generateActivities(processedOutput, wallet)
+        for (const activity of activities) {
+            if (activity.type === ActivityType.Basic || activity.type === ActivityType.Foundry) {
+                const asset = await getOrRequestAssetFromPersistedAssets(activity.assetId)
+                if (asset) {
+                    addPersistedAsset(asset)
+                }
+            }
+        }
+        addActivitiesToWalletActivitiesInAllWalletActivities(wallet.id, activities)
+    }
+
+    if (isNftOutput) {
+        const wrappedOutput = outputData as unknown as IWrappedOutput
+        const nft = buildNftFromNftOutput(wrappedOutput, wallet.depositAddress)
+        addOrUpdateNftInAllAccountNfts(wallet.id, nft)
+        void addNftsToDownloadQueue(walletId, [nft])
+
+        checkAndRemoveProfilePicture()
+    }
+}
diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts
new file mode 100644
index 00000000000..3e6fbdf363b
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleSpentOutputEvent.ts
@@ -0,0 +1,48 @@
+// TODO(2.0) Fix all of events code, blocked by https://github.com/iotaledger/iota-sdk/issues/1708
+
+import { Event, SpentOutputWalletEvent, WalletEventType } from '@iota/sdk/out/types'
+
+import { getNftByIdFromAllAccountNfts, updateNftInAllAccountNfts } from '@core/nfts'
+import { syncBalance, ActivityAsyncStatus, ActivityType, validateWalletApiEvent, updateAsyncDataByTransactionId, allWalletActivities} from '@core/wallet'
+import { get } from 'svelte/store'
+import { activeWallets, updateActiveWallet } from '@core/profile'
+
+export async function handleSpentOutputEvent(error: Error, rawEvent: Event): Promise<void> {
+    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.SpentOutput)
+    const type = payload.type
+    if (type === WalletEventType.SpentOutput) {
+        await handleSpentOutputEventInternal(walletId, payload as SpentOutputWalletEvent)
+    }
+}
+
+// TODO(2.0) Fix all usages
+export async function handleSpentOutputEventInternal(
+    walletId: string,
+    payload: SpentOutputWalletEvent
+): Promise<void> {
+    const wallet = get(activeWallets)?.find((wallet) => wallet.id === walletId)
+    const output = payload.output
+    await syncBalance(walletId)
+    if (wallet) {
+        // TODO(2.0) Fix getAddressesWithOutputs is missing
+        const addressesWithOutputs = await getAddressesWithOutputs(wallet)
+        updateActiveWallet(walletId, { addressesWithOutputs })
+    }
+    const outputId = output?.outputId
+    const activity = get(allWalletActivities)?.[walletId]?.find((_activity) => _activity.outputId === outputId)
+
+    if (activity && activity.asyncData?.asyncStatus === ActivityAsyncStatus.Unclaimed) {
+        const transactionId = output?.metadata?.transactionId
+        updateAsyncDataByTransactionId(walletId, transactionId, {
+            asyncStatus: ActivityAsyncStatus.Claimed,
+        })
+    }
+
+    if (activity?.type === ActivityType.Nft) {
+        const previousOutputId = getNftByIdFromAllAccountNfts(walletId, activity.nftId)?.latestOutputId
+        const previousOutput = await wallet.getOutput(previousOutputId)
+        if (output.metadata.milestoneTimestampBooked > previousOutput.metadata.milestoneTimestampBooked) {
+            updateNftInAllAccountNfts(walletId, activity.nftId, { isSpendable: false })
+        }
+    }
+}
diff --git a/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
new file mode 100644
index 00000000000..f1854680860
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionInclusionEvent.ts
@@ -0,0 +1,95 @@
+import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
+import { Event, TransactionInclusionWalletEvent, WalletEventType } from '@iota/sdk/out/types'
+
+import { updateParticipationOverview } from '@contexts/governance/stores'
+import { isWalletVoting } from 'shared/lib/contexts/governance/utils/isWalletVoting'
+import { updateNftInAllAccountNfts } from '@core/nfts'
+import { updateActiveAccountPersistedData } from '@core/profile/actions'
+import { syncVotingPower, getActivityByTransactionId,
+    updateActivityByTransactionId, validateWalletApiEvent, updateClaimingTransactionInclusion,  ActivityAction, ActivityDirection, ActivityType, GovernanceActivity, InclusionState } from '@core/wallet'
+import { get } from 'svelte/store'
+import { activeWallets, updateActiveWallet } from 'shared/lib/core/profile'
+
+export function handleTransactionInclusionEvent(error: Error, rawEvent: Event): void {
+    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionInclusion)
+    const type = payload?.type
+    if (type === WalletEventType.TransactionInclusion) {
+        handleTransactionInclusionEventInternal(walletId, payload as TransactionInclusionWalletEvent)
+    }
+}
+
+export function handleTransactionInclusionEventInternal(
+    walletId: string,
+    payload: TransactionInclusionWalletEvent
+): void {
+    const { inclusionState, transactionId } = payload
+    updateActivityByTransactionId(walletId, transactionId, { inclusionState })
+
+    const activity = getActivityByTransactionId(walletId, transactionId)
+
+    if (activity?.type === ActivityType.Nft) {
+        const isSpendable =
+            (activity.direction === ActivityDirection.Incoming ||
+                activity.direction === ActivityDirection.SelfTransaction) &&
+            activity.action !== ActivityAction.Burn
+        updateNftInAllAccountNfts(walletId, activity.nftId, { isSpendable })
+    }
+
+    if (activity?.type === ActivityType.Governance) {
+        handleGovernanceTransactionInclusionEvent(walletId, inclusionState, activity)
+    }
+
+    if (activity?.type === ActivityType.Consolidation) {
+        handleConsolidationTransactionInclusionEvent(walletId, inclusionState)
+    }
+
+    updateClaimingTransactionInclusion(transactionId, inclusionState, walletId)
+}
+
+function handleGovernanceTransactionInclusionEvent(
+    walletId: string,
+    inclusionState: InclusionState,
+    activity: GovernanceActivity
+): void {
+    if (inclusionState === InclusionState.Confirmed) {
+        // TODO: Normally we update active account after a wallet.rs returns a transaction
+        // With governance we wait for the transaction confirmation
+        // we should think about making this consistent in the future
+        updateActiveWallet(walletId, { isTransferring: false })
+        // TODO: move this
+        closePopup(true)
+
+        const wallet = get(activeWallets)?.find((_wallet) => _wallet.id === walletId)
+        if (!wallet) {
+            return
+        }
+        if (wallet.hasVotingPowerTransactionInProgress) {
+            updateActiveWallet(walletId, { hasVotingPowerTransactionInProgress: false })
+            if (isWalletVoting(walletId) && activity.votingPower !== 0) {
+                updateActiveAccountPersistedData(walletId, { shouldRevote: true })
+                openPopup({ id: PopupId.Revote })
+            }
+        } else {
+            updateActiveWallet(walletId, { hasVotingTransactionInProgress: false })
+            updateActiveAccountPersistedData(walletId, { shouldRevote: false })
+        }
+        void updateParticipationOverview(walletId)
+    }
+    syncVotingPower(walletId)
+}
+
+function handleConsolidationTransactionInclusionEvent(walletId: string, inclusionState: InclusionState): void {
+    if (inclusionState === InclusionState.Confirmed) {
+        // TODO: Normally we update active account after a the sdk returns a transaction
+        // With output consolidation we wait for the transaction confirmation to improve the UX of the vesting tab
+        // we should think about making this consistent in the future
+        updateActiveWallet(walletId, { isTransferring: false })
+        const account = get(activeWallets)?.find((_wallet) => _wallet.id === walletId)
+        if (!account) {
+            return
+        }
+        if (account?.hasConsolidatingOutputsTransactionInProgress) {
+            updateActiveWallet(walletId, { hasConsolidatingOutputsTransactionInProgress: false })
+        }
+    }
+}
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionProgressEvent.ts
similarity index 80%
rename from packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
rename to packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionProgressEvent.ts
index d8e814a0590..7491d71954b 100644
--- a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleTransactionProgressEvent.ts
+++ b/packages/shared/lib/core/wallet/actions/events-handlers/handleTransactionProgressEvent.ts
@@ -2,37 +2,38 @@ import { get } from 'svelte/store'
 import {
     Event,
     TransactionProgressWalletEvent,
-    PreparedTransactionEssenceHashProgress,
+    PreparedTransactionSigningHashProgress,
     WalletEventType,
     TransactionProgressType,
+    TransactionProgress,
 } from '@iota/sdk/out/types'
 
-import { selectedAccountIndex } from '@core/account'
+
 import { ledgerNanoStatus } from '@core/ledger'
 import { isActiveLedgerProfile } from '@core/profile'
 import { isOnboardingLedgerProfile } from '@contexts/onboarding'
 import { closePopup, openPopup, PopupId } from '@auxiliary/popup'
 import { deconstructLedgerVerificationProps } from '@core/ledger/helpers'
-
-import { MissingTransactionProgressEventPayloadError } from '../../errors'
-import { TransactionProgressEventPayload } from '../../types'
 import { validateWalletApiEvent } from '../../utils'
+import { selectedWalletId } from '../../stores'
+import { MissingTransactionProgressEventPayloadError } from '../../errors'
+
 
 export function handleTransactionProgressEvent(error: Error, rawEvent: Event): void {
-    const { accountIndex, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionProgress)
+    const { walletId, payload } = validateWalletApiEvent(error, rawEvent, WalletEventType.TransactionProgress)
     const type = payload.type
     if (type === WalletEventType.TransactionProgress) {
         const progress = (payload as TransactionProgressWalletEvent).progress
-        handleTransactionProgressEventInternal(accountIndex, progress)
+        handleTransactionProgressEventInternal(walletId, progress)
     }
 }
 
 export function handleTransactionProgressEventInternal(
-    accountIndex: number,
-    payload: TransactionProgressEventPayload
+    walletId: string,
+    payload: TransactionProgress
 ): void {
     if (get(isActiveLedgerProfile)) {
-        if (get(selectedAccountIndex) === accountIndex) {
+        if (get(selectedWalletId) === walletId) {
             openPopupIfVerificationNeeded(payload)
         }
     } else if (get(isOnboardingLedgerProfile)) {
@@ -42,7 +43,7 @@ export function handleTransactionProgressEventInternal(
     }
 }
 
-function openPopupIfVerificationNeeded(payload: TransactionProgressEventPayload): void {
+function openPopupIfVerificationNeeded(payload: TransactionProgress): void {
     if (payload) {
         const type = payload.type
         if (type === TransactionProgressType.PreparedTransaction) {
@@ -54,14 +55,14 @@ function openPopupIfVerificationNeeded(payload: TransactionProgressEventPayload)
                     ...deconstructLedgerVerificationProps(),
                 },
             })
-        } else if (type === TransactionProgressType.PreparedTransactionEssenceHash) {
+        } else if (type === TransactionProgressType.PreparedTransactionSigningHash) {
             if (get(ledgerNanoStatus)?.blindSigningEnabled) {
                 openPopup({
                     id: PopupId.VerifyLedgerTransaction,
                     hideClose: true,
                     preventClose: true,
                     props: {
-                        hash: (payload as PreparedTransactionEssenceHashProgress).hash,
+                        hash: (payload as PreparedTransactionSigningHashProgress).hash,
                     },
                 })
             } else {
@@ -71,6 +72,7 @@ function openPopupIfVerificationNeeded(payload: TransactionProgressEventPayload)
                     preventClose: true,
                 })
             }
+            // TODO(2.0): check if this is still needed (PerformingPow)
         } else if (type === TransactionProgressType.PerformingPow) {
             closePopup(true)
         }
diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/index.ts b/packages/shared/lib/core/wallet/actions/events-handlers/index.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/actions/events-handlers/index.ts
rename to packages/shared/lib/core/wallet/actions/events-handlers/index.ts
diff --git a/packages/shared/lib/core/account/actions/findBalances.ts b/packages/shared/lib/core/wallet/actions/findBalances.ts
similarity index 93%
rename from packages/shared/lib/core/account/actions/findBalances.ts
rename to packages/shared/lib/core/wallet/actions/findBalances.ts
index 5bcbc3281fd..a80ad16158e 100644
--- a/packages/shared/lib/core/account/actions/findBalances.ts
+++ b/packages/shared/lib/core/wallet/actions/findBalances.ts
@@ -1,12 +1,14 @@
-import { DEFAULT_SYNC_OPTIONS, SearchAlgorithmType } from '@core/account'
+// TODO(2.0) Fix all of this after having implemented the recover wallets
+
+import { DEFAULT_SYNC_OPTIONS, SearchAlgorithmType } from '@core/wallet'
 import { updateLedgerNanoStatus } from '@core/ledger'
 import {
     BALANCE_FINDER_ACCOUNT_RECOVERY_CONFIGURATION,
     UnableToFindProfileTypeError,
     activeProfile,
     isActiveLedgerProfile,
+    RecoverAccountsPayload,
 } from '@core/profile'
-import { RecoverAccountsPayload, recoverAccounts } from '@core/profile-manager'
 import { get } from 'svelte/store'
 
 const INITIAL_SEARCH_ADDRESS_START_INDEX = 0
@@ -78,7 +80,7 @@ async function depthSearchAndRecoverAccounts(config?: RecoverAccountsPayload): P
             ...config,
             syncOptions: {
                 ...(config.syncOptions || DEFAULT_SYNC_OPTIONS),
-                addressStartIndex: searchAddressStartIndex,
+                addressStartIndex: searchAddressStartIndex, // TODO(2.0) Fix this
                 addressStartIndexInternal: searchAddressStartIndex,
             },
         }
@@ -111,7 +113,7 @@ async function breadthSearchAndRecoverAccounts(config?: RecoverAccountsPayload):
                 accountStartIndex: searchAccountStartIndex,
                 syncOptions: {
                     ...(config.syncOptions || DEFAULT_SYNC_OPTIONS),
-                    addressStartIndex: chunkAddressStartIndex,
+                    addressStartIndex: chunkAddressStartIndex, // TODO(2.0) Fix this
                     addressStartIndexInternal: chunkAddressStartIndex,
                 },
             }
@@ -122,7 +124,7 @@ async function breadthSearchAndRecoverAccounts(config?: RecoverAccountsPayload):
                 addressGapLimit: _addressGapLimit,
                 syncOptions: {
                     ...DEFAULT_SYNC_OPTIONS,
-                    addressStartIndex: chunkAddressStartIndex,
+                    addressStartIndex: chunkAddressStartIndex, // TODO(2.0) Fix this
                     addressStartIndexInternal: chunkAddressStartIndex,
                 },
             }
diff --git a/packages/shared/lib/core/account/actions/getAddressesWithOutputs.ts b/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
similarity index 61%
rename from packages/shared/lib/core/account/actions/getAddressesWithOutputs.ts
rename to packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
index 1bf4dc8b265..731ea9cb7ff 100644
--- a/packages/shared/lib/core/account/actions/getAddressesWithOutputs.ts
+++ b/packages/shared/lib/core/wallet/actions/getAddressesWithOutputs.ts
@@ -1,9 +1,11 @@
-import { AddressWithOutputs, IAccount, IAccountState } from '../interfaces'
-import { getBech32AddressFromAddressTypes } from '@core/wallet'
+import { AddressWithOutputs, getBech32AddressFromAddressTypes, IWalletState } from '@core/wallet'
+import { IWallet } from '@core/profile/interfaces'
+import { Address } from '@iota/sdk/out/types'
 
-export async function getAddressesWithOutputs(account: IAccount | IAccountState): Promise<AddressWithOutputs[]> {
+// TODO(2.0) Fix all usages
+export async function getAddressesWithOutputs(account: IWallet | IWalletState): Promise<AddressWithOutputs[]> {
     let addressesWithOutputs: AddressWithOutputs[] = []
-    const addresses = await account.addresses()
+    const addresses: Address[] = [] // await account.accounts
     const outputs = await account.outputs()
 
     const outputMapped: AddressWithOutputs[] = outputs.reduce((acc: AddressWithOutputs[], output) => {
@@ -18,9 +20,9 @@ export async function getAddressesWithOutputs(account: IAccount | IAccountState)
     }, [])
 
     addressesWithOutputs = addresses.map((address) => {
-        const existingAddress = outputMapped.find((a) => a.address === address.address)
+        const existingAddress = outputMapped.find((a) => a.address === address.toString())
         if (!existingAddress) {
-            return { address: address.address, outputs: [] }
+            return { address: address.toString(), outputs: [] }
         }
         return existingAddress
     })
diff --git a/packages/shared/lib/core/wallet/actions/getBalance.ts b/packages/shared/lib/core/wallet/actions/getBalance.ts
new file mode 100644
index 00000000000..98c24fcbf53
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/getBalance.ts
@@ -0,0 +1,7 @@
+import { Balance } from '@iota/sdk/out/types'
+import { getWallet } from '@core/profile/actions'
+
+// TODO(2.0) Fix all usages
+export async function getBalance(walletId: string): Promise<Balance> {
+    return (await getWallet(walletId))?.getBalance()
+}
diff --git a/packages/shared/lib/core/wallet/actions/getClient.ts b/packages/shared/lib/core/wallet/actions/getClient.ts
new file mode 100644
index 00000000000..0389e1da384
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/getClient.ts
@@ -0,0 +1,7 @@
+import { Client } from '@iota/sdk/out/client'
+import { getSelectedWallet } from '@core/wallet/stores'
+
+export function getClient(): Promise<Client> {
+    const wallet = getSelectedWallet();
+    return wallet!.getClient()
+}
diff --git a/packages/shared/lib/core/wallet/actions/getNodeInfo.ts b/packages/shared/lib/core/wallet/actions/getNodeInfo.ts
new file mode 100644
index 00000000000..6ce86354605
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/getNodeInfo.ts
@@ -0,0 +1,15 @@
+import { IAuth } from '@iota/sdk/out/types';
+import { INodeInfoResponse } from '@core/network';
+import { getClient } from './getClient'
+
+export async function getNodeInfo(url?: string, auth?: IAuth): Promise<INodeInfoResponse> {
+    const client = await getClient();
+    const nodeUrl = url ?? (await client.getNode()).url
+
+    const nodeInfo = await client.getNodeInfo(nodeUrl, auth)
+
+    return {
+        url: nodeUrl,
+        nodeInfo,
+    }
+}
diff --git a/packages/shared/lib/core/wallet/actions/getParticipationOverview.ts b/packages/shared/lib/core/wallet/actions/getParticipationOverview.ts
new file mode 100644
index 00000000000..7aeeea578eb
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/getParticipationOverview.ts
@@ -0,0 +1,7 @@
+import type { ParticipationOverview } from '@iota/sdk/out/types'
+import { getWallet } from '@core/profile/actions'
+
+// TODO(2.0) Fix all usages
+export async function getParticipationOverview(walletId: string, eventId?: string): Promise<ParticipationOverview> {
+    return (await getWallet(walletId))?.getParticipationOverview(eventId ? [eventId] : undefined)
+}
diff --git a/packages/shared/lib/core/wallet/actions/getVotingPower.ts b/packages/shared/lib/core/wallet/actions/getVotingPower.ts
new file mode 100644
index 00000000000..451b004deba
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/getVotingPower.ts
@@ -0,0 +1,7 @@
+import { getBalance } from "./getBalance"
+
+// TODO(2.0) Fix all usages
+export async function getVotingPower(walletId: string): Promise<string> {
+    const balance = await getBalance(walletId)
+    return balance.baseCoin.votingPower
+}
diff --git a/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts b/packages/shared/lib/core/wallet/actions/getWalletAssetsForSelectedWallet.ts
similarity index 66%
rename from packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
rename to packages/shared/lib/core/wallet/actions/getWalletAssetsForSelectedWallet.ts
index 0f5cfcaa3ca..3064dda07c6 100644
--- a/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/getWalletAssetsForSelectedWallet.ts
@@ -1,29 +1,29 @@
-import { getSelectedAccount } from '@core/account/stores'
 import { MarketCoinPrices } from '@core/market'
 import { NetworkId } from '@core/network'
 import { getActiveNetworkId } from '@core/network/utils/getNetworkId'
 import { getCoinType } from '@core/profile'
 import { isValidIrc30Token } from '@core/token'
 import { IAsset } from '../interfaces'
-import { AccountAssets, IAccountAssetsPerNetwork } from '../interfaces/account-assets.interface'
+import { WalletAssets, IWalletAssetsPerNetwork } from '../interfaces'
 import { getAssetFromPersistedAssets } from '../utils'
 import { sortAssets } from '../utils/sortAssets'
 import { getMarketCoinIdByNetworkId } from '@core/market/utils'
+import { getSelectedWallet } from '../stores/selected-wallet.store'
 
-export function getAccountAssetsForSelectedAccount(marketCoinPrices: MarketCoinPrices): AccountAssets {
-    const accountAssets = {} as AccountAssets
+export function getWalletAssetsForSelectedWallet(marketCoinPrices: MarketCoinPrices): WalletAssets {
+    const walletAssets = {} as WalletAssets
 
     const networkId = getActiveNetworkId()
     if (!networkId) {
         return {}
     }
 
-    accountAssets[networkId] = getAccountAssetForNetwork(marketCoinPrices, networkId)
-    return accountAssets
+    walletAssets[networkId] = getWalletAssetForNetwork(marketCoinPrices, networkId)
+    return walletAssets
 }
 
-function getAccountAssetForNetwork(marketCoinPrices: MarketCoinPrices, networkId: NetworkId): IAccountAssetsPerNetwork {
-    const account = getSelectedAccount()
+function getWalletAssetForNetwork(marketCoinPrices: MarketCoinPrices, networkId: NetworkId): IWalletAssetsPerNetwork {
+    const wallet = getSelectedWallet()
 
     const marketCoinId = getMarketCoinIdByNetworkId(networkId)
     const shouldCalculateFiatPrice = networkId !== NetworkId.Custom && marketCoinId
@@ -31,14 +31,14 @@ function getAccountAssetForNetwork(marketCoinPrices: MarketCoinPrices, networkId
     const baseCoin: IAsset = {
         ...persistedBaseCoin,
         balance: {
-            total: Number(account?.balances?.baseCoin?.total),
-            available: Number(account?.balances?.baseCoin?.available),
+            total: Number(wallet?.balances?.baseCoin?.total),
+            available: Number(wallet?.balances?.baseCoin?.available),
         },
         ...(shouldCalculateFiatPrice && { marketPrices: marketCoinPrices?.[marketCoinId] }),
     }
 
     const nativeTokens: IAsset[] = []
-    const tokens = account?.balances?.nativeTokens ?? []
+    const tokens = wallet?.balances?.nativeTokens ?? []
     for (const token of tokens) {
         const persistedAsset = getAssetFromPersistedAssets(token.tokenId)
         if (persistedAsset && persistedAsset?.metadata && isValidIrc30Token(persistedAsset.metadata)) {
diff --git a/packages/shared/lib/core/wallet/actions/index.ts b/packages/shared/lib/core/wallet/actions/index.ts
index 79e6705c0fe..28a59e405a3 100644
--- a/packages/shared/lib/core/wallet/actions/index.ts
+++ b/packages/shared/lib/core/wallet/actions/index.ts
@@ -1,7 +1,8 @@
+export * from './backup'
 export * from './burnAsset'
 export * from './burnNft'
 export * from './claimActivity'
-export * from './getAccountAssetsForSelectedAccount'
+export * from './getWalletAssetsForSelectedWallet'
 export * from './generateAndStoreActivitiesForAllAccounts'
 export * from './rejectActivity'
 export * from './refreshAccountAssetsForActiveProfile'
@@ -12,3 +13,28 @@ export * from './mintNft'
 export * from './createNativeToken'
 export * from './getOrRequestAssetFromPersistedAssets'
 export * from './activities'
+export * from './subscribeToWalletApiEvents'
+export * from './unsubscribeFromWalletApiEvents'
+export * from './events-handlers'
+export * from './buildWalletState'
+export * from './buildWalletStateAndPersistedData'
+export * from './createNewWallet'
+export * from './loadWallet'
+export * from './resetSelectedWalletId'
+export * from './setSelectedWallet'
+export * from './findBalances'
+export * from './setStrongholdPassword'
+export * from './isStrongholdUnlocked'
+export * from './setClientOptions'
+export * from './getNodeInfo'
+export * from './setStrongholdPasswordClearInterval'
+export * from './startBackgroundSync'
+export * from './getParticipationOverview'
+export * from './getAddressesWithOutputs'
+export * from './syncBalance'
+export * from './syncVotingPower'
+export * from './tryCreateAdditionalWallet'
+export * from './getClient'
+export * from './prepareOutput'
+export * from './setNextSelectedWallet'
+export * from './restoreBackup'
diff --git a/packages/shared/lib/core/wallet/actions/isStrongholdUnlocked.ts b/packages/shared/lib/core/wallet/actions/isStrongholdUnlocked.ts
new file mode 100644
index 00000000000..833ce2da4b9
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/isStrongholdUnlocked.ts
@@ -0,0 +1,6 @@
+import { getSelectedWallet } from '../stores'
+
+export function isStrongholdUnlocked(): Promise<boolean> {
+    const wallet = getSelectedWallet();
+    return wallet.isStrongholdPasswordAvailable()
+}
diff --git a/packages/shared/lib/core/wallet/actions/loadWallet.ts b/packages/shared/lib/core/wallet/actions/loadWallet.ts
new file mode 100644
index 00000000000..e903d760dfe
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/loadWallet.ts
@@ -0,0 +1,24 @@
+import { addWalletPersistedDataToActiveProfile, getActiveProfilePersistedWalletData, IWallet } from '@core/profile'
+import { DEFAULT_SYNC_OPTIONS } from '../constants'
+import { IWalletState } from '../interfaces'
+import { buildWalletStateAndPersistedData } from './buildWalletStateAndPersistedData'
+import { buildWalletState } from './buildWalletState'
+
+// TODO(2.0) Fix all usages (it was called loadAccount before)
+export async function loadWallet(wallet: IWallet): Promise<IWalletState> {
+    // Temporary sync on load until we enable background sync and event listeners
+    const walletId = wallet.id
+    await wallet.sync({ ...DEFAULT_SYNC_OPTIONS })
+    const walletPersistedData = getActiveProfilePersistedWalletData(walletId)
+
+    let accountState: IWalletState
+    if (walletPersistedData) {
+        accountState = await buildWalletState(wallet, walletPersistedData)
+    } else {
+        const [newAccountState, accountPersistedData] = await buildWalletStateAndPersistedData(wallet)
+        addWalletPersistedDataToActiveProfile(walletId, accountPersistedData)
+        accountState = newAccountState
+    }
+    
+    return accountState
+}
diff --git a/packages/shared/lib/core/wallet/actions/mintNft.ts b/packages/shared/lib/core/wallet/actions/mintNft.ts
index 7b54e5465b8..8eef1b70962 100644
--- a/packages/shared/lib/core/wallet/actions/mintNft.ts
+++ b/packages/shared/lib/core/wallet/actions/mintNft.ts
@@ -1,12 +1,10 @@
 import { showAppNotification } from '@auxiliary/notification'
-import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { localize } from '@core/i18n'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput, IIrc27Metadata } from '@core/nfts'
 import { Converter } from '@core/utils'
 import { MintNftParams, OutputType, PreparedTransaction } from '@iota/sdk/out/types'
-import { get } from 'svelte/store'
 import { ActivityAction } from '../enums'
-import { addActivityToAccountActivitiesInAllAccountActivities, resetMintNftDetails } from '../stores'
+import { addActivityToWalletActivitiesInAllWalletActivities, getSelectedWallet, resetMintNftDetails, updateSelectedWallet } from '../stores'
 import { NftActivity } from '../types'
 import { getDefaultTransactionOptions, preprocessOutgoingTransaction } from '../utils'
 import { generateSingleNftActivity } from '../utils/generateActivity/generateSingleNftActivity'
@@ -14,18 +12,18 @@ import { plainToInstance } from 'class-transformer'
 
 export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promise<void> {
     try {
-        const account = get(selectedAccount)
-        updateSelectedAccount({ isTransferring: true })
+        const wallet = getSelectedWallet();
+        updateSelectedWallet({ isTransferring: true })
 
-        if (!account) return
+        if (!wallet) return
         const mintNftParams: MintNftParams = {
-            issuer: account.depositAddress,
+            issuer: wallet.depositAddress,
             immutableMetadata: Converter.utf8ToHex(JSON.stringify(metadata)),
         }
         const allNftParams: MintNftParams[] = Array(quantity).fill(mintNftParams)
 
         // Mint NFT
-        const mintNftTransaction = await account
+        const mintNftTransaction = await wallet
             .prepareMintNfts(allNftParams, getDefaultTransactionOptions())
             .then((prepared) => plainToInstance(PreparedTransaction, prepared).send())
         resetMintNftDetails()
@@ -35,28 +33,28 @@ export async function mintNft(metadata: IIrc27Metadata, quantity: number): Promi
             alert: true,
         })
 
-        const processedTransaction = await preprocessOutgoingTransaction(mintNftTransaction, account)
+        const processedTransaction = await preprocessOutgoingTransaction(mintNftTransaction, wallet)
         const outputs = processedTransaction.outputs
 
         // Generate Activities
         for (const output of outputs) {
             if (output.output.type === OutputType.Nft) {
                 // For each minted NFT, generate a new activity
-                const activity: NftActivity = (await generateSingleNftActivity(account, {
+                const activity: NftActivity = (await generateSingleNftActivity(wallet, {
                     action: ActivityAction.Mint,
                     processedTransaction,
                     wrappedOutput: output,
                 })) as NftActivity
-                addActivityToAccountActivitiesInAllAccountActivities(account.index, activity)
+                addActivityToWalletActivitiesInAllWalletActivities(wallet.id, activity)
 
                 // Store NFT metadata for each minted NFT
-                const nft = buildNftFromNftOutput(output, account.depositAddress, false)
-                addOrUpdateNftInAllAccountNfts(account.index, nft)
+                const nft = buildNftFromNftOutput(output, wallet.depositAddress, false)
+                addOrUpdateNftInAllAccountNfts(wallet.id, nft)
             }
         }
     } catch (err) {
         return Promise.reject(err)
     } finally {
-        updateSelectedAccount({ isTransferring: false })
+        updateSelectedWallet({ isTransferring: false })
     }
 }
diff --git a/packages/shared/lib/core/account/api/prepareOutput.ts b/packages/shared/lib/core/wallet/actions/prepareOutput.ts
similarity index 52%
rename from packages/shared/lib/core/account/api/prepareOutput.ts
rename to packages/shared/lib/core/wallet/actions/prepareOutput.ts
index 6c535d7c6d6..4bda095ecc4 100644
--- a/packages/shared/lib/core/account/api/prepareOutput.ts
+++ b/packages/shared/lib/core/wallet/actions/prepareOutput.ts
@@ -1,10 +1,11 @@
-import { getAccount } from '@core/profile-manager'
 import { Output, OutputParams, TransactionOptions } from '@iota/sdk/out/types'
+import { getWallet } from '@core/profile'
 
+// TODO(2.0) Fix all usages
 export async function prepareOutput(
-    accountIndex: number,
+    walletId: string,
     params: OutputParams,
     transactionOptions?: TransactionOptions
 ): Promise<Output> {
-    return (await getAccount(accountIndex))?.prepareOutput(params, transactionOptions) as Promise<Output>
+    return (await getWallet(walletId))?.prepareOutput(params, transactionOptions) as Promise<Output>
 }
diff --git a/packages/shared/lib/core/wallet/actions/rejectActivity.ts b/packages/shared/lib/core/wallet/actions/rejectActivity.ts
index a99d8731909..abb3295dee7 100644
--- a/packages/shared/lib/core/wallet/actions/rejectActivity.ts
+++ b/packages/shared/lib/core/wallet/actions/rejectActivity.ts
@@ -1,13 +1,12 @@
-import { selectedAccount } from '@core/account'
 import { get } from 'svelte/store'
-import { updateAsyncDataByActivityId } from '../stores'
+import { selectedWalletId, updateAsyncDataByActivityId } from '../stores'
 import { hiddenActivities } from '../stores/hidden-activities.store'
 import { localize } from '@core/i18n'
 import { showAppNotification } from '@auxiliary/notification'
 import { activeProfileId } from '@core/profile'
 
 export function rejectActivity(id: string): void {
-    const accountIndex = get(selectedAccount).index
+    const walletId = get(selectedWalletId)
     hiddenActivities.update((state) => {
         const profileId = get(activeProfileId)
         if (Array.isArray(state)) {
@@ -17,14 +16,14 @@ export function rejectActivity(id: string): void {
         if (!state[profileId]) {
             state[profileId] = {}
         }
-        if (!state[profileId][accountIndex]) {
-            state[profileId][accountIndex] = []
+        if (!state[profileId][walletId]) {
+            state[profileId][walletId] = []
         }
-        state[profileId][accountIndex].push(id)
+        state[profileId][walletId].push(id)
         return state
     })
 
-    updateAsyncDataByActivityId(accountIndex, id, { isRejected: true })
+    updateAsyncDataByActivityId(walletId, id, { isRejected: true })
     showAppNotification({
         type: 'success',
         alert: true,
diff --git a/packages/shared/lib/core/wallet/actions/resetSelectedWalletId.ts b/packages/shared/lib/core/wallet/actions/resetSelectedWalletId.ts
new file mode 100644
index 00000000000..3a04d6a0ada
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/resetSelectedWalletId.ts
@@ -0,0 +1,5 @@
+import { selectedWalletId } from "../stores/selected-wallet-id.store";
+
+export function resetSelectedWalletId(): void {
+    selectedWalletId.set(null)
+}
diff --git a/packages/shared/lib/core/profile-manager/api/restoreBackup.ts b/packages/shared/lib/core/wallet/actions/restoreBackup.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/api/restoreBackup.ts
rename to packages/shared/lib/core/wallet/actions/restoreBackup.ts
diff --git a/packages/shared/lib/core/wallet/actions/sendOutput.ts b/packages/shared/lib/core/wallet/actions/sendOutput.ts
index 003f2ea5472..7f873148f71 100644
--- a/packages/shared/lib/core/wallet/actions/sendOutput.ts
+++ b/packages/shared/lib/core/wallet/actions/sendOutput.ts
@@ -1,29 +1,27 @@
-import { get } from 'svelte/store'
-import { selectedAccount, updateSelectedAccount } from '@core/account'
 import { updateNftInAllAccountNfts } from '@core/nfts/actions'
-import { resetNewTokenTransactionDetails } from '../stores'
+import { getSelectedWallet, resetNewTokenTransactionDetails, updateSelectedWallet } from '../stores'
 import { getDefaultTransactionOptions, processAndAddToActivities } from '../utils'
 import { NftOutput, Output, OutputType } from '@iota/sdk/out/types'
 
 export async function sendOutput(output: Output): Promise<void> {
     try {
-        updateSelectedAccount({ isTransferring: true })
-        const account = get(selectedAccount)
-        if (!account) return
-        const transaction = await account.sendOutputs([output], getDefaultTransactionOptions())
+        updateSelectedWallet({ isTransferring: true })
+        const wallet = getSelectedWallet();
+        if (!wallet) return
+        const transaction = await wallet.sendOutputs([output], getDefaultTransactionOptions())
         // Reset transaction details state, since the transaction has been sent
         if (output.type === OutputType.Nft) {
             const nftId = (output as NftOutput).nftId
-            updateNftInAllAccountNfts(account.index, nftId, { isSpendable: false })
+            updateNftInAllAccountNfts(wallet.id, nftId, { isSpendable: false })
         }
 
         resetNewTokenTransactionDetails()
 
-        await processAndAddToActivities(transaction, account)
-        updateSelectedAccount({ isTransferring: false })
+        await processAndAddToActivities(transaction, wallet)
+        updateSelectedWallet({ isTransferring: false })
         return
     } catch (err) {
-        updateSelectedAccount({ isTransferring: false })
+        updateSelectedWallet({ isTransferring: false })
         throw err
     }
 }
diff --git a/packages/shared/lib/core/wallet/actions/setClientOptions.ts b/packages/shared/lib/core/wallet/actions/setClientOptions.ts
new file mode 100644
index 00000000000..c28e655fe86
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/setClientOptions.ts
@@ -0,0 +1,7 @@
+import { ClientOptions } from '@core/network'
+import { getSelectedWallet } from '../stores'
+
+export async function setClientOptions(clientOptions: Partial<ClientOptions>): Promise<void> {
+    const wallet = getSelectedWallet();
+    await wallet.setClientOptions(clientOptions)
+}
diff --git a/packages/shared/lib/core/wallet/actions/setNextSelectedWallet.ts b/packages/shared/lib/core/wallet/actions/setNextSelectedWallet.ts
new file mode 100644
index 00000000000..cebac0c5a24
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/setNextSelectedWallet.ts
@@ -0,0 +1,20 @@
+import { get } from 'svelte/store'
+import { nonHiddenActiveWallets } from '@core/profile/stores'
+import { selectedWallet } from '../stores/selected-wallet.store'
+import { setSelectedWallet } from './setSelectedWallet'
+
+// TODO(2.0) Fix all usages
+export function setNextSelectedWallet(): void {
+    const wallet = get(selectedWallet)
+    const otherWallets = get(nonHiddenActiveWallets)
+    if (otherWallets.length > 0) {
+        if (wallet?.hidden) {
+            const walletPosition = otherWallets.findIndex(w => w.id === wallet.id);
+            const nextSelectedWalletId =
+                otherWallets[walletPosition + 1]?.id ?? otherWallets[otherWallets?.length - 1]?.id
+            setSelectedWallet(nextSelectedWalletId)
+        }
+    } else {
+        throw new Error('No wallets to select from')
+    }
+}
diff --git a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
index 37cd3174514..9f017357560 100644
--- a/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
+++ b/packages/shared/lib/core/wallet/actions/setOutgoingAsyncActivitiesToClaimed.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { BasicOutput, OutputData } from '@iota/sdk/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils'
 import { get } from 'svelte/store'
@@ -6,7 +6,7 @@ import { ActivityAsyncStatus, ActivityDirection } from '../enums'
 import { allAccountActivities, updateAsyncDataByActivityId } from '../stores'
 import { getExpirationDateFromOutput } from '../utils'
 
-export async function setOutgoingAsyncActivitiesToClaimed(account: IAccountState): Promise<void> {
+export async function setOutgoingAsyncActivitiesToClaimed(account: IWalletState): Promise<void> {
     const accountActivities = get(allAccountActivities)[account.index]
 
     const activities = accountActivities.filter(
diff --git a/packages/shared/lib/core/wallet/actions/setSelectedWallet.ts b/packages/shared/lib/core/wallet/actions/setSelectedWallet.ts
new file mode 100644
index 00000000000..75558bf6a35
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/setSelectedWallet.ts
@@ -0,0 +1,22 @@
+import { get } from 'svelte/store'
+import { activeWallets, updateActiveProfile } from '@core/profile/stores'
+import { resetSendOptionIndex } from '@core/wallet/stores'
+
+import { clearFilters } from '@core/utils'
+import { resetNftDownloadQueue } from '@core/nfts'
+import { selectedWalletId } from '../stores/selected-wallet-id.store'
+
+// TODO(2.0) Fix all usages
+export function setSelectedWallet(walletId: string): void {
+    resetNftDownloadQueue(true)
+
+    const account = get(activeWallets)?.find((_account) => _account.id === walletId)
+    if (account) {
+        selectedWalletId.set(walletId)
+        updateActiveProfile({ lastUsedWalletId: walletId })
+        clearFilters()
+        resetSendOptionIndex()
+    } else {
+        throw new Error(`Wallet with ID ${walletId} cannot be found!`)
+    }
+}
diff --git a/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts b/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts
new file mode 100644
index 00000000000..97611fcec00
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/setStrongholdPassword.ts
@@ -0,0 +1,9 @@
+import { get } from 'svelte/store'
+import { selectedWallet } from '../stores/selected-wallet.store'
+
+export async function setStrongholdPassword(password: string): Promise<void> {
+    const wallet = get(selectedWallet)
+    // Otherwise error is thrown, if password is still present in memory
+    await wallet?.clearStrongholdPassword()
+    await wallet?.setStrongholdPassword(password)
+}
diff --git a/packages/shared/lib/core/wallet/actions/setStrongholdPasswordClearInterval.ts b/packages/shared/lib/core/wallet/actions/setStrongholdPasswordClearInterval.ts
new file mode 100644
index 00000000000..a6065010c0d
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/setStrongholdPasswordClearInterval.ts
@@ -0,0 +1,6 @@
+import { getSelectedWallet } from '../stores'
+
+export async function setStrongholdPasswordClearInterval(intervalInSeconds: number): Promise<void> {
+    const wallet = getSelectedWallet();
+    await wallet.setStrongholdPasswordClearInterval(intervalInSeconds * 1000)
+}
diff --git a/packages/shared/lib/core/wallet/actions/startBackgroundSync.ts b/packages/shared/lib/core/wallet/actions/startBackgroundSync.ts
new file mode 100644
index 00000000000..d036a069227
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/startBackgroundSync.ts
@@ -0,0 +1,7 @@
+import { SyncOptions } from '@iota/sdk/out/types'
+import { getSelectedWallet } from '../stores'
+
+export async function startBackgroundSync(options?: SyncOptions, interval?: number): Promise<void> {
+    const wallet = getSelectedWallet();
+    await wallet.startBackgroundSync(options, interval)
+}
diff --git a/packages/shared/lib/core/profile-manager/actions/subscribeToWalletApiEvents.ts b/packages/shared/lib/core/wallet/actions/subscribeToWalletApiEvents.ts
similarity index 51%
rename from packages/shared/lib/core/profile-manager/actions/subscribeToWalletApiEvents.ts
rename to packages/shared/lib/core/wallet/actions/subscribeToWalletApiEvents.ts
index 72a912ff955..976e8fd1f5a 100644
--- a/packages/shared/lib/core/profile-manager/actions/subscribeToWalletApiEvents.ts
+++ b/packages/shared/lib/core/wallet/actions/subscribeToWalletApiEvents.ts
@@ -1,13 +1,14 @@
-import { get } from 'svelte/store'
-
-import { IWalletApiEventSubscriptionConfiguration } from '../interfaces'
-import { profileManager as _profileManager } from '../stores'
+import { IWalletApiEventSubscriptionConfiguration } from '../interfaces';
+import { getSelectedWallet } from '../stores';
 
+// TODO(2.0): Fix all of usages of this
 export function subscribeToWalletApiEvents(configuration: IWalletApiEventSubscriptionConfiguration): void {
-    const { eventMap, profileManager } = configuration
-    const manager = profileManager ?? get(_profileManager)
+    const { eventMap, wallet } = configuration
+
+    const selectedWallet = wallet && getSelectedWallet();
+
     Object.entries(eventMap).forEach(([event, callback]) => {
         const eventId = Number(event)
-        void manager.listen([eventId], callback)
+        void selectedWallet?.listen([eventId], callback)
     })
 }
diff --git a/packages/shared/lib/core/wallet/actions/syncBalance.ts b/packages/shared/lib/core/wallet/actions/syncBalance.ts
new file mode 100644
index 00000000000..a2d59519f9b
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/syncBalance.ts
@@ -0,0 +1,15 @@
+import { getBalance } from './getBalance'
+import { get } from 'svelte/store'
+import { selectedWalletId } from '../stores/selected-wallet-id.store'
+import { updateSelectedWallet } from '../stores/selected-wallet.store'
+import { updateActiveWallet } from '@core/profile/stores'
+
+export async function syncBalance(walletId: string): Promise<void> {
+    const balances = await getBalance(walletId)
+    if (get(selectedWalletId) === walletId) {
+        updateSelectedWallet({ balances })
+    } else {
+        updateActiveWallet(walletId, { balances })
+    }
+    return
+}
diff --git a/packages/shared/lib/core/wallet/actions/syncVotingPower.ts b/packages/shared/lib/core/wallet/actions/syncVotingPower.ts
new file mode 100644
index 00000000000..01e1c9cf341
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/syncVotingPower.ts
@@ -0,0 +1,15 @@
+import { get } from 'svelte/store'
+import { updateActiveWallet } from '@core/profile/stores'
+import { selectedWalletId } from '../stores'
+import { updateSelectedWallet } from '../stores/selected-wallet.store'
+import { getVotingPower } from './getVotingPower'
+
+export async function syncVotingPower(walletId = get(selectedWalletId)): Promise<void> {
+    const votingPower = await getVotingPower(walletId)
+    if (get(selectedWalletId) === walletId) {
+        updateSelectedWallet({ votingPower })
+    } else {
+        updateActiveWallet(walletId, { votingPower })
+    }
+    return
+}
diff --git a/packages/shared/lib/core/account/actions/tryCreateAdditionalAccount.ts b/packages/shared/lib/core/wallet/actions/tryCreateAdditionalWallet.ts
similarity index 66%
rename from packages/shared/lib/core/account/actions/tryCreateAdditionalAccount.ts
rename to packages/shared/lib/core/wallet/actions/tryCreateAdditionalWallet.ts
index 191f50279e9..0b6a9aee59a 100644
--- a/packages/shared/lib/core/account/actions/tryCreateAdditionalAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/tryCreateAdditionalWallet.ts
@@ -6,22 +6,23 @@ import { Platform } from '@core/app/classes'
 import { localize } from '@core/i18n'
 import { displayNotificationForLedgerProfile } from '@core/ledger/actions'
 import { isActiveLedgerProfile } from '@core/profile/stores'
+import { createNewWallet } from './createNewWallet'
+import { setSelectedWallet } from './setSelectedWallet'
+import { IError } from '@core/error/interfaces'
 
-import { createNewAccount } from './createNewAccount'
-import { setSelectedAccount } from './setSelectedAccount'
-
-export async function tryCreateAdditionalAccount(alias: string, color: string): Promise<void> {
+// TODO(2.0) Fix all usages
+export async function tryCreateAdditionalWallet(alias: string, color: string): Promise<void> {
     try {
-        const account = await createNewAccount(alias, color)
-        setSelectedAccount(account?.index)
+        const wallet = await createNewWallet(alias, color)
+        setSelectedWallet(wallet.id)
 
         if (Platform.isFeatureFlagEnabled('governance')) {
-            void registerProposalsFromNodes([account])
+            void registerProposalsFromNodes([wallet])
         }
 
         return Promise.resolve()
     } catch (err) {
-        const errorMessage = err?.error || err
+        const errorMessage = (err as IError)?.error || err as string
         if (err) {
             console.error(errorMessage)
             if (get(isActiveLedgerProfile)) {
diff --git a/packages/shared/lib/core/wallet/actions/unsubscribeFromWalletApiEvents.ts b/packages/shared/lib/core/wallet/actions/unsubscribeFromWalletApiEvents.ts
new file mode 100644
index 00000000000..7a40e93a032
--- /dev/null
+++ b/packages/shared/lib/core/wallet/actions/unsubscribeFromWalletApiEvents.ts
@@ -0,0 +1,6 @@
+import { getSelectedWallet } from '../stores'
+
+export async function unsubscribeFromWalletApiEvents(): Promise<void> {
+    const wallet = getSelectedWallet();
+    await wallet?.clearListeners([])
+}
diff --git a/packages/shared/lib/core/account/constants/default-sync-options.constant.ts b/packages/shared/lib/core/wallet/constants/default-sync-options.constant.ts
similarity index 63%
rename from packages/shared/lib/core/account/constants/default-sync-options.constant.ts
rename to packages/shared/lib/core/wallet/constants/default-sync-options.constant.ts
index f96cba73d38..716736ad37d 100644
--- a/packages/shared/lib/core/account/constants/default-sync-options.constant.ts
+++ b/packages/shared/lib/core/wallet/constants/default-sync-options.constant.ts
@@ -3,17 +3,11 @@ import type { SyncOptions } from '@iota/sdk/out/types'
 export const DEFAULT_SYNC_OPTIONS: SyncOptions = {
     account: {
         basicOutputs: true,
-        aliasOutputs: true,
+        accountOutputs: true,
         nftOutputs: true,
     },
-    alias: {
-        aliasOutputs: false,
-        basicOutputs: false,
-        nftOutputs: false,
-        foundryOutputs: true,
-    },
     nft: {
-        aliasOutputs: false,
+        accountOutputs: false,
         basicOutputs: false,
         nftOutputs: false,
     },
diff --git a/packages/shared/lib/core/wallet/constants/index.ts b/packages/shared/lib/core/wallet/constants/index.ts
index 62a8f42449e..213785bb629 100644
--- a/packages/shared/lib/core/wallet/constants/index.ts
+++ b/packages/shared/lib/core/wallet/constants/index.ts
@@ -11,3 +11,5 @@ export * from './max-supported-decimals.constants'
 export * from './max-supported-erc20-decimals.constant'
 export * from './official-token-ids.constant'
 export * from './reserved-tag-keywords.constant'
+export * from './max-wallet-name-length.constant'
+export * from './default-sync-options.constant'
\ No newline at end of file
diff --git a/packages/shared/lib/core/wallet/constants/max-wallet-name-length.constant.ts b/packages/shared/lib/core/wallet/constants/max-wallet-name-length.constant.ts
new file mode 100644
index 00000000000..91f13781ff0
--- /dev/null
+++ b/packages/shared/lib/core/wallet/constants/max-wallet-name-length.constant.ts
@@ -0,0 +1 @@
+export const MAX_WALLET_NAME_LENGTH = 20
diff --git a/packages/shared/lib/core/wallet/enums/index.ts b/packages/shared/lib/core/wallet/enums/index.ts
index 81b1edee951..ed68b74d096 100644
--- a/packages/shared/lib/core/wallet/enums/index.ts
+++ b/packages/shared/lib/core/wallet/enums/index.ts
@@ -12,3 +12,5 @@ export * from './return-strategy.enum'
 export * from './inclusion-state.enum'
 export * from './irc27-version.enum'
 export * from './subject.enum'
+export * from './wallet-colors.enum'
+export * from './search-algorithm.enum'
\ No newline at end of file
diff --git a/packages/shared/lib/core/account/enums/search-algorithm.enum.ts b/packages/shared/lib/core/wallet/enums/search-algorithm.enum.ts
similarity index 100%
rename from packages/shared/lib/core/account/enums/search-algorithm.enum.ts
rename to packages/shared/lib/core/wallet/enums/search-algorithm.enum.ts
diff --git a/packages/shared/lib/core/wallet/enums/subject.enum.ts b/packages/shared/lib/core/wallet/enums/subject.enum.ts
index 8ad4da2c8d4..f664f25e6fd 100644
--- a/packages/shared/lib/core/wallet/enums/subject.enum.ts
+++ b/packages/shared/lib/core/wallet/enums/subject.enum.ts
@@ -1,4 +1,4 @@
 export enum SubjectType {
-    Account = 'account',
+    Account = 'account', // TODO(2.0) This should be Wallet?
     Address = 'address',
 }
diff --git a/packages/shared/lib/core/account/enums/account-colors.enum.ts b/packages/shared/lib/core/wallet/enums/wallet-colors.enum.ts
similarity index 95%
rename from packages/shared/lib/core/account/enums/account-colors.enum.ts
rename to packages/shared/lib/core/wallet/enums/wallet-colors.enum.ts
index 30ded4a2889..09702c9d6e9 100644
--- a/packages/shared/lib/core/account/enums/account-colors.enum.ts
+++ b/packages/shared/lib/core/wallet/enums/wallet-colors.enum.ts
@@ -3,7 +3,7 @@ import resolveConfig from 'tailwindcss/resolveConfig'
 
 const configColors = resolveConfig(tailwindConfig).theme.colors
 
-export enum AccountColors {
+export enum WalletColors {
     Blue = configColors['blue']['500'],
     LightBlue = configColors['lightblue']['500'],
     Purple = configColors['purple']['500'],
diff --git a/packages/shared/lib/core/wallet/errors/cannot-remove-wallet.error.ts b/packages/shared/lib/core/wallet/errors/cannot-remove-wallet.error.ts
new file mode 100644
index 00000000000..fb4336850ff
--- /dev/null
+++ b/packages/shared/lib/core/wallet/errors/cannot-remove-wallet.error.ts
@@ -0,0 +1,8 @@
+import { BaseError } from '@core/error'
+import { localize } from '@core/i18n'
+
+export class CannotRemoveWalletError extends BaseError {
+    constructor() {
+        super({ message: localize('error.wallet.cannotRemove'), showNotification: true })
+    }
+}
diff --git a/packages/shared/lib/core/wallet/errors/index.ts b/packages/shared/lib/core/wallet/errors/index.ts
index 81af82f03bd..3fff6d8d2b8 100644
--- a/packages/shared/lib/core/wallet/errors/index.ts
+++ b/packages/shared/lib/core/wallet/errors/index.ts
@@ -1 +1,7 @@
 export * from './missing-transaction-id.error'
+export * from './cannot-remove-wallet.error'
+export * from './missing-transaction-progress-event-payload.error'
+export * from './remove-not-last-wallet.error'
+export * from './wallet-api-event.error'
+export * from './wallet-api-event-validation.error'
+export * from './unable-to-get-bound-wallet.error'
diff --git a/packages/shared/lib/core/profile-manager/errors/missing-transaction-progress-event-payload.error.ts b/packages/shared/lib/core/wallet/errors/missing-transaction-progress-event-payload.error.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/errors/missing-transaction-progress-event-payload.error.ts
rename to packages/shared/lib/core/wallet/errors/missing-transaction-progress-event-payload.error.ts
diff --git a/packages/shared/lib/core/wallet/errors/remove-not-last-wallet.error.ts b/packages/shared/lib/core/wallet/errors/remove-not-last-wallet.error.ts
new file mode 100644
index 00000000000..f1cdb99edc6
--- /dev/null
+++ b/packages/shared/lib/core/wallet/errors/remove-not-last-wallet.error.ts
@@ -0,0 +1,8 @@
+import { BaseError } from '@core/error'
+import { localize } from '@core/i18n'
+
+export class RemoveNotLastWalletError extends BaseError {
+    constructor() {
+        super({ message: localize('error.wallet.notLast'), logToConsole: true })
+    }
+}
diff --git a/packages/shared/lib/core/account/errors/unable-to-get-bound-account.error.ts b/packages/shared/lib/core/wallet/errors/unable-to-get-bound-wallet.error.ts
similarity index 58%
rename from packages/shared/lib/core/account/errors/unable-to-get-bound-account.error.ts
rename to packages/shared/lib/core/wallet/errors/unable-to-get-bound-wallet.error.ts
index e1cefd3b88b..ab273753b35 100644
--- a/packages/shared/lib/core/account/errors/unable-to-get-bound-account.error.ts
+++ b/packages/shared/lib/core/wallet/errors/unable-to-get-bound-wallet.error.ts
@@ -1,9 +1,9 @@
 import { BaseError, DEFAULT_APP_ERROR_PARAMETERS } from '@core/error'
 
-export class UnableToGetBoundAccountError extends BaseError {
+export class UnableToGetBoundWalletError extends BaseError {
     constructor() {
         super({
-            message: 'error.account.cannotGetBoundAccount',
+            message: 'error.wallet.cannotGetBoundAccount',
             ...DEFAULT_APP_ERROR_PARAMETERS,
         })
     }
diff --git a/packages/shared/lib/core/profile-manager/errors/wallet-api-event-validation.error.ts b/packages/shared/lib/core/wallet/errors/wallet-api-event-validation.error.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/errors/wallet-api-event-validation.error.ts
rename to packages/shared/lib/core/wallet/errors/wallet-api-event-validation.error.ts
diff --git a/packages/shared/lib/core/profile-manager/errors/wallet-api-event.error.ts b/packages/shared/lib/core/wallet/errors/wallet-api-event.error.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/errors/wallet-api-event.error.ts
rename to packages/shared/lib/core/wallet/errors/wallet-api-event.error.ts
diff --git a/packages/shared/lib/core/account/interfaces/address-with-outputs.interface.ts b/packages/shared/lib/core/wallet/interfaces/address-with-outputs.interface.ts
similarity index 100%
rename from packages/shared/lib/core/account/interfaces/address-with-outputs.interface.ts
rename to packages/shared/lib/core/wallet/interfaces/address-with-outputs.interface.ts
diff --git a/packages/shared/lib/core/wallet/interfaces/hidden-activities.interface.ts b/packages/shared/lib/core/wallet/interfaces/hidden-activities.interface.ts
index 3be262dbc3e..962785182f3 100644
--- a/packages/shared/lib/core/wallet/interfaces/hidden-activities.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/hidden-activities.interface.ts
@@ -1,5 +1,5 @@
 export interface IHiddenActivities {
     [profileId: string]: {
-        [accountIndex: string]: string[]
+        [walletId: string]: string[]
     }
 }
diff --git a/packages/shared/lib/core/wallet/interfaces/index.ts b/packages/shared/lib/core/wallet/interfaces/index.ts
index 6e91f5c2042..772e40458d7 100644
--- a/packages/shared/lib/core/wallet/interfaces/index.ts
+++ b/packages/shared/lib/core/wallet/interfaces/index.ts
@@ -1,5 +1,5 @@
-export * from './account-assets.interface'
-export * from './account-subject.interface'
+export * from './wallet-assets.interface'
+export * from './wallet-subject.interface'
 export * from './activity-filter.interface'
 export * from './activity-generation-parameters.interface'
 export * from './address-subject.interface'
@@ -17,3 +17,9 @@ export * from './persisted-asset.interface'
 export * from './persisted-assets.interface'
 export * from './processed-transaction.interface'
 export * from './wrapped-output.interface'
+export * from './wallet-api-event-payload-wrapper.interface'
+export * from './wallet-api-event-subscription-configuration.interface'
+export * from './wallet-state.interface'
+export * from './address-with-outputs.interface'
+export * from './persisted-wallet-data.interface'
+export * from './address-with-outputs.interface'
diff --git a/packages/shared/lib/core/wallet/interfaces/persisted-wallet-data.interface.ts b/packages/shared/lib/core/wallet/interfaces/persisted-wallet-data.interface.ts
new file mode 100644
index 00000000000..f69b2b5ecb3
--- /dev/null
+++ b/packages/shared/lib/core/wallet/interfaces/persisted-wallet-data.interface.ts
@@ -0,0 +1,10 @@
+import { ParticipationEventId, WalletOptions } from '@iota/sdk/out/types'
+
+export interface IPersistedWalletData {
+    name: string
+    color: string
+    hidden: boolean
+    shouldRevote: boolean
+    removedProposalIds?: ParticipationEventId[]
+    walletOptions: WalletOptions
+}
diff --git a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-api-event-payload-wrapper.interface.ts
similarity index 95%
rename from packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
rename to packages/shared/lib/core/wallet/interfaces/wallet-api-event-payload-wrapper.interface.ts
index feedab8d0db..fa52cab8478 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-payload-wrapper.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-api-event-payload-wrapper.interface.ts
@@ -8,7 +8,7 @@ import {
 } from '@iota/sdk/out/types'
 
 export interface IWalletApiEventPayloadWrapper {
-    accountIndex: number
+    walletId: string
     payload: IWalletApiEventPayload
 }
 
diff --git a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-subscription-configuration.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-api-event-subscription-configuration.interface.ts
similarity index 58%
rename from packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-subscription-configuration.interface.ts
rename to packages/shared/lib/core/wallet/interfaces/wallet-api-event-subscription-configuration.interface.ts
index e3a0ddc4fe4..c2607dc5a3f 100644
--- a/packages/shared/lib/core/profile-manager/interfaces/wallet-api-event-subscription-configuration.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-api-event-subscription-configuration.interface.ts
@@ -1,8 +1,7 @@
+import { IWallet } from '@core/profile'
 import { WalletApiEventMap } from '../types'
 
-import { IProfileManager } from './profile-manager.interface'
-
 export interface IWalletApiEventSubscriptionConfiguration {
     eventMap: WalletApiEventMap
-    profileManager?: IProfileManager
+    wallet: IWallet
 }
diff --git a/packages/shared/lib/core/wallet/interfaces/account-assets.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-assets.interface.ts
similarity index 55%
rename from packages/shared/lib/core/wallet/interfaces/account-assets.interface.ts
rename to packages/shared/lib/core/wallet/interfaces/wallet-assets.interface.ts
index fb843850ee5..cbb21612ef3 100644
--- a/packages/shared/lib/core/wallet/interfaces/account-assets.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-assets.interface.ts
@@ -1,11 +1,11 @@
 import { IAsset } from './asset.interface'
 
-export type AccountAssets = {
+export type WalletAssets = {
     // [networkId: string] | [chainId: number]
-    [id: number | string]: IAccountAssetsPerNetwork
+    [id: number | string]: IWalletAssetsPerNetwork
 }
 
-export interface IAccountAssetsPerNetwork {
+export interface IWalletAssetsPerNetwork {
     baseCoin: IAsset | undefined
     nativeTokens: IAsset[]
 }
diff --git a/packages/shared/lib/core/account/interfaces/account-state.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts
similarity index 55%
rename from packages/shared/lib/core/account/interfaces/account-state.interface.ts
rename to packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts
index 9cd630a4cf4..72d5f977636 100644
--- a/packages/shared/lib/core/account/interfaces/account-state.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-state.interface.ts
@@ -1,9 +1,10 @@
 import { Balance } from '@iota/sdk/out/types'
-import { AddressWithOutputs, IAccount } from './'
-import { IPersistedAccountData } from './persisted-account-data.interface'
+import { IWallet } from '@core/profile/interfaces'
+import { AddressWithOutputs } from './address-with-outputs.interface'
+import { IPersistedWalletData } from './persisted-wallet-data.interface'
 
-export interface IAccountState extends IAccount, IPersistedAccountData {
-    index: number
+export interface IWalletState extends IWallet, IPersistedWalletData {
+    id: string
     depositAddress: string
     balances: Balance
     isTransferring: boolean
diff --git a/packages/shared/lib/core/wallet/interfaces/account-subject.interface.ts b/packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts
similarity index 56%
rename from packages/shared/lib/core/wallet/interfaces/account-subject.interface.ts
rename to packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts
index f31d53bf0bb..3a5a64f0e1a 100644
--- a/packages/shared/lib/core/wallet/interfaces/account-subject.interface.ts
+++ b/packages/shared/lib/core/wallet/interfaces/wallet-subject.interface.ts
@@ -1,7 +1,7 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { SubjectType } from '../enums'
 
 export interface IAccountSubject {
     type: SubjectType.Account
-    account: IAccountState
+    account: IWalletState
 }
diff --git a/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts b/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts
deleted file mode 100644
index 0a520e63589..00000000000
--- a/packages/shared/lib/core/wallet/stores/all-account-activities.store.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { get, writable } from 'svelte/store'
-import { Activity, AsyncData, BaseActivity } from '../types'
-
-export const allAccountActivities = writable<Activity[][]>([])
-
-export function addEmptyAccountActivitiesToAllAccountActivities(accountIndex: number): void {
-    setAccountActivitiesInAllAccountActivities(accountIndex, [])
-}
-
-export function addActivityToAccountActivitiesInAllAccountActivities(accountIndex: number, activity: Activity): void {
-    allAccountActivities.update((state) => {
-        if (!state[accountIndex]) {
-            state[accountIndex] = []
-        }
-        state[accountIndex].push(activity)
-        return state
-    })
-}
-
-export function addActivitiesToAccountActivitiesInAllAccountActivities(
-    accountIndex: number,
-    activities: Activity[]
-): void {
-    allAccountActivities.update((state) => {
-        if (!state[accountIndex]) {
-            state[accountIndex] = []
-        }
-        state[accountIndex].push(...activities)
-        return state
-    })
-}
-
-export function setAccountActivitiesInAllAccountActivities(accountIndex: number, accountActivities: Activity[]): void {
-    allAccountActivities.update((state) => {
-        state[accountIndex] = accountActivities
-        return state
-    })
-}
-
-export function getActivityByTransactionId(accountIndex: number, transactionId: string): Activity | undefined {
-    return get(allAccountActivities)?.[accountIndex]?.find((_activity) => _activity?.transactionId === transactionId)
-}
-
-export function updateActivityByTransactionId(
-    accountIndex: number,
-    transactionId: string,
-    partialBaseActivity: Partial<BaseActivity>
-): void {
-    allAccountActivities.update((state) => {
-        const activities = state[accountIndex]?.filter((_activity) => _activity?.transactionId === transactionId)
-
-        activities.forEach((activity) => Object.assign(activity, partialBaseActivity))
-        return state
-    })
-}
-
-export function updateActivityByActivityId(
-    accountIndex: number,
-    activityId: string,
-    partialBaseActivity: Partial<BaseActivity>
-): void {
-    allAccountActivities.update((state) => {
-        const activity = state[accountIndex]?.find((_activity) => _activity.id === activityId)
-
-        if (activity) {
-            Object.assign(activity, partialBaseActivity)
-        }
-        return state
-    })
-}
-
-export function updateAsyncDataByActivityId(
-    accountIndex: number,
-    activityId: string,
-    partialAsyncData: Partial<AsyncData>
-): void {
-    allAccountActivities.update((state) => {
-        const activity = state[accountIndex]?.find((_activity) => _activity.id === activityId)
-
-        if (activity) {
-            Object.assign(activity, { asyncData: { ...activity.asyncData, ...partialAsyncData } })
-        }
-        return state
-    })
-}
-
-export function updateAsyncDataByTransactionId(
-    accountIndex: number,
-    transactionId: string,
-    partialAsyncData: Partial<AsyncData>
-): void {
-    allAccountActivities.update((state) => {
-        const activity = state[accountIndex]?.find((_activity) => _activity?.transactionId === transactionId)
-
-        if (activity) {
-            Object.assign(activity, { asyncData: { ...activity.asyncData, ...partialAsyncData } })
-        }
-        return state
-    })
-}
diff --git a/packages/shared/lib/core/wallet/stores/all-wallet-activities.store.ts b/packages/shared/lib/core/wallet/stores/all-wallet-activities.store.ts
new file mode 100644
index 00000000000..5baae854bd8
--- /dev/null
+++ b/packages/shared/lib/core/wallet/stores/all-wallet-activities.store.ts
@@ -0,0 +1,102 @@
+import { get, writable } from 'svelte/store'
+import { Activity, AsyncData, BaseActivity } from '../types'
+
+// TODO(2.0) Rename file
+
+export const allWalletActivities = writable<Record<string, Activity[]>>({})
+
+export function addEmptyWalletActivitiesToAllWalletActivities(walletId: string): void {
+    setWalletActivitiesInAllWalletActivities(walletId, [])
+}
+
+export function addActivityToWalletActivitiesInAllWalletActivities(walletId: string, activity: Activity): void {
+    allWalletActivities.update((state) => {
+        if (!state[walletId]) {
+            state[walletId] = []
+        }
+        state[walletId].push(activity)
+        return state
+    })
+}
+
+export function addActivitiesToWalletActivitiesInAllWalletActivities(
+    walletId: string,
+    activities: Activity[]
+): void {
+    allWalletActivities.update((state) => {
+        if (!state[walletId]) {
+            state[walletId] = []
+        }
+        state[walletId].push(...activities)
+        return state
+    })
+}
+
+export function setWalletActivitiesInAllWalletActivities(walletId: string, walletActivities: Activity[]): void {
+    allWalletActivities.update((state) => {
+        state[walletId] = walletActivities
+        return state
+    })
+}
+
+export function getActivityByTransactionId(walletId: string, transactionId: string): Activity | undefined {
+    return get(allWalletActivities)?.[walletId]?.find((_activity) => _activity?.transactionId === transactionId)
+}
+
+export function updateActivityByTransactionId(
+    walletId: string,
+    transactionId: string,
+    partialBaseActivity: Partial<BaseActivity>
+): void {
+    allWalletActivities.update((state) => {
+        const activities = state[walletId]?.filter((_activity) => _activity?.transactionId === transactionId)
+
+        activities.forEach((activity) => Object.assign(activity, partialBaseActivity))
+        return state
+    })
+}
+
+export function updateActivityByActivityId(
+    walletId: string,
+    activityId: string,
+    partialBaseActivity: Partial<BaseActivity>
+): void {
+    allWalletActivities.update((state) => {
+        const activity = state[walletId]?.find((_activity) => _activity.id === activityId)
+
+        if (activity) {
+            Object.assign(activity, partialBaseActivity)
+        }
+        return state
+    })
+}
+
+export function updateAsyncDataByActivityId(
+    walletId: string,
+    activityId: string,
+    partialAsyncData: Partial<AsyncData>
+): void {
+    allWalletActivities.update((state) => {
+        const activity = state[walletId]?.find((_activity) => _activity.id === activityId)
+
+        if (activity) {
+            Object.assign(activity, { asyncData: { ...activity.asyncData, ...partialAsyncData } })
+        }
+        return state
+    })
+}
+
+export function updateAsyncDataByTransactionId(
+    walletId: string,
+    transactionId: string,
+    partialAsyncData: Partial<AsyncData>
+): void {
+    allWalletActivities.update((state) => {
+        const activity = state[walletId]?.find((_activity) => _activity?.transactionId === transactionId)
+
+        if (activity) {
+            Object.assign(activity, { asyncData: { ...activity.asyncData, ...partialAsyncData } })
+        }
+        return state
+    })
+}
diff --git a/packages/shared/lib/core/wallet/stores/claimed-activities.store.ts b/packages/shared/lib/core/wallet/stores/claimed-activities.store.ts
index 472e8a24e4e..42a8427424c 100644
--- a/packages/shared/lib/core/wallet/stores/claimed-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/claimed-activities.store.ts
@@ -8,7 +8,7 @@ import { IClaimedActivities, IClaimedActivitiesPerProfile } from '../interfaces'
 export const claimedActivities = persistent<IClaimedActivitiesPerProfile>('claimedActivities', {})
 
 export function addClaimedActivity(
-    accountIndex: number,
+    walletId: string,
     transactionId: string,
     claimedActivity: IClaimedActivities
 ): void {
@@ -21,10 +21,10 @@ export function addClaimedActivity(
         if (!state[profileId]) {
             state[profileId] = {}
         }
-        if (!state[profileId][accountIndex]) {
-            state[profileId][accountIndex] = {}
+        if (!state[profileId][walletId]) {
+            state[profileId][walletId] = {}
         }
-        state[profileId][accountIndex][transactionId] = claimedActivity
+        state[profileId][walletId][transactionId] = claimedActivity
         return state
     })
 }
diff --git a/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts b/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts
index 42a5344da68..baf33d3efa1 100644
--- a/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/hidden-activities.store.ts
@@ -7,16 +7,16 @@ import type { IHiddenActivities } from '../interfaces'
 
 export const hiddenActivities = persistent<IHiddenActivities>('hiddenActivities', {})
 
-export function isActivityHiddenForAccountIndex(accountIndex: number, activityId: string): boolean {
-    const activities = get(hiddenActivities)?.[get(activeProfileId)]?.[accountIndex]
+export function isActivityHiddenForWalletId(walletId: string, activityId: string): boolean {
+    const activities = get(hiddenActivities)?.[get(activeProfileId)]?.[walletId]
     return activities ? activities.includes(activityId) : false
 }
 
-export function removeActivityFromHiddenActivities(accountIndex: number, activityId: string): void {
-    const activities = get(hiddenActivities)?.[get(activeProfileId)]?.[accountIndex]
+export function removeActivityFromHiddenActivities(walletId: number, activityId: string): void {
+    const activities = get(hiddenActivities)?.[get(activeProfileId)]?.[walletId]
     if (activities) {
         hiddenActivities.update((state) => {
-            state[get(activeProfileId)][accountIndex] = activities.filter((id) => id !== activityId)
+            state[get(activeProfileId)][walletId] = activities.filter((id) => id !== activityId)
             return state
         })
     }
diff --git a/packages/shared/lib/core/wallet/stores/index.ts b/packages/shared/lib/core/wallet/stores/index.ts
index d3a3364bb83..2492164d682 100644
--- a/packages/shared/lib/core/wallet/stores/index.ts
+++ b/packages/shared/lib/core/wallet/stores/index.ts
@@ -1,10 +1,12 @@
-export * from './all-account-activities.store'
+export * from './all-wallet-activities.store'
 export * from './claimed-activities.store'
 export * from './hidden-activities.store'
 export * from './mint-nft-details.store'
 export * from './mint-token-details.store'
 export * from './new-transaction-details.store'
 export * from './persisted-assets.store'
-export * from './selected-account-activities.store'
-export * from './selected-account-assets.store'
+export * from './selected-wallet-activities.store'
+export * from './selected-wallet-assets.store'
 export * from './selected-send-option.store'
+export * from './selected-wallet-id.store'
+export * from './selected-wallet.store'
\ No newline at end of file
diff --git a/packages/shared/lib/core/wallet/stores/selected-account-assets.store.ts b/packages/shared/lib/core/wallet/stores/selected-account-assets.store.ts
deleted file mode 100644
index 96b60885ccb..00000000000
--- a/packages/shared/lib/core/wallet/stores/selected-account-assets.store.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { selectedAccount } from '@core/account/stores/selected-account.store'
-import { marketCoinPrices } from '@core/market'
-import { activeProfileId } from '@core/profile'
-import { derived, get, Readable, writable, Writable } from 'svelte/store'
-import { getAccountAssetsForSelectedAccount } from '../actions/getAccountAssetsForSelectedAccount'
-import { DEFAULT_ASSET_FILTER } from '../constants'
-import { AssetFilter, IAsset } from '../interfaces'
-import { AccountAssets } from '../interfaces/account-assets.interface'
-import { persistedAssets } from './persisted-assets.store'
-
-export const assetFilter: Writable<AssetFilter> = writable(DEFAULT_ASSET_FILTER)
-
-export const selectedAccountAssets: Readable<AccountAssets> = derived(
-    [activeProfileId, marketCoinPrices, selectedAccount, persistedAssets, assetFilter],
-    ([$activeProfileId, $marketCoinPrices]) => {
-        if ($activeProfileId) {
-            return getAccountAssetsForSelectedAccount($marketCoinPrices)
-        } else {
-            return {}
-        }
-    }
-)
-
-export const visibleSelectedAccountAssets: Readable<AccountAssets> = derived(
-    [selectedAccountAssets],
-    ([$selectedAccountAssets]) => {
-        const visibleAssets: AccountAssets = {}
-        for (const networkId of Object.keys($selectedAccountAssets)) {
-            const visible = {
-                baseCoin: $selectedAccountAssets[networkId].baseCoin,
-                nativeTokens: $selectedAccountAssets[networkId].nativeTokens.filter((asset) => !asset.hidden),
-            }
-            visibleAssets[networkId] = visible
-        }
-        return visibleAssets
-    }
-)
-
-export function getAssetById(assetId: string, networkId: string | number): IAsset | undefined {
-    const assets = get(selectedAccountAssets)[networkId]
-    const { baseCoin, nativeTokens } = assets ?? {}
-    if (assetId === baseCoin?.id) {
-        return baseCoin
-    } else {
-        return nativeTokens?.find((token) => token.id === assetId)
-    }
-}
diff --git a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts b/packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts
similarity index 84%
rename from packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
rename to packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts
index 9eaa72bfc58..117c125e025 100644
--- a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/selected-wallet-activities.store.ts
@@ -1,20 +1,20 @@
 import { derived, Readable, writable, Writable } from 'svelte/store'
 import { isValidIrc30Token } from '@core/token'
 
-import { selectedAccount } from '../../account/stores/selected-account.store'
+import { selectedWalletId } from './selected-wallet-id.store'
 import { Activity } from '../types/activity.type'
 import { ActivityType, SubjectType } from '../enums'
 import { ActivityFilter } from '../interfaces/activity-filter.interface'
 import { getAssetFromPersistedAssets, getFormattedAmountFromActivity } from '../utils'
 import { isVisibleActivity } from '../utils/isVisibleActivity'
-import { allAccountActivities } from './all-account-activities.store'
+import { allWalletActivities } from './all-wallet-activities.store'
 import { DEFAULT_ACTIVITY_FILTER } from '../constants'
 
-export const selectedAccountActivities: Readable<Activity[]> = derived(
-    [selectedAccount, allAccountActivities],
-    ([$selectedAccount, $allAccountActivities]) => {
-        if ($selectedAccount) {
-            return $allAccountActivities[$selectedAccount?.index] ?? []
+export const selectedWalletActivities: Readable<Activity[]> = derived(
+    [selectedWalletId, allWalletActivities],
+    ([$selectedWallet, $allWalletActivities]) => {
+        if ($selectedWallet) {
+            return $allWalletActivities[$selectedWallet] ?? []
         } else {
             return []
         }
@@ -26,9 +26,9 @@ export const activityFilter: Writable<ActivityFilter> = writable(DEFAULT_ACTIVIT
 export const activitySearchTerm: Writable<string> = writable('')
 
 export const queriedActivities: Readable<Activity[]> = derived(
-    [selectedAccountActivities, activitySearchTerm, activityFilter],
-    ([$selectedAccountActivities, $activitySearchTerm]) => {
-        let activityList = $selectedAccountActivities.filter((_activity) => {
+    [selectedWalletActivities, activitySearchTerm, activityFilter],
+    ([$selectedWalletActivities, $activitySearchTerm]) => {
+        let activityList = $selectedWalletActivities.filter((_activity) => {
             const containsAssets = _activity.type === ActivityType.Basic || _activity.type === ActivityType.Foundry
             if (!_activity.isHidden && !containsAssets) {
                 return true
diff --git a/packages/shared/lib/core/wallet/stores/selected-wallet-assets.store.ts b/packages/shared/lib/core/wallet/stores/selected-wallet-assets.store.ts
new file mode 100644
index 00000000000..d6622bc3dda
--- /dev/null
+++ b/packages/shared/lib/core/wallet/stores/selected-wallet-assets.store.ts
@@ -0,0 +1,47 @@
+import { marketCoinPrices } from '@core/market'
+import { activeProfileId } from '@core/profile/stores/active-profile-id.store'
+import { derived, get, Readable, writable, Writable } from 'svelte/store'
+import { DEFAULT_ASSET_FILTER } from '../constants'
+import { AssetFilter, IAsset } from '../interfaces'
+import { WalletAssets } from '../interfaces/wallet-assets.interface'
+import { persistedAssets } from './persisted-assets.store'
+import { selectedWallet } from './selected-wallet.store'
+import { getWalletAssetsForSelectedWallet } from '../actions'
+
+export const assetFilter: Writable<AssetFilter> = writable(DEFAULT_ASSET_FILTER)
+
+export const selectedWalletAssets: Readable<WalletAssets> = derived(
+    [activeProfileId, marketCoinPrices, selectedWallet, persistedAssets, assetFilter],
+    ([$activeProfileId, $marketCoinPrices]) => {
+        if ($activeProfileId) {
+            return getWalletAssetsForSelectedWallet($marketCoinPrices)
+        } else {
+            return {}
+        }
+    }
+)
+
+export const visibleSelectedWalletAssets: Readable<WalletAssets> = derived(
+    [selectedWalletAssets],
+    ([$selectedWalletAssets]) => {
+        const visibleAssets: WalletAssets = {}
+        for (const networkId of Object.keys($selectedWalletAssets)) {
+            const visible = {
+                baseCoin: $selectedWalletAssets[networkId].baseCoin,
+                nativeTokens: $selectedWalletAssets[networkId].nativeTokens.filter((asset) => !asset.hidden),
+            }
+            visibleAssets[networkId] = visible
+        }
+        return visibleAssets
+    }
+)
+
+export function getAssetById(assetId: string, networkId: string | number): IAsset | undefined {
+    const assets = get(selectedWalletAssets)[networkId]
+    const { baseCoin, nativeTokens } = assets ?? {}
+    if (assetId === baseCoin?.id) {
+        return baseCoin
+    } else {
+        return nativeTokens?.find((token) => token.id === assetId)
+    }
+}
diff --git a/packages/shared/lib/core/wallet/stores/selected-wallet-id.store.ts b/packages/shared/lib/core/wallet/stores/selected-wallet-id.store.ts
new file mode 100644
index 00000000000..456a51a869d
--- /dev/null
+++ b/packages/shared/lib/core/wallet/stores/selected-wallet-id.store.ts
@@ -0,0 +1,4 @@
+import { writable } from 'svelte/store'
+
+// TODO(2.0) Fix all usages
+export const selectedWalletId = writable<string>(null)
diff --git a/packages/shared/lib/core/wallet/stores/selected-wallet.store.ts b/packages/shared/lib/core/wallet/stores/selected-wallet.store.ts
new file mode 100644
index 00000000000..0cd42e4c115
--- /dev/null
+++ b/packages/shared/lib/core/wallet/stores/selected-wallet.store.ts
@@ -0,0 +1,19 @@
+import { derived, get, Readable } from 'svelte/store'
+import { activeWallets, updateActiveWallet } from '@core/profile/stores'
+import { IWalletState } from '../interfaces'
+import { selectedWalletId } from './selected-wallet-id.store'
+
+export const selectedWallet: Readable<IWalletState | undefined> = derived(
+    [selectedWalletId, activeWallets],
+    ([$selectedWalletId, $activeWallets]) => {
+        return $activeWallets?.find((wallet) => wallet.id === $selectedWalletId)
+    }
+)
+
+export function getSelectedWallet(): IWalletState {
+    return get(selectedWallet) as IWalletState
+}
+
+export function updateSelectedWallet(payload: Partial<IWalletState>): void {
+    updateActiveWallet(get(selectedWalletId), payload)
+}
diff --git a/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts b/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts
index 85d5a191f92..f55eba7550f 100644
--- a/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts
+++ b/packages/shared/lib/core/wallet/tests/getOutputParameters.test.ts
@@ -62,8 +62,8 @@ jest.mock('../../profile-manager/api', () => ({
     },
 }))
 
-jest.mock('../actions/getAccountAssetsForSelectedAccount', () => ({
-    getAccountAssetsForSelectedAccount: jest.fn((_) => {
+jest.mock('../actions/getWalletAssetsForSelectedWallet', () => ({
+    getWalletAssetsForSelectedWallet: jest.fn((_) => {
         return {
             [NetworkId.Testnet]: {
                 baseCoin: PERSISTED_ASSET_SHIMMER,
diff --git a/packages/shared/lib/core/wallet/types/activities/alias-activity.type.ts b/packages/shared/lib/core/wallet/types/activities/alias-activity.type.ts
index c151521bcb0..d395b9db0d3 100644
--- a/packages/shared/lib/core/wallet/types/activities/alias-activity.type.ts
+++ b/packages/shared/lib/core/wallet/types/activities/alias-activity.type.ts
@@ -3,7 +3,7 @@ import { BaseActivity } from './base-activity.type'
 
 export type AliasActivity = BaseActivity & {
     type: ActivityType.Alias
-    aliasId: string
+    accountId: string
     governorAddress: string
     stateControllerAddress: string
 }
diff --git a/packages/shared/lib/core/wallet/types/activities/foundry-activity.type.ts b/packages/shared/lib/core/wallet/types/activities/foundry-activity.type.ts
index 6dad5455297..7c1dc02aeab 100644
--- a/packages/shared/lib/core/wallet/types/activities/foundry-activity.type.ts
+++ b/packages/shared/lib/core/wallet/types/activities/foundry-activity.type.ts
@@ -5,7 +5,7 @@ export type FoundryActivity = BaseActivity & {
     type: ActivityType.Foundry
     rawAmount: number
     assetId: string
-    aliasAddress: string
+    accountAddress: string
     mintedTokens: string
     meltedTokens: string
     maximumSupply: string
diff --git a/packages/shared/lib/core/wallet/types/index.ts b/packages/shared/lib/core/wallet/types/index.ts
index 44340de0211..2e10eac3694 100644
--- a/packages/shared/lib/core/wallet/types/index.ts
+++ b/packages/shared/lib/core/wallet/types/index.ts
@@ -5,3 +5,5 @@ export * from './subject.type'
 export * from './activities'
 export * from './new-transaction-details.type'
 export * from './token-metadata.type'
+export * from './wallet-api-event-handler.type'
+export * from './wallet-api-event-map.type'
diff --git a/packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts b/packages/shared/lib/core/wallet/types/wallet-api-event-handler.type.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/types/wallet-api-event-handler.type.ts
rename to packages/shared/lib/core/wallet/types/wallet-api-event-handler.type.ts
diff --git a/packages/shared/lib/core/profile-manager/types/wallet-api-event-map.type.ts b/packages/shared/lib/core/wallet/types/wallet-api-event-map.type.ts
similarity index 100%
rename from packages/shared/lib/core/profile-manager/types/wallet-api-event-map.type.ts
rename to packages/shared/lib/core/wallet/types/wallet-api-event-map.type.ts
diff --git a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
index f08eb7f17f6..5c608fb9769 100644
--- a/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildFoundryOutputData.ts
@@ -1,25 +1,25 @@
 import {
-    ImmutableAliasAddressUnlockCondition,
     type FoundryOutputBuilderParams,
     type UnlockCondition,
-    AliasAddress,
     SimpleTokenScheme,
     MetadataFeature,
     Feature,
+    ImmutableAccountAddressUnlockCondition,
+    AccountAddress,
 } from '@iota/sdk/out/types'
 import { Converter } from '@core/utils'
 import { IIrc30Metadata } from '../interfaces'
 import { getSerialNumberFromAliasOutput } from './outputs/getSerialNumberFromAliasOutput'
-import { api } from '@core/profile-manager'
+import { api } from '@core/api'
 
 export async function buildFoundryOutputData(
     totalSupply: number,
     circulatingSupply: number,
     metadata: IIrc30Metadata,
-    aliasId: string
+    accountId: string
 ): Promise<FoundryOutputBuilderParams> {
-    const immutableAliasUnlockCondition = new ImmutableAliasAddressUnlockCondition(
-        new AliasAddress(api.bech32ToHex(aliasId))
+    const immutableAliasUnlockCondition = new ImmutableAccountAddressUnlockCondition(
+        new AccountAddress(api.bech32ToHex(accountId))
     )
 
     const unlockConditions: UnlockCondition[] = [immutableAliasUnlockCondition]
@@ -30,7 +30,7 @@ export async function buildFoundryOutputData(
 
     const immutableFeatures: Feature[] = [metadataFeature]
 
-    const serialNumber = await getSerialNumberFromAliasOutput(aliasId)
+    const serialNumber = await getSerialNumberFromAliasOutput(accountId)
 
     return {
         serialNumber,
diff --git a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
index 8c21c6355cb..20188b302e2 100644
--- a/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
+++ b/packages/shared/lib/core/wallet/utils/buildNftOutputData.ts
@@ -2,7 +2,7 @@ import { AddressUnlockCondition, Ed25519Address, MetadataFeature, NftOutputBuild
 import { Converter } from '@core/utils'
 import { EMPTY_HEX_ID } from '../constants'
 import { IIrc27Metadata } from '@core/nfts/interfaces'
-import { api } from '@core/profile-manager'
+import { api } from '@core/api'
 
 export function buildNftOutputData(metadata: IIrc27Metadata, address: string): NftOutputBuilderParams {
     const addressUnlockCondition = new AddressUnlockCondition(new Ed25519Address(api.bech32ToHex(address)))
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
index b2f2da2a3f0..74b19de7dce 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivities.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { ActivityAction, ActivityType, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet/types'
 import { isParticipationOutput } from '@contexts/governance/utils'
@@ -15,9 +15,10 @@ import { generateActivitiesFromBasicOutputs } from './generateActivitiesFromBasi
 import { OutputType } from '@iota/sdk/out/types'
 import { generateVestingActivity } from './generateVestingActivity'
 
+// TODO(2.0) Use wallets instead of account
 export async function generateActivities(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     if (processedTransaction.wrappedInputs?.length > 0) {
         return generateActivitiesFromProcessedTransactionsWithInputs(processedTransaction, account)
@@ -28,7 +29,7 @@ export async function generateActivities(
 
 async function generateActivitiesFromProcessedTransactionsWithInputs(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const { outputs, wrappedInputs } = processedTransaction
     const activities: Activity[] = []
@@ -79,7 +80,7 @@ async function generateActivitiesFromProcessedTransactionsWithInputs(
  */
 async function generateActivitiesFromProcessedTransactionsWithoutInputs(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const nonRemainderOutputs = processedTransaction.outputs.filter((wrappedOutput) => !wrappedOutput.remainder)
     const activities = await Promise.all(
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
index 017d591b116..3ebd3e1ebdb 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromAliasOutputs.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction } from '@core/wallet'
 import { Activity, type AliasActivity } from '@core/wallet/types'
 import { generateSingleAliasActivity } from './generateSingleAliasActivity'
@@ -6,7 +6,7 @@ import { AliasOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromAliasOutputs(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const outputs = processedTransaction.outputs
     const activities: AliasActivity[] = []
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
index 57c3038d050..f53b81b773f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromBasicOutputs.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { addOrUpdateNftInAllAccountNfts, buildNftFromNftOutput } from '@core/nfts'
 import {
     ActivityAction,
@@ -16,7 +16,7 @@ import { CommonOutput, NftOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromBasicOutputs(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const activities = []
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts
index af048ec6d54..77d50c577b5 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromFoundryOutputs.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { ActivityAction, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet/types'
 import { generateSingleFoundryActivity } from './generateSingleFoundryActivity'
@@ -6,7 +6,7 @@ import { OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromFoundryOutputs(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const outputs = processedTransaction.outputs
     const activities = []
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
index c1a31526478..8535d53f219 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateActivitiesFromNftOutputs.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { ActivityAction, EMPTY_HEX_ID, IProcessedTransaction } from '@core/wallet'
 import { Activity } from '@core/wallet'
 import { generateSingleNftActivity } from './generateSingleNftActivity'
@@ -6,7 +6,7 @@ import { NftOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateActivitiesFromNftOutputs(
     processedTransaction: IProcessedTransaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<Activity[]> {
     const outputs = processedTransaction.outputs
     const activities = []
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
index e2ca35244bf..3e8d4722b4f 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleAliasActivity.ts
@@ -1,9 +1,7 @@
-import { IAccountState } from '@core/account'
 import { EMPTY_HEX_ID } from '@core/wallet/constants'
 import { ActivityType } from '@core/wallet/enums'
-import { IActivityGenerationParameters } from '@core/wallet/interfaces'
+import { IActivityGenerationParameters, IWalletState } from '@core/wallet/interfaces'
 import { AliasActivity } from '@core/wallet/types'
-import { api } from '@core/profile-manager'
 import { getNetworkHrp } from '@core/profile'
 import {
     getAmountFromOutput,
@@ -15,23 +13,25 @@ import {
     getStorageDepositFromOutput,
     getTagFromOutput,
 } from './helper'
-import { AliasOutput } from '@iota/sdk/out/types'
+import { AccountOutput } from 'shared/../../../iota-sdk/bindings/nodejs/out'
+import { api } from '@core/api'
 
+// TODO(2.0) Alias outputs are gone 
 export async function generateSingleAliasActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<AliasActivity> {
     const { transactionId, claimingData, direction, time, inclusionState } = processedTransaction
 
-    const output = wrappedOutput.output as AliasOutput
+    const output = wrappedOutput.output as AccountOutput
     const outputId = wrappedOutput.outputId
     const id = outputId || transactionId
 
-    const { storageDeposit: _storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(account, output)
+    const { storageDeposit: _storageDeposit, giftedStorageDeposit } = await getStorageDepositFromOutput(wallet, output)
     const storageDeposit = getAmountFromOutput(output) + _storageDeposit
     const governorAddress = getGovernorAddressFromAliasOutput(output)
     const stateControllerAddress = getStateControllerAddressFromAliasOutput(output)
-    const aliasId = getAliasId(output, outputId)
+    const accountId = getAccountId(output, outputId)
 
     const isHidden = false
     const isAssetHidden = false
@@ -39,8 +39,8 @@ export async function generateSingleAliasActivity(
 
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
-    const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, account)
-    const sendingInfo = getSendingInformation(processedTransaction, output, account)
+    const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, wallet)
+    const sendingInfo = getSendingInformation(processedTransaction, output, wallet)
 
     return {
         type: ActivityType.Alias,
@@ -49,7 +49,7 @@ export async function generateSingleAliasActivity(
         transactionId,
         direction,
         action,
-        aliasId,
+        accountId,
         storageDeposit,
         giftedStorageDeposit,
         governorAddress,
@@ -66,8 +66,8 @@ export async function generateSingleAliasActivity(
     }
 }
 
-function getAliasId(output: AliasOutput, outputId: string): string {
-    const isNewAlias = output.aliasId === EMPTY_HEX_ID
-    const aliasId = isNewAlias ? api.computeAliasId(outputId) : output.aliasId
-    return api.aliasIdToBech32(aliasId, getNetworkHrp())
+function getAccountId(output: AccountOutput, outputId: string): string {
+    const isNewAccount = output.accountId === EMPTY_HEX_ID
+    const accountId = isNewAccount ? api.computeAccountId(outputId) : output.accountId
+    return api.accountIdToBech32(accountId, getNetworkHrp())
 }
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
index c52f1cef93f..da67e482748 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleBasicActivity.ts
@@ -1,5 +1,5 @@
 import { isShimmerClaimingTransaction } from '@contexts/onboarding/stores'
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { activeProfileId, getCoinType } from '@core/profile'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { TransactionActivity } from '@core/wallet/types'
@@ -18,7 +18,7 @@ import {
 import { BasicOutput } from '@iota/sdk/out/types'
 
 export async function generateSingleBasicActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters,
     fallbackAssetId?: string,
     fallbackAmount?: number
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
index b17523998a3..c0959a4009e 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleConsolidationActivity.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { IActivityGenerationParameters, IWrappedOutput } from '@core/wallet/interfaces'
 import { ConsolidationActivity } from '@core/wallet/types'
 import { ActivityType } from '../../enums'
@@ -13,7 +13,7 @@ import {
 import { BasicOutput, OutputType } from '@iota/sdk/out/types'
 
 export async function generateSingleConsolidationActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<ConsolidationActivity> {
     const { transactionId, direction, claimingData, time, inclusionState, wrappedInputs } = processedTransaction
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
index 2bd1adc3593..4c3673e5762 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleFoundryActivity.ts
@@ -1,8 +1,6 @@
-import { IAccountState } from '@core/account'
 import { getCoinType, getNetworkHrp } from '@core/profile'
-import { api } from '@core/profile-manager'
 import { ActivityType } from '@core/wallet/enums'
-import { IActivityGenerationParameters } from '@core/wallet/interfaces'
+import { IActivityGenerationParameters, IWalletState } from '@core/wallet/interfaces'
 import { FoundryActivity } from '@core/wallet/types'
 import { getNativeTokenFromOutput } from '..'
 import {
@@ -13,15 +11,17 @@ import {
     getTagFromOutput,
 } from './helper'
 import {
-    AliasAddress,
+    AccountAddress,
     FoundryOutput,
-    ImmutableAliasAddressUnlockCondition,
+    ImmutableAccountAddressUnlockCondition,
     SimpleTokenScheme,
     UnlockConditionType,
 } from '@iota/sdk/out/types'
+import { api } from '@core/api'
 
+// TODO(2.0) Alias outputs are gone 
 export async function generateSingleFoundryActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<FoundryActivity> {
     const { transactionId, claimingData, time, direction, inclusionState } = processedTransaction
@@ -34,10 +34,10 @@ export async function generateSingleFoundryActivity(
     const maximumSupply = tokenScheme.maximumSupply.toString()
 
     const addressUnlockCondition = output.unlockConditions.find(
-        (unlockCondition) => unlockCondition.type === UnlockConditionType.ImmutableAliasAddress
-    ) as ImmutableAliasAddressUnlockCondition
-    const aliasId = (addressUnlockCondition?.address as AliasAddress)?.aliasId
-    const aliasAddress = aliasId ? api.aliasIdToBech32(aliasId, getNetworkHrp()) : undefined
+        (unlockCondition) => unlockCondition.type === UnlockConditionType.ImmutableAccountAddress
+    ) as ImmutableAccountAddressUnlockCondition
+    const accountId = (addressUnlockCondition?.address as AccountAddress)?.accountId
+    const accountAddress = accountId ? api.accountIdToBech32(accountId, getNetworkHrp()) : undefined
 
     const isHidden = false
     const isAssetHidden = false
@@ -53,8 +53,8 @@ export async function generateSingleFoundryActivity(
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
 
-    const sendingInfo = getSendingInformation(processedTransaction, output, account)
-    const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, account)
+    const sendingInfo = getSendingInformation(processedTransaction, output, wallet)
+    const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, wallet)
 
     return {
         type: ActivityType.Foundry,
@@ -64,7 +64,7 @@ export async function generateSingleFoundryActivity(
         direction,
         action,
         assetId,
-        aliasAddress,
+        accountAddress,
         mintedTokens,
         meltedTokens,
         maximumSupply,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
index 0ce0fe5351a..973e6adc094 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleGovernanceActivity.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { GovernanceActivity } from '@core/wallet/types'
 import { ActivityType } from '../../enums'
@@ -14,7 +14,7 @@ import {
 import { BasicOutput } from '@iota/sdk/out/types'
 
 export async function generateSingleGovernanceActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<GovernanceActivity> {
     const { transactionId, direction, time, inclusionState, wrappedInputs } = processedTransaction
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
index 395eea20b60..6ef1c699fe5 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateSingleNftActivity.ts
@@ -1,9 +1,7 @@
-import { IAccountState } from '@core/account'
 import { handleError } from '@core/error/handlers'
 import { ActivityAction, ActivityType } from '@core/wallet/enums'
-import { IActivityGenerationParameters } from '@core/wallet/interfaces'
+import { IActivityGenerationParameters, IWalletState } from '@core/wallet/interfaces'
 import { NftActivity } from '@core/wallet/types'
-import { getClient } from '@core/profile-manager'
 import { getNftId } from '../outputs/getNftId'
 import {
     getAsyncDataFromOutput,
@@ -14,9 +12,10 @@ import {
     getTagFromOutput,
 } from './helper'
 import { NftOutput } from '@iota/sdk/out/types'
+import { getClient } from '../../actions/getClient'
 
 export async function generateSingleNftActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters,
     nftIdFromInput?: string
 ): Promise<NftActivity> {
@@ -33,13 +32,13 @@ export async function generateSingleNftActivity(
     const metadata = getMetadataFromOutput(output)
     const tag = getTagFromOutput(output)
 
-    const sendingInfo = getSendingInformation(processedTransaction, output, account)
+    const sendingInfo = getSendingInformation(processedTransaction, output, wallet)
     const { subject, isInternal } = sendingInfo
 
     const { parsedLayer2Metadata, destinationNetwork } = getLayer2ActivityInformation(metadata, sendingInfo)
     const gasBudget = Number(parsedLayer2Metadata?.gasBudget ?? '0')
 
-    const storageDepositData = await getStorageDepositFromOutput(account, output)
+    const storageDepositData = await getStorageDepositFromOutput(wallet, output)
     const { storageDeposit } = storageDepositData
     let { giftedStorageDeposit } = storageDepositData
     giftedStorageDeposit = action === ActivityAction.Burn ? 0 : giftedStorageDeposit
@@ -48,7 +47,7 @@ export async function generateSingleNftActivity(
     let surplus: number | undefined = undefined
     try {
         const client = await getClient()
-        const minimumRequiredStorageDeposit = await client.minimumRequiredStorageDeposit(output)
+        const minimumRequiredStorageDeposit = await client.computeMinimumOutputAmount(output)
         surplus = Number(output.amount) - Number(minimumRequiredStorageDeposit)
         if (surplus && !storageDeposit) {
             giftedStorageDeposit = Number(minimumRequiredStorageDeposit)
@@ -57,7 +56,7 @@ export async function generateSingleNftActivity(
         handleError(err)
     }
 
-    const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, account)
+    const asyncData = await getAsyncDataFromOutput(output, outputId, claimingData, wallet)
 
     return {
         type: ActivityType.Nft,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts b/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts
index 146c0a049c7..21c142d6fd6 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/generateVestingActivity.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { IActivityGenerationParameters } from '@core/wallet/interfaces'
 import { VestingActivity } from '@core/wallet/types'
 import { ActivityType } from '../../enums'
@@ -16,7 +16,7 @@ import { BasicOutput } from '@iota/sdk/out/types'
 import { getCoinType } from '@core/profile'
 
 export async function generateVestingActivity(
-    account: IAccountState,
+    wallet: IWalletState,
     { action, processedTransaction, wrappedOutput }: IActivityGenerationParameters
 ): Promise<VestingActivity> {
     const { transactionId, direction, claimingData, time, inclusionState } = processedTransaction
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
index fb6dbb7db83..02882d6d669 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getAsyncDataFromOutput.ts
@@ -1,5 +1,4 @@
-import { IAccountState } from '@core/account'
-import { isActivityHiddenForAccountIndex, IClaimData, AsyncData } from '@core/wallet'
+import { isActivityHiddenForWalletId, IClaimData, AsyncData, IWalletState } from '@core/wallet'
 import { getExpirationDateFromOutput } from '../../outputs/getExpirationDateFromOutput'
 import { getTimelockDateFromOutput } from './getTimelockDateFromOutput'
 import { isOutputAsync } from '../../outputs/isOutputAsync'
@@ -11,7 +10,7 @@ export async function getAsyncDataFromOutput(
     output: Output,
     outputId: string,
     claimingData: IClaimData,
-    account: IAccountState
+    wallet: IWalletState
 ): Promise<AsyncData> {
     const isAsync = isOutputAsync(output)
     if (isAsync) {
@@ -19,11 +18,11 @@ export async function getAsyncDataFromOutput(
         const isClaiming = false
         const claimingTransactionId = claimingData?.claimingTransactionId
         const claimedDate = claimingData?.claimedDate
-        const isRejected = isActivityHiddenForAccountIndex(account.index, outputId)
+        const isRejected = isActivityHiddenForWalletId(wallet.id, outputId)
 
         const expirationDate = getExpirationDateFromOutput(commonOutput)
         const timelockDate = getTimelockDateFromOutput(commonOutput)
-        const { storageDeposit } = await getStorageDepositFromOutput(account, commonOutput)
+        const { storageDeposit } = await getStorageDepositFromOutput(wallet, commonOutput)
 
         const asyncStatus = getAsyncStatus(
             !!claimingTransactionId,
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
index 8c367a9a675..0f2a2efa914 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getSendingInformation.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 import { ActivityDirection } from '@core/wallet/enums'
 import { IProcessedTransaction } from '@core/wallet/interfaces'
 import { SenderInfo } from '@core/wallet/types'
@@ -11,7 +11,7 @@ import { CommonOutput } from '@iota/sdk/out/types'
 export function getSendingInformation(
     processedTransaction: IProcessedTransaction,
     output: CommonOutput,
-    account: IAccountState
+    account: IWalletState
 ): SenderInfo {
     const { direction, wrappedInputs } = processedTransaction
 
diff --git a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
index d944fac3cb9..6d78d9794ae 100644
--- a/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/generateActivity/helper/getStorageDepositFromOutput.ts
@@ -1,17 +1,20 @@
-import { IAccountState } from '@core/account/interfaces'
-import { getClient } from '@core/profile-manager/api/getClient'
 import { CommonOutput, StorageDepositReturnUnlockCondition, UnlockConditionType } from '@iota/sdk/out/types'
+import { getClient } from '../../../actions/getClient'
+import { IWalletState } from '../../../interfaces'
 
 export async function getStorageDepositFromOutput(
-    account: IAccountState,
+    wallet: IWalletState,
     output: CommonOutput
 ): Promise<{
     storageDeposit: number
     giftedStorageDeposit: number
 }> {
+    // TODO(2.0) Account indexes are gone
+    /*
     if (!(account?.index >= 0)) {
         return { storageDeposit: 0, giftedStorageDeposit: 0 }
     }
+    */
     const storageDepositReturnUnlockCondition = <StorageDepositReturnUnlockCondition>(
         output?.unlockConditions?.find(
             (unlockCondition) => unlockCondition?.type === UnlockConditionType.StorageDepositReturn
@@ -21,7 +24,7 @@ export async function getStorageDepositFromOutput(
         return { storageDeposit: Number(storageDepositReturnUnlockCondition.amount), giftedStorageDeposit: 0 }
     } else {
         const client = await getClient()
-        const minimumRequiredStorageDeposit = await client.minimumRequiredStorageDeposit(output)
+        const minimumRequiredStorageDeposit = await client.computeMinimumOutputAmount(output)
         let minimumRequiredStorageDepositNumber = Number(minimumRequiredStorageDeposit)
         minimumRequiredStorageDepositNumber =
             minimumRequiredStorageDepositNumber > 0 ? minimumRequiredStorageDepositNumber : 0
diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
index 5675b966516..120034dc282 100644
--- a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
+++ b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -1,14 +1,14 @@
-import { api } from '@core/profile-manager'
-import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
+import { AccountAddress, Address, AddressType, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
 import { getNetworkHrp } from '@core/profile'
+import { api } from '@core/api'
 
 export function getBech32AddressFromAddressTypes(address: Address): string {
     const hrp = getNetworkHrp()
     switch (address.type) {
         case AddressType.Ed25519:
             return api.hexToBech32((address as Ed25519Address).pubKeyHash, hrp)
-        case AddressType.Alias:
-            return api.aliasIdToBech32((address as AliasAddress).aliasId, hrp)
+        case AddressType.Account:
+            return api.accountIdToBech32((address as AccountAddress).accountId, hrp)
         case AddressType.Nft:
             return api.nftIdToBech32((address as NftAddress).nftId, hrp)
     }
diff --git a/packages/shared/lib/core/wallet/utils/getBoundWallet.ts b/packages/shared/lib/core/wallet/utils/getBoundWallet.ts
new file mode 100644
index 00000000000..85dacac3e80
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/getBoundWallet.ts
@@ -0,0 +1,33 @@
+import { IError } from '@core/error/interfaces'
+import { IWallet } from '@core/profile/interfaces'
+import { getWallet } from '@core/profile/actions'
+import { UnableToGetBoundWalletError } from '@core/wallet/errors'
+
+// TODO(2.0) Fix all usages
+export async function getBoundWallet(walletId: string, createWalletsIfNotFound: boolean = false): Promise<IWallet> {
+    try {
+        /**
+         * CAUTION: Do NOT remove the `await` keyword here.
+         * It is needed in the case of handling an AccountNotFound
+         * error by creating more accounts.
+         */
+        const wallet = await getWallet(walletId)
+        return wallet
+    } catch (err) {
+        // TODO: Update error type when sdk Error enum has been updated
+        if ((err as IError)?.type === 'wallet' && createWalletsIfNotFound) {
+            // TODO(2.0) Adapt this logic
+            /*
+            for (let indexTocreateWallet = 0; indexTocreateWallet < accountIndex; indexTocreateWallet++) {
+                const account = await createWallet({}, profileManager)
+                if (account?.getMetadata()?.index === accountIndex) {
+                    return account
+                }
+            }
+            */
+            throw new UnableToGetBoundWalletError()
+        } else {
+            throw err
+        }
+    }
+}
diff --git a/packages/shared/lib/core/wallet/utils/getDefaultTransactionOptions.ts b/packages/shared/lib/core/wallet/utils/getDefaultTransactionOptions.ts
index bb7f353384d..c127d79d93b 100644
--- a/packages/shared/lib/core/wallet/utils/getDefaultTransactionOptions.ts
+++ b/packages/shared/lib/core/wallet/utils/getDefaultTransactionOptions.ts
@@ -1,18 +1,16 @@
-import { selectedAccount } from '@core/account'
-import { AccountAddress, TransactionOptions } from '@iota/sdk/out/types'
-import { get } from 'svelte/store'
+import { Bip44Address, TransactionOptions } from '@iota/sdk/out/types'
+import { getSelectedWallet } from '../stores'
 
 export function getDefaultTransactionOptions(address?: string): TransactionOptions | undefined {
     if (!address) {
-        const account = get(selectedAccount)
-        if (!account) return
-        address = account.depositAddress
+        const wallet = getSelectedWallet();
+        if (!wallet) return
+        address = wallet.depositAddress
     }
-    const value: AccountAddress = {
+    const value: Bip44Address = {
         address: address,
         keyIndex: 0,
         internal: false,
-        used: false,
     }
     return {
         remainderValueStrategy: {
diff --git a/packages/shared/lib/core/wallet/utils/getDepositAddress.ts b/packages/shared/lib/core/wallet/utils/getDepositAddress.ts
new file mode 100644
index 00000000000..9d1a92eeed9
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/getDepositAddress.ts
@@ -0,0 +1,6 @@
+import { IWallet } from "@core/profile/interfaces";
+
+// TODO(2.0) Fix all usages
+export async function getDepositAddress(wallet: IWallet): Promise<string> {
+    return await wallet.address();
+}
diff --git a/packages/shared/lib/core/account/utils/getIconColorFromString.ts b/packages/shared/lib/core/wallet/utils/getIconColorFromString.ts
similarity index 100%
rename from packages/shared/lib/core/account/utils/getIconColorFromString.ts
rename to packages/shared/lib/core/wallet/utils/getIconColorFromString.ts
diff --git a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
index e54156839ce..3c88a7d3312 100644
--- a/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
+++ b/packages/shared/lib/core/wallet/utils/getOutputParameters.ts
@@ -1,4 +1,3 @@
-import { getSelectedAccount, prepareOutput } from '@core/account'
 import { ILayer2GasEstimatePayload } from '@core/layer-2/interfaces'
 import {
     getEstimatedGasForTransferFromTransactionDetails,
@@ -11,8 +10,9 @@ import { NewTransactionDetails } from '@core/wallet/types'
 import { getAddressFromSubject } from '@core/wallet/utils'
 import { Assets, BasicOutput, NftOutput, OutputParams } from '@iota/sdk/out/types'
 import BigInteger from 'big-integer'
+import { prepareOutput } from '../actions/prepareOutput'
 import { ReturnStrategy } from '../enums'
-import { NewTransactionType, newTransactionDetails } from '../stores'
+import { NewTransactionType, newTransactionDetails, getSelectedWallet } from '../stores'
 import { getDefaultTransactionOptions } from '../utils'
 
 export async function getOutputParameters(transactionDetails: NewTransactionDetails): Promise<OutputParams> {
@@ -56,7 +56,7 @@ async function buildOutputParametersForLayer2(
     transactionDetails: NewTransactionDetails
 ): Promise<OutputParams | undefined> {
     const { expirationDate, timelockDate, layer2Parameters } = transactionDetails ?? {}
-    const selectedAccount = getSelectedAccount()
+    const selectedWallet = getSelectedWallet()
 
     if (!layer2Parameters) {
         // This should never happen as it's checked right before calling this function
@@ -95,7 +95,7 @@ async function buildOutputParametersForLayer2(
         gasEstimatePayload: ILayer2GasEstimatePayload
     }> {
         const outputForEstimate = (await prepareOutput(
-            selectedAccount.index,
+            selectedWallet.id,
             outputParams,
             getDefaultTransactionOptions()
         )) as unknown as BasicOutput | NftOutput
diff --git a/packages/shared/lib/core/wallet/utils/getRandomWalletColor.ts b/packages/shared/lib/core/wallet/utils/getRandomWalletColor.ts
new file mode 100644
index 00000000000..534f3bac5f1
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/getRandomWalletColor.ts
@@ -0,0 +1,6 @@
+import { WalletColors } from "../enums"
+
+export function getRandomWalletColor(): string {
+    const colors = Object.values(WalletColors).filter((_, i) => !(i % 2))
+    return colors[Math.floor(Math.random() * colors.length)].toString()
+}
diff --git a/packages/shared/lib/core/wallet/utils/getTokenFromSelectedAccount.ts b/packages/shared/lib/core/wallet/utils/getTokenFromSelectedWallet.ts
similarity index 51%
rename from packages/shared/lib/core/wallet/utils/getTokenFromSelectedAccount.ts
rename to packages/shared/lib/core/wallet/utils/getTokenFromSelectedWallet.ts
index bd5445d4336..cedd545ddf7 100644
--- a/packages/shared/lib/core/wallet/utils/getTokenFromSelectedAccount.ts
+++ b/packages/shared/lib/core/wallet/utils/getTokenFromSelectedWallet.ts
@@ -1,13 +1,13 @@
 import { getActiveNetworkId } from '@core/network/utils/getNetworkId'
 import { get } from 'svelte/store'
 import { IAsset } from '../interfaces'
-import { selectedAccountAssets } from '../stores'
+import { selectedWalletAssets } from '../stores'
 
-export function getTokenFromSelectedAccount(tokenId: string): IAsset | undefined {
+export function getTokenFromSelectedWallet(tokenId: string): IAsset | undefined {
     const networkId = getActiveNetworkId()
     if (!networkId) {
         return undefined
     } else {
-        return get(selectedAccountAssets)[networkId]?.nativeTokens?.find((asset) => tokenId === asset.id)
+        return get(selectedWalletAssets)[networkId]?.nativeTokens?.find((asset) => tokenId === asset.id)
     }
 }
diff --git a/packages/shared/lib/core/wallet/utils/index.ts b/packages/shared/lib/core/wallet/utils/index.ts
index 69a605fb96c..b8d9882fbad 100644
--- a/packages/shared/lib/core/wallet/utils/index.ts
+++ b/packages/shared/lib/core/wallet/utils/index.ts
@@ -17,7 +17,7 @@ export * from './getMetadataFromFoundryOutput'
 export * from './getOutputParameters'
 export * from './getSenderAddressFromUnlockCondition'
 export * from './getSubjectFromAddress'
-export * from './getTokenFromSelectedAccount'
+export * from './getTokenFromSelectedWallet'
 export * from './getUnitFromTokenMetadata'
 export * from './isReservedTagKeyword'
 export * from './isSubjectInternal'
@@ -25,6 +25,16 @@ export * from './parseGovernanceMetadata'
 export * from './processAndAddToActivities'
 export * from './validateIrc30Metadata'
 export * from './validateTokenAmount'
+export * from './validateWalletApiEvent'
+export * from './sumBalanceForWallets'
+export * from './sumTotalFromOutputs'
+export * from './getDepositAddress'
+export * from './getBoundWallet'
+export * from './getRandomWalletColor'
+export * from './getIconColorFromString'
+export * from './syncWalletsInSeries'
+export * from './syncWalletsInParallel'
+export * from './validateWalletName'
 
 // Folders
 export * from './generateActivity'
diff --git a/packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts b/packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts
index 48de27dc013..1727a96081e 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/computeOutputId.ts
@@ -1,5 +1,5 @@
-import { api } from '@core/profile-manager'
 import { TransactionId, OutputId } from '@iota/sdk/out/types'
+import { api } from '@core/api'
 
 export function computeOutputId(id: TransactionId, index: number): Promise<OutputId> {
     return api.computeOutputId(id, index)
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
index a4b7bb93ce2..ebdf020527a 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getFoundryId.ts
@@ -1,23 +1,24 @@
-import { api } from '@core/profile-manager'
 import {
+    AccountAddress,
     AddressType,
-    AliasAddress,
     FoundryId,
     FoundryOutput,
-    ImmutableAliasAddressUnlockCondition,
+    ImmutableAccountAddressUnlockCondition,
     UnlockConditionType,
 } from '@iota/sdk/out/types'
+import { api } from '@core/api'
 
+// TODO(2.0) Alias outputs are gone 
 export function buildFoundryId(foundry: FoundryOutput): Promise<FoundryId> {
-    const unlockCondition = foundry.unlockConditions[0] as ImmutableAliasAddressUnlockCondition
-    const isImmutableAliasAddress = unlockCondition.type === UnlockConditionType.ImmutableAliasAddress
+    const unlockCondition = foundry.unlockConditions[0] as ImmutableAccountAddressUnlockCondition
+    const isImmutableAccountAddress = unlockCondition.type === UnlockConditionType.ImmutableAccountAddress
 
     let aliasId = ''
 
-    if (isImmutableAliasAddress) {
-        const hasAliasAddress = unlockCondition.address.type === AddressType.Alias
-        if (hasAliasAddress) {
-            aliasId = (unlockCondition.address as AliasAddress).aliasId
+    if (isImmutableAccountAddress) {
+        const hasAccountAddress = unlockCondition.address.type === AddressType.Account
+        if (hasAccountAddress) {
+            aliasId = (unlockCondition.address as AccountAddress).accountId
         }
     }
 
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
index c6765888f97..75d10751a05 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getNftId.ts
@@ -1,5 +1,5 @@
 import { EMPTY_HEX_ID } from '@core/wallet/constants'
-import { api } from '@core/profile-manager'
+import { api } from 'shared/lib/core/api'
 
 export function getNftId(nftId: string, outputId: string): string {
     const isNewNft = nftId === EMPTY_HEX_ID
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getRequiredStorageDepositForMinimalBasicOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getRequiredStorageDepositForMinimalBasicOutput.ts
index 699b08f35a7..102546708f6 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getRequiredStorageDepositForMinimalBasicOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getRequiredStorageDepositForMinimalBasicOutput.ts
@@ -1,4 +1,3 @@
-import { getClient } from '@core/profile-manager/api/getClient'
 import { EMPTY_HEX_ID } from '@core/wallet'
 import {
     AddressType,
@@ -8,6 +7,7 @@ import {
     UnlockConditionType,
 } from '@iota/sdk/out/types'
 import { plainToInstance } from 'class-transformer'
+import { getClient } from '../../actions/getClient'
 
 const MOCK_BASIC_OUTPUT_AMOUNT = '10'
 
diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
index 5a9022854cb..32116e18338 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/getSerialNumberFromAliasOutput.ts
@@ -1,19 +1,20 @@
 import { get } from 'svelte/store'
-import { selectedAccount } from '@core/account/stores'
-import { api } from '@core/profile-manager'
-import { AliasOutput } from '@iota/sdk/out/types'
+import { api } from '@core/api'
+import { AccountOutput } from '@iota/sdk/out/types'
+import { selectedWallet } from '../../stores'
 
-export async function getSerialNumberFromAliasOutput(aliasAddress: string): Promise<number> {
-    const account = get(selectedAccount)
-    if (!account) {
-        throw new Error('Account is undefined')
+// TODO(2.0) Alias output is gone now
+export async function getSerialNumberFromAliasOutput(accountAddress: string): Promise<number> {
+    const wallet = get(selectedWallet)
+    if (!wallet) {
+        throw new Error('Wallet is undefined')
     }
-    const aliasId = api.bech32ToHex(aliasAddress)
+    const accountId = api.bech32ToHex(accountAddress)
 
-    const [aliasOutput] = await account.unspentOutputs({ aliasIds: [aliasId] })
+    const [accountOutput] = await wallet.unspentOutputs({ accountIds: [accountId] })
 
-    // If it's the first state transition of the alias address, the aliasId is 0x0.
+    // If it's the first state transition of the account address, the accountId is 0x0.
     // So we set the foundry counter to 0.
-    const foundryCounter = aliasOutput ? (aliasOutput.output as AliasOutput).foundryCounter : 0
+    const foundryCounter = accountOutput ? (accountOutput.output as AccountOutput).foundryCounter : 0
     return foundryCounter + 1
 }
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
index 826e722debd..2866f8e2f07 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessGroupedOutputs.ts
@@ -1,16 +1,17 @@
 import { CommonOutput, OutputData, OutputResponse, OutputType, UTXOInput } from '@iota/sdk/out/types'
 import { MILLISECONDS_PER_SECOND } from '@core/utils/constants'
-import { AddressWithOutputs, IAccountState } from '@core/account/interfaces'
+import { AddressWithOutputs, IWalletState } from '@core/wallet/interfaces'
 import { InclusionState, ActivityDirection } from '../../enums'
 import { IProcessedTransaction, IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from './getRecipientAddressFromOutput'
 import { getSenderAddressFromInputs } from '../transactions'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 
+// TODO(2.0) Fix all usages
 export function preprocessGroupedOutputs(
     outputDatas: OutputData[],
     transactionInputs: OutputResponse[],
-    account: IAccountState
+    account: IWalletState
 ): IProcessedTransaction {
     const transactionMetadata = outputDatas[0]?.metadata
     const wrappedInputs = convertTransactionOutputResponsesToWrappedOutputs(
@@ -36,6 +37,7 @@ export function preprocessGroupedOutputs(
     }
 }
 
+// TODO(2.0) Fix all usages
 function getDirectionForOutputs(
     outputs: OutputData[],
     wrappedInputs: IWrappedOutput[],
diff --git a/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts b/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts
index 095db8f47bc..18b7919e449 100644
--- a/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/outputs/preprocessOutgoingTransaction.ts
@@ -3,11 +3,11 @@ import { Output, OutputType, RegularTransactionEssence, Transaction, UTXOInput }
 import { computeOutputId } from './computeOutputId'
 import { getOutputIdFromTransactionIdAndIndex } from './getOutputIdFromTransactionIdAndIndex'
 import { getDirectionFromOutgoingTransaction } from '../transactions'
-import { IAccountState } from '@core/account'
+import { IWalletState } from '@core/wallet/interfaces'
 
 export async function preprocessOutgoingTransaction(
     transaction: Transaction,
-    account: IAccountState
+    account: IWalletState
 ): Promise<IProcessedTransaction> {
     const regularTransactionEssence = transaction.payload.essence as RegularTransactionEssence
 
diff --git a/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts b/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts
index 9edf950e8c1..27de49c4adb 100644
--- a/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts
+++ b/packages/shared/lib/core/wallet/utils/processAndAddToActivities.ts
@@ -1,15 +1,15 @@
 import type { Transaction } from '@iota/sdk/out/types'
 
-import type { IAccountState } from '@core/account/interfaces'
-import { addActivitiesToAccountActivitiesInAllAccountActivities } from '../stores'
+import { addActivitiesToWalletActivitiesInAllWalletActivities } from '../stores'
 
 import { generateActivities, preprocessOutgoingTransaction } from '.'
+import { IWalletState } from '../interfaces'
 
 // We pass the account as a parameter,
 // because logging out while transaction is pending,
-// clears the the selectedAccount store at this point.
-export async function processAndAddToActivities(transaction: Transaction, account: IAccountState): Promise<void> {
-    const preprocessedTransaction = await preprocessOutgoingTransaction(transaction, account)
-    const activities = await generateActivities(preprocessedTransaction, account)
-    addActivitiesToAccountActivitiesInAllAccountActivities(account.index, activities)
+// clears the the selectedWallet store at this point.
+export async function processAndAddToActivities(transaction: Transaction, wallet: IWalletState): Promise<void> {
+    const preprocessedTransaction = await preprocessOutgoingTransaction(transaction, wallet)
+    const activities = await generateActivities(preprocessedTransaction, wallet)
+    addActivitiesToWalletActivitiesInAllWalletActivities(wallet.id, activities)
 }
diff --git a/packages/shared/lib/core/wallet/utils/sumBalanceForWallets.ts b/packages/shared/lib/core/wallet/utils/sumBalanceForWallets.ts
new file mode 100644
index 00000000000..6492d3e65c6
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/sumBalanceForWallets.ts
@@ -0,0 +1,9 @@
+import { IWalletState } from "../interfaces";
+
+// TODO(2.0) Fix all usages
+export function sumBalanceForWallets(wallets: IWalletState[]): number {
+    return wallets.reduce(
+        (total: number, wallet: IWalletState) => (total += Number(wallet.balances.baseCoin.total)),
+        0
+    )
+}
diff --git a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts b/packages/shared/lib/core/wallet/utils/sumTotalFromOutputs.ts
similarity index 89%
rename from packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
rename to packages/shared/lib/core/wallet/utils/sumTotalFromOutputs.ts
index 021c8fff081..74871861357 100644
--- a/packages/shared/lib/core/account/utils/sumTotalFromOutputs.ts
+++ b/packages/shared/lib/core/wallet/utils/sumTotalFromOutputs.ts
@@ -1,5 +1,6 @@
 import { OutputData } from '@iota/sdk/out/types'
 
+// TODO(2.0) Fix all usages
 export function sumTotalFromOutputs(outputs: OutputData[]): number {
     return outputs?.reduce((total: number, outputData: OutputData) => (total += Number(outputData?.output?.amount)), 0)
 }
diff --git a/packages/shared/lib/core/wallet/utils/syncWalletsInParallel.ts b/packages/shared/lib/core/wallet/utils/syncWalletsInParallel.ts
new file mode 100644
index 00000000000..2f7a8f7ac11
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/syncWalletsInParallel.ts
@@ -0,0 +1,6 @@
+import { Balance, SyncOptions } from '@iota/sdk/out/types'
+import { IWallet } from '@core/profile/interfaces'
+
+export async function syncWalletsInParallel(syncOptions: SyncOptions, ...wallets: IWallet[]): Promise<Balance[]> {
+    return Promise.all(wallets.map((wallet) => wallet?.sync(syncOptions)))
+}
diff --git a/packages/shared/lib/core/wallet/utils/syncWalletsInSeries.ts b/packages/shared/lib/core/wallet/utils/syncWalletsInSeries.ts
new file mode 100644
index 00000000000..723d89ac9c5
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/syncWalletsInSeries.ts
@@ -0,0 +1,12 @@
+import { Balance, SyncOptions } from '@iota/sdk/out/types'
+import { IWallet } from '@core/profile/interfaces'
+
+// TODO(2.0) Fix all usages
+export async function syncWalletsInSeries(syncOptions: SyncOptions, ...wallets: IWallet[]): Promise<Balance[]> {
+    const walletBalances: Balance[] = []
+    for (const wallet of wallets) {
+        const balance = await wallet?.sync(syncOptions)
+        walletBalances.push(balance)
+    }
+    return walletBalances
+}
diff --git a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
index e85994b2ab8..cac36aa4ed8 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/activityOutputContainsValue.ts
@@ -1,4 +1,4 @@
-import { IAccountState } from '@core/account/interfaces'
+import { IWalletState } from '@core/wallet/interfaces'
 import { ActivityType } from '@core/wallet/enums'
 import { getNativeTokenFromOutput, isOutputAsync } from '..'
 import { IWrappedOutput } from '../../interfaces'
@@ -6,7 +6,7 @@ import { getActivityTypeFromOutput, getAmountFromOutput, getStorageDepositFromOu
 import { BasicOutput } from '@iota/sdk/out/types'
 
 export async function activityOutputContainsValue(
-    account: IAccountState,
+    wallet: IWalletState,
     wrappedOutput: IWrappedOutput
 ): Promise<boolean> {
     const type = getActivityTypeFromOutput(wrappedOutput)
@@ -17,7 +17,7 @@ export async function activityOutputContainsValue(
         const isAsync = isOutputAsync(output)
         const nativeToken = await getNativeTokenFromOutput(output)
 
-        const { storageDeposit } = await getStorageDepositFromOutput(account, output)
+        const { storageDeposit } = await getStorageDepositFromOutput(wallet, output)
         const rawAmount = getAmountFromOutput(output) - storageDeposit
         return !isAsync || rawAmount > 0 || (!!nativeToken && Number(nativeToken.amount) > 0)
     } else {
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromOutgoingTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromOutgoingTransaction.ts
index 2682c85bd54..d8941504c65 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromOutgoingTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getDirectionFromOutgoingTransaction.ts
@@ -1,9 +1,9 @@
-import { AddressWithOutputs } from '@core/account/interfaces'
-import { IWrappedOutput } from '../../interfaces'
+import { AddressWithOutputs, IWrappedOutput } from '../../interfaces'
 import { getRecipientAddressFromOutput } from '../outputs/getRecipientAddressFromOutput'
 import { ActivityDirection } from '@core/wallet/enums'
 import { CommonOutput } from '@iota/sdk/out/types'
 
+// TODO(2.0) Fix all usages
 export function getDirectionFromOutgoingTransaction(
     wrappedOutputs: IWrappedOutput[],
     accountAddressesWithOutputs: AddressWithOutputs[]
diff --git a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
index 70f70e32446..a4f3006aac3 100644
--- a/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
+++ b/packages/shared/lib/core/wallet/utils/transactions/getNonRemainderBasicOutputsFromTransaction.ts
@@ -1,9 +1,9 @@
 import { getRecipientAddressFromOutput } from '..'
-import { IWrappedOutput } from '@core/wallet/interfaces'
+import { AddressWithOutputs, IWrappedOutput } from '@core/wallet/interfaces'
 import { ActivityDirection } from '@core/wallet/enums'
 import { CommonOutput } from '@iota/sdk/out/types'
-import { AddressWithOutputs } from '@core/account'
 
+// TODO(2.0) Fix all usages
 export function getNonRemainderBasicOutputsFromTransaction(
     wrappedOutputs: IWrappedOutput[],
     accountAddressesWithOutputs: AddressWithOutputs[],
diff --git a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts b/packages/shared/lib/core/wallet/utils/validateWalletApiEvent.ts
similarity index 92%
rename from packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
rename to packages/shared/lib/core/wallet/utils/validateWalletApiEvent.ts
index 6147b01e134..343bc781176 100644
--- a/packages/shared/lib/core/profile-manager/utils/validateWalletApiEvent.ts
+++ b/packages/shared/lib/core/wallet/utils/validateWalletApiEvent.ts
@@ -14,9 +14,9 @@ export function validateWalletApiEvent(
         throw new WalletApiEventError(error)
     } else {
         /* eslint-disable-next-line prefer-const */
-        const { accountIndex, event } = rawEvent
+        const { walletId, event } = rawEvent
 
-        if (Number.isNaN(accountIndex)) {
+        if (Number.isNaN(walletId)) {
             throw new WalletApiEventValidationError(
                 localize('error.walletApiEvent.invalidAccountIndex', { values: { eventName: apiEvent } })
             )
diff --git a/packages/shared/lib/core/wallet/utils/validateWalletName.ts b/packages/shared/lib/core/wallet/utils/validateWalletName.ts
new file mode 100644
index 00000000000..99c12d08ec8
--- /dev/null
+++ b/packages/shared/lib/core/wallet/utils/validateWalletName.ts
@@ -0,0 +1,28 @@
+import { localize } from '@core/i18n'
+import { activeWallets } from '@core/profile'
+import { getTrimmedLength } from '@core/utils'
+import { get } from 'svelte/store'
+import { MAX_WALLET_NAME_LENGTH } from '../constants'
+
+// TODO(2.0) Fix all usages
+export function validateWalletName(
+    name: string,
+    validateLength = true,
+    validateDuplicate = true
+): Promise<void | string> {
+    if (validateLength && getTrimmedLength(name) > MAX_WALLET_NAME_LENGTH) {
+        return Promise.reject(
+            new Error(
+                localize('error.wallet.length', { // TODO(2.0) Rename error code
+                    values: {
+                        length: MAX_WALLET_NAME_LENGTH,
+                    },
+                })
+            )
+        )
+    }
+    if (validateDuplicate && get(activeWallets)?.find((existingWallet) => existingWallet.name === name)) {
+        return Promise.reject(new Error(localize('error.wallet.duplicate')))
+    }
+    return Promise.resolve()
+}
diff --git a/packages/shared/lib/tests/__mocks__/api.mock.ts b/packages/shared/lib/tests/__mocks__/api.mock.ts
deleted file mode 100644
index c19be278571..00000000000
--- a/packages/shared/lib/tests/__mocks__/api.mock.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { AccountMock } from './account.mock'
-import { ProfileManagerMock } from './profile-manager.mock'
-
-import { WalletOptions, CreateAccountPayload } from '@iota/sdk/out/types'
-
-import { IApi, RecoverAccountsPayload } from '@core/profile-manager'
-import { IAccount } from '@core/account'
-
-export const MOCK_MNEMONIC =
-    'term aisle loyal cradle talent buddy crater express asthma load antique game better head position master aspect print more wine sword speed joy story'
-
-const profileManagers = {}
-
-const api: IApi = {
-    createAccount(_: string, __: CreateAccountPayload): Promise<IAccount> {
-        return new Promise((resolve) => {
-            resolve(new AccountMock())
-        })
-    },
-    deleteWallet(id: string) {
-        if (id && id in profileManagers) {
-            delete profileManagers[id]
-        }
-    },
-    getAccount(_: string, __: number): Promise<AccountMock> {
-        return new Promise((resolve) => {
-            resolve(new AccountMock())
-        })
-    },
-    getAccounts(_: string): Promise<AccountMock[]> {
-        return new Promise((resolve) => {
-            resolve([])
-        })
-    },
-    recoverAccounts(_: string, __: RecoverAccountsPayload): Promise<IAccount[]> {
-        return new Promise((resolve) => {
-            resolve([])
-        })
-    },
-    migrateStrongholdSnapshotV2ToV3(
-        _currentPath: string,
-        _newPath: string,
-        _currentPassword: string,
-        _newPassword: string
-    ): Promise<void> {
-        return new Promise((resolve) => {
-            resolve()
-        })
-    },
-
-    generateMnemonic(): Promise<string> {
-        return Promise.resolve(MOCK_MNEMONIC)
-    },
-
-    verifyMnemonic(mnemonic: string): Promise<void> {
-        return Promise.resolve()
-    },
-}
-
-window['__WALLET__API__'] = api
diff --git a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts b/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
deleted file mode 100644
index dbab0ecb4de..00000000000
--- a/packages/shared/lib/tests/__mocks__/profile-manager.mock.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-import { AccountMock } from './account.mock'
-
-import type {
-    AccountId,
-    CreateAccountPayload,
-    SyncOptions,
-    IClientOptions,
-    WalletEvent,
-    LedgerNanoStatus,
-    GenerateAddressOptions,
-    WalletEventType,
-} from '@iota/sdk/out/types'
-
-import { IAccount } from '@core/account'
-import { IAuth, INodeInfoResponse } from '@core/network'
-import { IProfileManager, WalletApiEventHandler } from '@core/profile-manager'
-
-export class ProfileManagerMock implements IProfileManager {
-    id: string
-
-    constructor(id: string) {
-        this.id = id
-    }
-
-    backup(_: string, __: string): Promise<void> {
-        return Promise.resolve()
-    }
-
-    bech32ToHex(bech32Address: string): Promise<string> {
-        throw new Error('Method not implemented.')
-    }
-
-    changeStrongholdPassword(password: string): Promise<void> {
-        throw new Error('Method not implemented.')
-    }
-
-    clearListeners(eventTypes: WalletEventType[]): Promise<void> {
-        throw new Error('Method not implemented.')
-    }
-
-    clearStrongholdPassword(): Promise<void> {
-        return Promise.resolve()
-    }
-
-    createAccount(account: CreateAccountPayload): Promise<IAccount> {
-        return Promise.resolve(new AccountMock())
-    }
-
-    destroy(): Promise<void> {
-        return Promise.resolve()
-    }
-
-    emitTestEvent(event: WalletEvent): Promise<void> {
-        throw new Error('Method not implemented.')
-    }
-
-    generateEd25519Address(
-        accountIndex: number,
-        internal: boolean,
-        addressIndex: number,
-        options?: GenerateAddressOptions,
-        bech32Hrp?: string
-    ): Promise<string> {
-        throw new Error('Method not implemented.')
-    }
-
-    getAccount(accountIndex: AccountId): Promise<IAccount> {
-        throw new Error('Method not implemented.')
-    }
-
-    getAccountIndexes(): Promise<number[]> {
-        throw new Error('Method not implemented.')
-    }
-
-    getAccounts(): Promise<IAccount[]> {
-        throw new Error('Method not implemented.')
-    }
-
-    getNodeInfo(url: string, auth?: IAuth): Promise<INodeInfoResponse> {
-        return Promise.resolve({
-            nodeInfo: {
-                name: 'HORNET',
-                version: '2.0.0-alpha10',
-                status: {
-                    isHealthy: true,
-                    latestMilestone: {
-                        index: 95112,
-                        timestamp: 1652207614,
-                        milestoneId: '0x1dcee113052173537d0847a5997c92b53b7204fbffd974bf7f9fc489182aac36',
-                    },
-                    confirmedMilestone: {
-                        index: 95112,
-                        timestamp: 1652207614,
-                        milestoneId: '0x1dcee113052173537d0847a5997c92b53b7204fbffd974bf7f9fc489182aac36',
-                    },
-                    pruningIndex: 34629,
-                },
-                protocol: {
-                    version: 2,
-                    networkName: 'alphanet-5',
-                    bech32Hrp: 'rms',
-                    minPowScore: 1000,
-                    rentStructure: {
-                        vByteCost: 500,
-                        vByteFactorKey: 10,
-                        vByteFactorData: 1,
-                    },
-                    tokenSupply: '2779530283277761',
-                },
-                baseToken: {
-                    name: 'Shimmer',
-                    tickerSymbol: 'SMR',
-                    unit: 'SMR',
-                    subunit: 'glow',
-                    decimals: 6,
-                    useMetricPrefix: false,
-                },
-                metrics: {
-                    blocksPerSecond: 1.3,
-                    referencedBlocksPerSecond: 1.3,
-                    referencedRate: 100,
-                },
-                supportedProtocolVersions: [],
-                pendingProtocolParameters: [],
-                features: [],
-            },
-            url,
-        })
-    }
-
-    getLedgerNanoStatus(): Promise<LedgerNanoStatus> {
-        return new Promise((resolve) =>
-            resolve({
-                connected: true,
-                locked: false,
-                blindSigningEnabled: false,
-            })
-        )
-    }
-
-    hexToBech32(hex: string, bech32Hrp?: string): Promise<string> {
-        return Promise.resolve('')
-    }
-
-    isStrongholdPasswordAvailable(): Promise<boolean> {
-        return Promise.resolve(true)
-    }
-
-    async listen(_eventTypes: WalletEventType[], _callback: WalletApiEventHandler): Promise<void> {
-        return
-    }
-
-    recoverAccounts(
-        accountStartIndex: number,
-        accountGapLimit: number,
-        addressGapLimit: number,
-        syncOptions: SyncOptions
-    ): Promise<IAccount[]> {
-        return Promise.resolve([])
-    }
-
-    removeLatestAccount(): Promise<void> {
-        throw new Error('Method not implemented.')
-    }
-
-    restoreBackup(
-        source: string,
-        password: string,
-        ignoreIfCoinTypeMismatch?: boolean,
-        ignoreIfBech32Mismatch?: string
-    ): Promise<void> {
-        return Promise.resolve()
-    }
-
-    setClientOptions(options: IClientOptions): Promise<void> {
-        return Promise.resolve()
-    }
-
-    setStrongholdPassword(password: string): Promise<void> {
-        return Promise.resolve()
-    }
-
-    setStrongholdPasswordClearInterval(intervalInMilliseconds?: number): Promise<void> {
-        throw new Error('Method not implemented.')
-    }
-
-    startBackgroundSync(options?: SyncOptions, interval?: number): Promise<void> {
-        return Promise.resolve()
-    }
-
-    stopBackgroundSync(): Promise<void> {
-        return Promise.resolve()
-    }
-
-    storeMnemonic(mnemonic: string): Promise<void> {
-        return Promise.resolve()
-    }
-
-    updateNodeAuth(url: string, auth?: IAuth): Promise<void> {
-        return Promise.resolve()
-    }
-}
diff --git a/packages/shared/locales/af.json b/packages/shared/locales/af.json
index e4e0388f34a..2db8dd85c8e 100644
--- a/packages/shared/locales/af.json
+++ b/packages/shared/locales/af.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "My Beursie",
         "profiles": "Profiel",
         "dev": "Dev",
-        "createAccount": "Skep 'n Beursie",
+        "createWallet": "Skep 'n Beursie",
         "addAWallet": "Add a wallet",
         "accountName": "Beursie naam",
         "latestTransactions": "Nuutste transaksie",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Jou beursie naam mag nie langer as {length, plural, one {# karakter} other {# karakters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/ar.json b/packages/shared/locales/ar.json
index 66ba2ed90d3..6d7e2fdbd11 100644
--- a/packages/shared/locales/ar.json
+++ b/packages/shared/locales/ar.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "محافظي",
         "profiles": "الملفات الشخصية",
         "dev": "المطور",
-        "createAccount": "إنشاء محفظة",
+        "createWallet": "إنشاء محفظة",
         "addAWallet": "Add a wallet",
         "accountName": "اسم المحفظة",
         "latestTransactions": "آخر المعاملات",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "يجب أن لا يتعدى اسم محفظتك {length, plural, one {# حرف } other {# حروف}}.",
             "emptyName": "يجب أن يحتوي اسم ملف التعريف على حرف واحد على الأقل.",
diff --git a/packages/shared/locales/bg.json b/packages/shared/locales/bg.json
index bca031065e5..88c9a1b4a48 100644
--- a/packages/shared/locales/bg.json
+++ b/packages/shared/locales/bg.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Моите Портфейли",
         "profiles": "Профили",
         "dev": "За разработчици",
-        "createAccount": "Създаване на портфейл",
+        "createWallet": "Създаване на портфейл",
         "addAWallet": "Add a wallet",
         "accountName": "Име на портфейла",
         "latestTransactions": "Последни трансакции",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "Името на профила трябва да съдържа поне 1 символ.",
diff --git a/packages/shared/locales/ca.json b/packages/shared/locales/ca.json
index 9a7df4c12cd..84d560c43eb 100644
--- a/packages/shared/locales/ca.json
+++ b/packages/shared/locales/ca.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Els meus moneders",
         "profiles": "Perfils",
         "dev": "Dev",
-        "createAccount": "Crea un moneder",
+        "createWallet": "Crea un moneder",
         "addAWallet": "Add a wallet",
         "accountName": "Nom del moneder",
         "latestTransactions": "Últimes transaccions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "El nom del moneder no pot superar els {length, plural, one {1 caràcter} other {# caràcters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/cs.json b/packages/shared/locales/cs.json
index 1e40dc37fc3..318fb2536ff 100644
--- a/packages/shared/locales/cs.json
+++ b/packages/shared/locales/cs.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Moje peněženky",
         "profiles": "Profily",
         "dev": "Vývojář",
-        "createAccount": "Vytvořit peněženku",
+        "createWallet": "Vytvořit peněženku",
         "addAWallet": "Add a wallet",
         "accountName": "Název peněženky",
         "latestTransactions": "Poslední transakce",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "Název profilu musí obsahovat alespoň 1 znak.",
diff --git a/packages/shared/locales/da.json b/packages/shared/locales/da.json
index 38179b95828..cc777bab407 100644
--- a/packages/shared/locales/da.json
+++ b/packages/shared/locales/da.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Mine Wallets",
         "profiles": "Profiler",
         "dev": "Udvikler",
-        "createAccount": "Opret ny Wallet",
+        "createWallet": "Opret ny Wallet",
         "addAWallet": "Add a wallet",
         "accountName": "Wallet navn",
         "latestTransactions": "Seneste transaktioner",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/de.json b/packages/shared/locales/de.json
index 17e8e9ce66a..fff3d1b273c 100644
--- a/packages/shared/locales/de.json
+++ b/packages/shared/locales/de.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Meine Wallets",
         "profiles": "Profile",
         "dev": "Entwickler",
-        "createAccount": "Wallet erstellen",
+        "createWallet": "Wallet erstellen",
         "addAWallet": "Wallet hinzufügen",
         "accountName": "Wallet-Name",
         "latestTransactions": "Neueste Transaktionen",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Falscher Adresstyp"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "Die Adresse kann in deinem Konto nicht gefunden werden.",
             "length": "Der Name deiner Wallet darf nicht länger als {length, plural, one {1 Zeichen} other {# Zeichen}} sein.",
             "emptyName": "Ein Profilname muss mindestens 1 Zeichen enthalten.",
diff --git a/packages/shared/locales/el.json b/packages/shared/locales/el.json
index 29ec0d5e816..373c7a44cc8 100644
--- a/packages/shared/locales/el.json
+++ b/packages/shared/locales/el.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Τα πορτοφόλια μου",
         "profiles": "Προφίλ",
         "dev": "Προγραμματιστής",
-        "createAccount": "Δημιουργία πορτοφολιού",
+        "createWallet": "Δημιουργία πορτοφολιού",
         "addAWallet": "Add a wallet",
         "accountName": "Όνομα πορτοφολιού",
         "latestTransactions": "Τελευταίες Συναλλαγές",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Το όνομα του πορτοφολιού σας δεν μπορεί να είναι μεγαλύτερο από {length, plural, one {1 χαρακτήρα} other {# χαρακτήρες}}.",
             "emptyName": "Ένα όνομα προφίλ πρέπει να περιέχει τουλάχιστον 1 χαρακτήρα.",
diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
index 03ac0d48f1f..0008200935c 100644
--- a/packages/shared/locales/en.json
+++ b/packages/shared/locales/en.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "My Wallets",
         "profiles": "Profiles",
         "dev": "Dev",
-        "createAccount": "Create a Wallet",
+        "createWallet": "Create a Wallet",
         "addAWallet": "Add a wallet",
         "accountName": "Wallet name",
         "latestTransactions": "Latest Transactions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/eo.json b/packages/shared/locales/eo.json
index 7cca1d0835b..2d8ade40d79 100644
--- a/packages/shared/locales/eo.json
+++ b/packages/shared/locales/eo.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Miaj monujoj",
         "profiles": "Profiloj",
         "dev": "Programisto",
-        "createAccount": "Krei monujon",
+        "createWallet": "Krei monujon",
         "addAWallet": "Add a wallet",
         "accountName": "Nomo de la monujo",
         "latestTransactions": "La lastaj transakcioj",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Via monujo nomo ne povas esti pli longa ol {length, plural, one {# signo} other {# signoj}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/es-ES.json b/packages/shared/locales/es-ES.json
index 4363a9797b5..7b94cd20636 100644
--- a/packages/shared/locales/es-ES.json
+++ b/packages/shared/locales/es-ES.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Mis Carteras",
         "profiles": "Perfiles",
         "dev": "Desarrollador",
-        "createAccount": "Crear una Cartera",
+        "createWallet": "Crear una Cartera",
         "addAWallet": "Añadir una cartera",
         "accountName": "Nombre de cartera",
         "latestTransactions": "Últimas Transacciones",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Tipo de dirección incorrecta"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "No se pudo encontrar la dirección en tu cuenta.",
             "length": "El nombre de tu cartera no puede tener más de {length, plural, one {# carácter} other {# caracteres}}.",
             "emptyName": "El nombre debe contener al menos 1 carácter.",
diff --git a/packages/shared/locales/es-LA.json b/packages/shared/locales/es-LA.json
index 2441dcf83ab..9480c2826c1 100644
--- a/packages/shared/locales/es-LA.json
+++ b/packages/shared/locales/es-LA.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Mis Billeteras",
         "profiles": "Perfiles",
         "dev": "Dev",
-        "createAccount": "Crear una Billetera",
+        "createWallet": "Crear una Billetera",
         "addAWallet": "Añadir una bileltera",
         "accountName": "Nombre de billetera",
         "latestTransactions": "Últimas transacciones",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "El nombre de tu billetera no puede tener mas de {length, plural, one {# carácter} other {# caracteres}}.",
             "emptyName": "El nombre del perfil debe contener al menos 1 carácter.",
diff --git a/packages/shared/locales/et.json b/packages/shared/locales/et.json
index e75f6e18af8..1b2650a1b31 100644
--- a/packages/shared/locales/et.json
+++ b/packages/shared/locales/et.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Minu rahakotid",
         "profiles": "Profiilid",
         "dev": "Arendaja",
-        "createAccount": "Loo rahakott",
+        "createWallet": "Loo rahakott",
         "addAWallet": "Add a wallet",
         "accountName": "Rahakoti nimi",
         "latestTransactions": "Viimased tehingud",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/fa.json b/packages/shared/locales/fa.json
index 01faf05e626..b7ce7e3a84c 100644
--- a/packages/shared/locales/fa.json
+++ b/packages/shared/locales/fa.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "کیف پول من",
         "profiles": "پروفایل ها",
         "dev": "برنامه نویس",
-        "createAccount": "ايجاد كيف پول",
+        "createWallet": "ايجاد كيف پول",
         "addAWallet": "Add a wallet",
         "accountName": "نام کیف پول",
         "latestTransactions": "آخرین تراکنش ها",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/fi.json b/packages/shared/locales/fi.json
index d8add5929fc..efbb74786fa 100644
--- a/packages/shared/locales/fi.json
+++ b/packages/shared/locales/fi.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Minun lompakkoni",
         "profiles": "Profiilit",
         "dev": "Kehitys",
-        "createAccount": "Luo lompakko",
+        "createWallet": "Luo lompakko",
         "addAWallet": "Lisää lompakko",
         "accountName": "Lompakon nimi",
         "latestTransactions": "Viimeisimmät transaktiot",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Lompakkosi nimi ei voi olla pidempi kuin {length, plural, one {# merkki} other {# merkkiä}}.",
             "emptyName": "Profiilin nimessä on oltava vähintään yksi merkki.",
diff --git a/packages/shared/locales/fr.json b/packages/shared/locales/fr.json
index 45a12da1c81..1e53b377afb 100644
--- a/packages/shared/locales/fr.json
+++ b/packages/shared/locales/fr.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Mes Portefeuilles",
         "profiles": "Profils",
         "dev": "Dév",
-        "createAccount": "Créer un Portefeuille",
+        "createWallet": "Créer un Portefeuille",
         "addAWallet": "Ajouter un portefeuille",
         "accountName": "Nom du portefeuille",
         "latestTransactions": "Dernières Transactions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Le nom de votre portefeuille ne peut pas contenir plus de {length, plural, one {# caractère} other {# caractères}}.",
             "emptyName": "Un nom de profil doit contenir au moins 1 caractère.",
diff --git a/packages/shared/locales/he.json b/packages/shared/locales/he.json
index bd78b3bfa3b..0be62ecd38f 100644
--- a/packages/shared/locales/he.json
+++ b/packages/shared/locales/he.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "הארנקים שלי",
         "profiles": "פרופילים",
         "dev": "מפתח",
-        "createAccount": "צור ארנק",
+        "createWallet": "צור ארנק",
         "addAWallet": "הוסף ארנק",
         "accountName": "שם ארנק",
         "latestTransactions": "תנועות אחרונות",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/hi.json b/packages/shared/locales/hi.json
index cb5f09fcaa9..9cc0368e353 100644
--- a/packages/shared/locales/hi.json
+++ b/packages/shared/locales/hi.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "मेरा वॉलेट",
         "profiles": "प्रोफाइल्स",
         "dev": "देव",
-        "createAccount": "वॉलेट बनाएं",
+        "createWallet": "वॉलेट बनाएं",
         "addAWallet": "Add a wallet",
         "accountName": "वॉलेट का नाम",
         "latestTransactions": "नवीनतम ट्रांसक्शन्स",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/hr.json b/packages/shared/locales/hr.json
index e7ef7598a9a..dac3764a925 100644
--- a/packages/shared/locales/hr.json
+++ b/packages/shared/locales/hr.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Moji novčanici",
         "profiles": "Profili",
         "dev": "Programer",
-        "createAccount": "Stvori novčanik",
+        "createWallet": "Stvori novčanik",
         "addAWallet": "Dodaj novčanik",
         "accountName": "Ime novčanika",
         "latestTransactions": "Najnovije transakcije",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Ime novčanika ne smije biti dulje od {length, plural, one {# znaka} few {# znaka} other {# znakova}}.",
             "emptyName": "Ime profila mora sadržavati najmanje 1 znak.",
diff --git a/packages/shared/locales/hu.json b/packages/shared/locales/hu.json
index 69633901eed..d2cbec65e4c 100644
--- a/packages/shared/locales/hu.json
+++ b/packages/shared/locales/hu.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Tárcáim",
         "profiles": "Profilok",
         "dev": "Fejlesztő",
-        "createAccount": "Tárca létrehozása",
+        "createWallet": "Tárca létrehozása",
         "addAWallet": "Tárca hozzáadása",
         "accountName": "Tárca neve",
         "latestTransactions": "Legutóbbi tranzakciók",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Helytelen címtípus"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "A cím nem található meg a számláján.",
             "length": "A tárca neve nem lehet {length, plural, one {# karakternél} other {# karakternél}} hosszabb.",
             "emptyName": "A profilnévnek legalább 1 karakterből kell állnia.",
diff --git a/packages/shared/locales/id.json b/packages/shared/locales/id.json
index e499709945e..ac3beaf4360 100644
--- a/packages/shared/locales/id.json
+++ b/packages/shared/locales/id.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Dompet saya",
         "profiles": "Profil",
         "dev": "Pengembang",
-        "createAccount": "Buat dompet",
+        "createWallet": "Buat dompet",
         "addAWallet": "Add a wallet",
         "accountName": "Nama Dompet",
         "latestTransactions": "Transaksi terbaru",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Nama dompet Anda tidak dapat lebih panjang dari {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/it.json b/packages/shared/locales/it.json
index c3d955a1db3..33a54c07887 100644
--- a/packages/shared/locales/it.json
+++ b/packages/shared/locales/it.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "I Miei Wallet",
         "profiles": "Profili",
         "dev": "Dev",
-        "createAccount": "Crea un wallet",
+        "createWallet": "Crea un wallet",
         "addAWallet": "Aggiungi un portfolio",
         "accountName": "Nome wallet",
         "latestTransactions": "Ultime Transazioni",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Tipo di indirizzo errato"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "L'indirizzo non può essere trovato nel tuo account.",
             "length": "Il nome del wallet non può essere più lungo di {length, plural, one {1 carattere} other {# caratteri}}.",
             "emptyName": "Un nome del profilo deve contenere almeno 1 carattere.",
diff --git a/packages/shared/locales/ja.json b/packages/shared/locales/ja.json
index 1888b2e0355..aab0fdee6dc 100644
--- a/packages/shared/locales/ja.json
+++ b/packages/shared/locales/ja.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "マイウォレット",
         "profiles": "プロフィール",
         "dev": "開発者",
-        "createAccount": "ウォレットを作成",
+        "createWallet": "ウォレットを作成",
         "addAWallet": "Add a wallet",
         "accountName": "ウォレット名",
         "latestTransactions": "最新の取引",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "ウォレット名は{length, plural, one {#  文字} other {# 文字 }}より長くすることはできません。",
             "emptyName": "プロフィール名は少なくとも1文字以上でなければなりません。",
diff --git a/packages/shared/locales/ko.json b/packages/shared/locales/ko.json
index 95841c62a12..9310432b612 100644
--- a/packages/shared/locales/ko.json
+++ b/packages/shared/locales/ko.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "내 지갑",
         "profiles": "프로필",
         "dev": "개발자",
-        "createAccount": "지갑 만들기",
+        "createWallet": "지갑 만들기",
         "addAWallet": "지갑 추가",
         "accountName": "지갑 이름",
         "latestTransactions": "최근 거래",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "잘못된 주소 유형입니다."
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "계정에서 주소를 찾을 수 없습니다.",
             "length": "지갑 이름은 {length, plural, other {#자}}보다 길 수 없습니다.",
             "emptyName": "프로필 이름에는 적어도 문자 1자 이상이 포함되어야 합니다.",
diff --git a/packages/shared/locales/ku.json b/packages/shared/locales/ku.json
index 1a639de6e2d..ae06475036d 100644
--- a/packages/shared/locales/ku.json
+++ b/packages/shared/locales/ku.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Cuzdank",
         "profiles": "Profîl",
         "dev": "Pêşvebir",
-        "createAccount": "Cuzdanek nû çêke",
+        "createWallet": "Cuzdanek nû çêke",
         "addAWallet": "Add a wallet",
         "accountName": "Navê Cuzdankê",
         "latestTransactions": "Transferên Dawî",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/lv.json b/packages/shared/locales/lv.json
index 6c329af3f15..9a6baa26a99 100644
--- a/packages/shared/locales/lv.json
+++ b/packages/shared/locales/lv.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "My Wallets",
         "profiles": "Profiles",
         "dev": "Dev",
-        "createAccount": "Create a Wallet",
+        "createWallet": "Create a Wallet",
         "addAWallet": "Add a wallet",
         "accountName": "Wallet name",
         "latestTransactions": "Latest Transactions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/mk.json b/packages/shared/locales/mk.json
index 73ec93787e3..050e64bbe5d 100644
--- a/packages/shared/locales/mk.json
+++ b/packages/shared/locales/mk.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Мои паричници",
         "profiles": "Профили",
         "dev": "Девелопер",
-        "createAccount": "Креирај паричник",
+        "createWallet": "Креирај паричник",
         "addAWallet": "Add a wallet",
         "accountName": "Име на паричник",
         "latestTransactions": "Последни трансакции",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/nl.json b/packages/shared/locales/nl.json
index ee49a2c6688..83740293c1e 100644
--- a/packages/shared/locales/nl.json
+++ b/packages/shared/locales/nl.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Mijn Portemonnees",
         "profiles": "Profielen",
         "dev": "Ontwikkelaar",
-        "createAccount": "Maak een portemonnee aan",
+        "createWallet": "Maak een portemonnee aan",
         "addAWallet": "Portemonnee toevoegen",
         "accountName": "Naam portemonnee",
         "latestTransactions": "Meest recente transacties",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Je wallet naam kan niet langer zijn dan {length, plural, one {# karakter} other {# karakters}}.",
             "emptyName": "Een profielnaam moet ten minste 1 teken bevatten.",
diff --git a/packages/shared/locales/no.json b/packages/shared/locales/no.json
index f03952d7e08..5d346fe0f3e 100644
--- a/packages/shared/locales/no.json
+++ b/packages/shared/locales/no.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Lommebøkene mine",
         "profiles": "Profiler",
         "dev": "Utvikling",
-        "createAccount": "Opprette lommebok",
+        "createWallet": "Opprette lommebok",
         "addAWallet": "Add a wallet",
         "accountName": "Navn på lommebok",
         "latestTransactions": "Siste transaksjoner",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/pl.json b/packages/shared/locales/pl.json
index f042ed080e0..31722393064 100644
--- a/packages/shared/locales/pl.json
+++ b/packages/shared/locales/pl.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Moje portfele",
         "profiles": "Profile",
         "dev": "Deweloper",
-        "createAccount": "Utwórz portfel",
+        "createWallet": "Utwórz portfel",
         "addAWallet": "Dodaj portfel",
         "accountName": "Nazwa portfela",
         "latestTransactions": "Ostatnie transakcje",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Nieprawidłowy typ adresu"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "Adres nie może zostać odnaleziony na Twoim koncie.",
             "length": "Nazwa Twojego portfela nie może być dłuższa niż {length, plural, one {# znak} few {# znaki} many {# znaków} other {# znaków}}.",
             "emptyName": "Nazwa profilu musi zawierać co najmniej 1 znak.",
diff --git a/packages/shared/locales/pt-BR.json b/packages/shared/locales/pt-BR.json
index 5a9d634cef0..06f21621413 100644
--- a/packages/shared/locales/pt-BR.json
+++ b/packages/shared/locales/pt-BR.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Minhas Carteiras",
         "profiles": "Perfis",
         "dev": "Dev",
-        "createAccount": "Criar uma Carteira",
+        "createWallet": "Criar uma Carteira",
         "addAWallet": "Add a wallet",
         "accountName": "Nome da carteira",
         "latestTransactions": "Últimas transações",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "O nome da sua carteira não pode ser maior que {length, plural, one {# caractere} other {# caracteres}}.",
             "emptyName": "O nome do perfil deve conter pelo menos 1 caractere.",
diff --git a/packages/shared/locales/pt-PT.json b/packages/shared/locales/pt-PT.json
index 832bd5903ac..1dce59c45a0 100644
--- a/packages/shared/locales/pt-PT.json
+++ b/packages/shared/locales/pt-PT.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "As minhas Carteiras",
         "profiles": "Perfis",
         "dev": "Dev",
-        "createAccount": "Criar uma Carteira",
+        "createWallet": "Criar uma Carteira",
         "addAWallet": "Add a wallet",
         "accountName": "Nome da carteira",
         "latestTransactions": "Últimas transações",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/ro.json b/packages/shared/locales/ro.json
index 62c850847f7..3f459589d34 100644
--- a/packages/shared/locales/ro.json
+++ b/packages/shared/locales/ro.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "My Wallets",
         "profiles": "Profiles",
         "dev": "Dev",
-        "createAccount": "Create a Wallet",
+        "createWallet": "Create a Wallet",
         "addAWallet": "Add a wallet",
         "accountName": "Wallet name",
         "latestTransactions": "Latest Transactions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/ru.json b/packages/shared/locales/ru.json
index a1543ca0c72..b32963761fb 100644
--- a/packages/shared/locales/ru.json
+++ b/packages/shared/locales/ru.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Мои кошельки",
         "profiles": "Профили",
         "dev": "Разработчик",
-        "createAccount": "Создать кошелёк",
+        "createWallet": "Создать кошелёк",
         "addAWallet": "Добавить кошелек",
         "accountName": "Имя кошелька",
         "latestTransactions": "Последние Транзакции",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Неправильный тип адреса"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "Адрес не может быть найден в вашем аккаунте.",
             "length": "Имя твоего профиля не может быть длиннее {length, plural, one {# символ} other {# символов}}.",
             "emptyName": "Имя профиля должно содержать хотя бы 1 символ.",
diff --git a/packages/shared/locales/si.json b/packages/shared/locales/si.json
index 3607bdc15df..8ebc7b416ed 100644
--- a/packages/shared/locales/si.json
+++ b/packages/shared/locales/si.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "මගේ පසුම්බි",
         "profiles": "පැතිකඩ",
         "dev": "දේව්",
-        "createAccount": "Wallet එකක් සාදන්න",
+        "createWallet": "Wallet එකක් සාදන්න",
         "addAWallet": "මුදල් පසුම්බියක් එකතු කරන්න",
         "accountName": "පසුම්බියේ නම",
         "latestTransactions": "නවතම ගනුදෙනු",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "ඔබේ මුදල් පසුම්බියට වඩා දිගු විය නොහැක {length, plural, one {# ස්වභාවය} other {අක්ෂර #}}.",
             "emptyName": "පැතිකඩ නමක අවම වශයෙන් අනුලකුණු 1ක් වත් අඩංගු විය යුතුය.",
diff --git a/packages/shared/locales/sk.json b/packages/shared/locales/sk.json
index 08e479437e3..b77452e0de5 100644
--- a/packages/shared/locales/sk.json
+++ b/packages/shared/locales/sk.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Moje peňaženky",
         "profiles": "Profily",
         "dev": "Vývojár",
-        "createAccount": "Vytvoriť peňaženku",
+        "createWallet": "Vytvoriť peňaženku",
         "addAWallet": "Pridať peňaženku",
         "accountName": "Názov peňaženky",
         "latestTransactions": "Posledné transakcie",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "Názov profilu musí obsahovať aspoň 1 znak.",
diff --git a/packages/shared/locales/sl.json b/packages/shared/locales/sl.json
index 5ae146f358b..c044f4a7ae5 100644
--- a/packages/shared/locales/sl.json
+++ b/packages/shared/locales/sl.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Moje denarnice",
         "profiles": "Profili",
         "dev": "Dev",
-        "createAccount": "Ustvari denarnico",
+        "createWallet": "Ustvari denarnico",
         "addAWallet": "Add a wallet",
         "accountName": "Ime denarnice",
         "latestTransactions": "Zadnje transakcije",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/sq.json b/packages/shared/locales/sq.json
index 6c329af3f15..9a6baa26a99 100644
--- a/packages/shared/locales/sq.json
+++ b/packages/shared/locales/sq.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "My Wallets",
         "profiles": "Profiles",
         "dev": "Dev",
-        "createAccount": "Create a Wallet",
+        "createWallet": "Create a Wallet",
         "addAWallet": "Add a wallet",
         "accountName": "Wallet name",
         "latestTransactions": "Latest Transactions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/sr.json b/packages/shared/locales/sr.json
index edbce3db3b5..b37cc6ca69e 100644
--- a/packages/shared/locales/sr.json
+++ b/packages/shared/locales/sr.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "My Wallets",
         "profiles": "Профили",
         "dev": "Dev",
-        "createAccount": "Create a Wallet",
+        "createWallet": "Create a Wallet",
         "addAWallet": "Add a wallet",
         "accountName": "Wallet name",
         "latestTransactions": "Latest Transactions",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/sv.json b/packages/shared/locales/sv.json
index 613d308705d..4c5d67b1a79 100644
--- a/packages/shared/locales/sv.json
+++ b/packages/shared/locales/sv.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Mina plånböcker",
         "profiles": "Profiler",
         "dev": "Utvecklare",
-        "createAccount": "Skapa en plånbok",
+        "createWallet": "Skapa en plånbok",
         "addAWallet": "Lägg till en plånbok",
         "accountName": "Plånboksnamn",
         "latestTransactions": "Senaste transaktionerna",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Ditt plånboksnamn kan inte vara längre än {length, plural, one {# tecken} other {# tecken}}.",
             "emptyName": "Ett profilnamn måste innehålla minst 1 tecken.",
diff --git a/packages/shared/locales/tr.json b/packages/shared/locales/tr.json
index 0165c03c958..3c2324a315c 100644
--- a/packages/shared/locales/tr.json
+++ b/packages/shared/locales/tr.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Cüzdanlarım",
         "profiles": "Profiller",
         "dev": "Geliştirici",
-        "createAccount": "Cüzdan Oluştur",
+        "createWallet": "Cüzdan Oluştur",
         "addAWallet": "Cüzdan ekle",
         "accountName": "Cüzdan adı",
         "latestTransactions": "Son transferler",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Cüzdan adınız şundan uzun olamaz {length, plural, one {# karakter} other {# karakterler}}.\n",
             "emptyName": "hata -> hesap -> boş ad",
diff --git a/packages/shared/locales/uk.json b/packages/shared/locales/uk.json
index ae4019e50c8..6204fcf8c99 100644
--- a/packages/shared/locales/uk.json
+++ b/packages/shared/locales/uk.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Мої гаманці",
         "profiles": "Профілі",
         "dev": "Розробник",
-        "createAccount": "Створити гаманець",
+        "createWallet": "Створити гаманець",
         "addAWallet": "Add a wallet",
         "accountName": "Назва гаманця",
         "latestTransactions": "Останні транзакції",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/ur.json b/packages/shared/locales/ur.json
index bcb4ba4b26e..308f213ca0b 100644
--- a/packages/shared/locales/ur.json
+++ b/packages/shared/locales/ur.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "میرا والیٹ",
         "profiles": "پروفائلز",
         "dev": "ڈیو",
-        "createAccount": "ایک نیا والیٹ بنائیں",
+        "createWallet": "ایک نیا والیٹ بنائیں",
         "addAWallet": "Add a wallet",
         "accountName": "والیٹ کا نام",
         "latestTransactions": "تازہ ترین ٹرانزیکشن",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/vi.json b/packages/shared/locales/vi.json
index 52e644fd223..fc5be47ce48 100644
--- a/packages/shared/locales/vi.json
+++ b/packages/shared/locales/vi.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "Ví của tôi",
         "profiles": "Hồ sơ cá nhân",
         "dev": "Nhà phát triển",
-        "createAccount": "Khởi tạo ví",
+        "createWallet": "Khởi tạo ví",
         "addAWallet": "Add a wallet",
         "accountName": "Tên ví",
         "latestTransactions": "Các giao dịch mới nhất",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "Wrong address type"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "The address cannot be found in your account.",
             "length": "Your wallet name can't be longer than {length, plural, one {# character} other {# characters}}.",
             "emptyName": "A profile name must contain at least 1 character.",
diff --git a/packages/shared/locales/zh-CN.json b/packages/shared/locales/zh-CN.json
index 87d7d65ebb0..f0e068e567e 100644
--- a/packages/shared/locales/zh-CN.json
+++ b/packages/shared/locales/zh-CN.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "我的钱包",
         "profiles": "用户配置",
         "dev": "开发者",
-        "createAccount": "创建钱包",
+        "createWallet": "创建钱包",
         "addAWallet": "添加新钱包",
         "accountName": "钱包名称",
         "latestTransactions": "最新交易",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "错误的地址类型"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "在您的帐户中找不到地址。",
             "length": "您的钱包名称不能超过 {length, plural, one {1 个字符} other {# 字符}}。",
             "emptyName": "配置文件名称必须包含至少 1 个字符。",
diff --git a/packages/shared/locales/zh-TW.json b/packages/shared/locales/zh-TW.json
index af612c5f8dd..7d80a582a80 100644
--- a/packages/shared/locales/zh-TW.json
+++ b/packages/shared/locales/zh-TW.json
@@ -1502,7 +1502,7 @@
         "myAccounts": "我的錢包",
         "profiles": "設定檔",
         "dev": "開發者",
-        "createAccount": "建立一個錢包",
+        "createWallet": "建立一個錢包",
         "addAWallet": "新增錢包",
         "accountName": "錢包名稱",
         "latestTransactions": "最新交易",
@@ -1911,7 +1911,7 @@
         "address": {
             "wrongAddressType": "地址類型錯誤"
         },
-        "account": {
+        "wallet": {
             "addressNotFound": "從你的帳戶中找不到此地址。",
             "length": "您的錢包名稱長度不能超過 {length, plural, one {# 字元} other {# 字元}}。",
             "emptyName": "設定檔名稱需包含至少1個字元。",