diff --git a/apps/desktop/src/app/App.tsx b/apps/desktop/src/app/App.tsx
index 6499b5728..e655b4bb8 100644
--- a/apps/desktop/src/app/App.tsx
+++ b/apps/desktop/src/app/App.tsx
@@ -326,8 +326,7 @@ export const Loader: FC = () => {
             tgAuthBotId: REACT_APP_TG_BOT_ID,
             stonfiReferralAddress: REACT_APP_STONFI_REFERRAL_ADDRESS
         },
-        defaultWalletVersion:
-            isV5R1Enabled(config) || devSettings.enableV5 ? WalletVersion.V5R1 : WalletVersion.V4R2
+        defaultWalletVersion: WalletVersion.V5R1
     };
 
     return (
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 483a47a52..7ef079974 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -1,7 +1,7 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { localizationText } from '@tonkeeper/core/dist/entries/language';
-import { Network, getApiConfig } from '@tonkeeper/core/dist/entries/network';
-import { WalletState, WalletVersion } from "@tonkeeper/core/dist/entries/wallet";
+import { getApiConfig } from '@tonkeeper/core/dist/entries/network';
+import { WalletVersion } from "@tonkeeper/core/dist/entries/wallet";
 import { InnerBody, useWindowsScroll } from '@tonkeeper/uikit/dist/components/Body';
 import { CopyNotification } from '@tonkeeper/uikit/dist/components/CopyNotification';
 import { Footer, FooterGlobalStyle } from '@tonkeeper/uikit/dist/components/Footer';
@@ -38,8 +38,8 @@ import Initialize, { InitializeContainer } from '@tonkeeper/uikit/dist/pages/imp
 import { useKeyboardHeight } from '@tonkeeper/uikit/dist/pages/import/hooks';
 import { UserThemeProvider } from '@tonkeeper/uikit/dist/providers/UserThemeProvider';
 import { useUserFiat } from '@tonkeeper/uikit/dist/state/fiat';
-import { isV5R1Enabled, useTonendpoint, useTonenpointConfig } from "@tonkeeper/uikit/dist/state/tonendpoint";
-import { useActiveAccountQuery, useAccountsStateQuery } from "@tonkeeper/uikit/dist/state/wallet";
+import { useTonendpoint, useTonenpointConfig } from "@tonkeeper/uikit/dist/state/tonendpoint";
+import { useActiveAccountQuery, useAccountsStateQuery, useActiveTonNetwork } from "@tonkeeper/uikit/dist/state/wallet";
 import { Container, GlobalStyle } from '@tonkeeper/uikit/dist/styles/globalStyle';
 import React, { FC, PropsWithChildren, Suspense, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -49,6 +49,8 @@ import { BrowserAppSdk } from './libs/appSdk';
 import { useAnalytics, useAppHeight, useAppWidth } from './libs/hooks';
 import { useUserLanguage } from "@tonkeeper/uikit/dist/state/language";
 import { useDevSettings } from "@tonkeeper/uikit/dist/state/dev";
+import { ModalsRoot } from "@tonkeeper/uikit/dist/components/ModalsRoot";
+import { Account } from "@tonkeeper/core/dist/entries/account";
 
 const ImportRouter = React.lazy(() => import('@tonkeeper/uikit/dist/pages/import'));
 const Settings = React.lazy(() => import('@tonkeeper/uikit/dist/pages/settings'));
@@ -178,8 +180,9 @@ const Wrapper = styled(FullSizeWrapper)<{ standalone: boolean }>`
 `;
 
 export const Loader: FC = () => {
-    const { data: activeWallet, isLoading: activeWalletLoading } = useActiveAccountQuery();
-    const { data: wallets, isLoading: isWalletsLoading } = useAccountsStateQuery();
+    const network = useActiveTonNetwork();
+    const { data: activeAccount, isLoading: activeWalletLoading } = useActiveAccountQuery();
+    const { data: accounts, isLoading: isWalletsLoading } = useAccountsStateQuery();
     const { data: lang, isLoading: isLangLoading } = useUserLanguage();
     const { data: fiat } = useUserFiat();
     const { data: devSettings } = useDevSettings();
@@ -194,7 +197,7 @@ export const Loader: FC = () => {
     const tonendpoint = useTonendpoint({
           targetEnv: TARGET_ENV,
           build: sdk.version,
-          network: activeWallet?.network,
+          network,
           lang
     });
     const { data: config } = useTonenpointConfig(tonendpoint);
@@ -202,11 +205,11 @@ export const Loader: FC = () => {
     const navigate = useNavigate();
     useAppHeight();
 
-    const { data: tracker } = useAnalytics(activeWallet || undefined, wallets, sdk.version);
+    const { data: tracker } = useAnalytics(activeAccount || undefined, accounts, sdk.version);
 
     useEffect(() => {
         if (
-            activeWallet &&
+            activeAccount &&
             lang &&
             i18n.language !== localizationText(lang)
         ) {
@@ -214,7 +217,7 @@ export const Loader: FC = () => {
                 i18n.changeLanguage(localizationText(lang))
             );
         }
-    }, [activeWallet, i18n]);
+    }, [activeAccount, i18n]);
 
     if (
         isWalletsLoading ||
@@ -228,7 +231,6 @@ export const Loader: FC = () => {
         return <Loading />;
     }
 
-    const network = activeWallet?.network ?? Network.MAINNET;
     const context: IAppContext = {
         api: getApiConfig(config, network),
         fiat,
@@ -238,7 +240,7 @@ export const Loader: FC = () => {
         extension: false,
         proFeatures: false,
         ios,
-        defaultWalletVersion: (isV5R1Enabled(config) || devSettings.enableV5) ? WalletVersion.V5R1 : WalletVersion.V4R2
+        defaultWalletVersion: WalletVersion.V5R1
     };
 
     return (
@@ -248,11 +250,12 @@ export const Loader: FC = () => {
                     value={() => navigate(AppRoute.home, { replace: true })}
                 >
                     <AppContext.Provider value={context}>
-                        <Content activeWallet={activeWallet} lock={lock} standalone={standalone} />
+                        <Content activeAccount={activeAccount} lock={lock} standalone={standalone} />
                         <CopyNotification hideSimpleCopyNotifications={!standalone} />
                         <Suspense fallback={<></>}>
                             <QrScanner />
                         </Suspense>
+                        <ModalsRoot />
                     </AppContext.Provider>
                 </AfterImportAction.Provider>
             </OnImportAction.Provider>
@@ -261,10 +264,10 @@ export const Loader: FC = () => {
 };
 
 export const Content: FC<{
-    activeWallet?: WalletState | null;
+    activeAccount?: Account | null;
     lock: boolean;
     standalone: boolean;
-}> = ({ activeWallet, lock, standalone }) => {
+}> = ({ activeAccount, lock, standalone }) => {
     const location = useLocation();
     useWindowsScroll();
     useAppWidth(standalone);
@@ -298,7 +301,7 @@ export const Content: FC<{
         );
     }
 
-    if (!activeWallet || location.pathname.startsWith(AppRoute.import)) {
+    if (!activeAccount || location.pathname.startsWith(AppRoute.import)) {
         return (
             <FullSizeWrapper standalone={false}>
                 <Suspense fallback={<Loading />}>
diff --git a/apps/web/src/libs/hooks.ts b/apps/web/src/libs/hooks.ts
index 1b3702f1b..247f8a6d6 100644
--- a/apps/web/src/libs/hooks.ts
+++ b/apps/web/src/libs/hooks.ts
@@ -1,11 +1,12 @@
 import { useQuery } from '@tanstack/react-query';
-import { WalletsState, WalletState } from "@tonkeeper/core/dist/entries/wallet";
+import { Account } from "@tonkeeper/core/dist/entries/account";
 import { throttle } from '@tonkeeper/core/dist/utils/common';
 import { Analytics, AnalyticsGroup, toWalletType } from '@tonkeeper/uikit/dist/hooks/analytics';
 import { AptabaseWeb } from '@tonkeeper/uikit/dist/hooks/analytics/aptabase-web';
 import { Gtag } from '@tonkeeper/uikit/dist/hooks/analytics/gtag';
 import { QueryKey } from '@tonkeeper/uikit/dist/libs/queryKey';
 import { useEffect } from 'react';
+import { useActiveTonNetwork } from "@tonkeeper/uikit/dist/state/wallet";
 
 export const useAppHeight = () => {
     useEffect(() => {
@@ -48,12 +49,13 @@ export const useAppWidth = (standalone: boolean) => {
 };
 
 export const useAnalytics = (
-    activeWallet?: WalletState,
-    wallets?: WalletsState,
+    activeAccount?: Account,
+    accounts?: Account[],
     version?: string
 ) => {
+    const network = useActiveTonNetwork();
     return useQuery<Analytics>(
-        [QueryKey.analytics],
+        [QueryKey.analytics, network],
         async () => {
             const tracker = new AnalyticsGroup(
                 new AptabaseWeb(
@@ -64,12 +66,17 @@ export const useAnalytics = (
                 new Gtag(import.meta.env.VITE_APP_MEASUREMENT_ID)
             );
 
-            tracker.init('Web',  toWalletType(activeWallet),
-              activeWallet,
-              wallets,);
+            tracker.init({
+                application: 'Web',
+                walletType: toWalletType(activeAccount?.activeTonWallet),
+                activeAccount: activeAccount!,
+                accounts: accounts!,
+                network
+            }
+        );
 
             return tracker;
         },
-      { enabled: wallets != null && activeWallet !== undefined }
+      { enabled: accounts != null && activeAccount !== undefined }
     );
 };
diff --git a/packages/core/src/entries/account.ts b/packages/core/src/entries/account.ts
index d0d1adeab..216c69f41 100644
--- a/packages/core/src/entries/account.ts
+++ b/packages/core/src/entries/account.ts
@@ -14,6 +14,7 @@ export interface DeprecatedAccountState {
 export type AccountId = string;
 
 export interface IAccount {
+    id: AccountId;
     name: string;
     emoji: string;
 
@@ -51,6 +52,9 @@ export class AccountTonMnemonic extends Clonable implements IAccount {
         return this.tonWallets.find(w => w.id === this.activeTonWalletId)!;
     }
 
+    /**
+     *  @param id ton public key hex string without 0x corresponding to the mnemonic
+     */
     constructor(
         public readonly id: AccountId,
         public name: string,
@@ -75,7 +79,12 @@ export class AccountTonMnemonic extends Clonable implements IAccount {
     }
 
     addTonWalletToActiveDerivation(wallet: TonWalletStandard) {
-        this.tonWallets.push(wallet);
+        const walletExists = this.tonWallets.findIndex(w => w.id === wallet.id);
+        if (walletExists === -1) {
+            this.tonWallets = this.tonWallets.concat(wallet);
+        } else {
+            this.tonWallets[walletExists] = wallet;
+        }
     }
 
     removeTonWalletFromActiveDerivation(walletId: WalletId) {
@@ -90,6 +99,9 @@ export class AccountTonMnemonic extends Clonable implements IAccount {
     }
 
     setActiveTonWallet(walletId: WalletId) {
+        if (this.tonWallets.every(w => w.id !== walletId)) {
+            throw new Error('Wallet not found');
+        }
         this.activeTonWalletId = walletId;
     }
 }
@@ -116,6 +128,9 @@ export class AccountLedger extends Clonable implements IAccount {
         )!;
     }
 
+    /**
+     *  @param id index 0 derivation ton public key hex string without 0x
+     */
     constructor(
         public readonly id: AccountId,
         public name: string,
@@ -143,7 +158,12 @@ export class AccountLedger extends Clonable implements IAccount {
     }
 
     addTonWalletToActiveDerivation(wallet: TonWalletStandard) {
-        this.activeDerivation.tonWallets.push(wallet);
+        const walletExists = this.activeDerivation.tonWallets.findIndex(w => w.id === wallet.id);
+        if (walletExists === -1) {
+            this.activeDerivation.tonWallets = this.activeDerivation.tonWallets.concat(wallet);
+        } else {
+            this.activeDerivation.tonWallets[walletExists] = wallet;
+        }
     }
 
     removeTonWalletFromActiveDerivation(walletId: WalletId) {
@@ -161,8 +181,8 @@ export class AccountLedger extends Clonable implements IAccount {
 
     setActiveTonWallet(walletId: WalletId) {
         for (const derivation of this.derivations) {
-            const index = derivation.tonWallets.findIndex(w => w.id === walletId);
-            if (index !== -1) {
+            const walletInDerivation = derivation.tonWallets.some(w => w.id === walletId);
+            if (walletInDerivation) {
                 derivation.activeTonWalletId = walletId;
                 this.activeDerivationIndex = derivation.index;
                 return;
@@ -188,6 +208,9 @@ export class AccountKeystone extends Clonable implements IAccount {
         return this.tonWallet;
     }
 
+    /**
+     *  @param id ton public key hex string without 0x
+     */
     constructor(
         public readonly id: AccountId,
         public name: string,
@@ -236,6 +259,9 @@ export class AccountTonOnly extends Clonable implements IAccount {
         return this.tonWallets.find(w => w.id === this.activeTonWalletId)!;
     }
 
+    /**
+     *  @param id ton public key hex string without 0x
+     */
     constructor(
         public readonly id: AccountId,
         public name: string,
@@ -260,7 +286,12 @@ export class AccountTonOnly extends Clonable implements IAccount {
     }
 
     addTonWalletToActiveDerivation(wallet: TonWalletStandard) {
-        this.tonWallets.push(wallet);
+        const walletExists = this.tonWallets.findIndex(w => w.id === wallet.id);
+        if (walletExists === -1) {
+            this.tonWallets = this.tonWallets.concat(wallet);
+        } else {
+            this.tonWallets[walletExists] = wallet;
+        }
     }
 
     removeTonWalletFromActiveDerivation(walletId: WalletId) {
@@ -275,6 +306,10 @@ export class AccountTonOnly extends Clonable implements IAccount {
     }
 
     setActiveTonWallet(walletId: WalletId) {
+        if (this.tonWallets.every(w => w.id !== walletId)) {
+            throw new Error('Wallet not found');
+        }
+
         this.activeTonWalletId = walletId;
     }
 }
diff --git a/packages/core/src/service/accountsStorage.ts b/packages/core/src/service/accountsStorage.ts
index 54c6e7f1b..fbf9a2b0f 100644
--- a/packages/core/src/service/accountsStorage.ts
+++ b/packages/core/src/service/accountsStorage.ts
@@ -18,6 +18,7 @@ import { DeprecatedAccountState } from '../entries/account';
 import { AuthState, DeprecatedAuthState } from '../entries/password';
 import { assertUnreachable, notNullish } from '../utils/types';
 import {
+    getFallbackAccountEmoji,
     getFallbackDerivationItemEmoji,
     getFallbackTonStandardWalletEmoji,
     getWalletNameAddress
@@ -69,6 +70,10 @@ export class AccountsStorage {
     };
 
     setActiveAccountId = async (activeAccountId: AccountId | null) => {
+        const accounts = await this.getAccounts();
+        if (accounts.every(a => a.id !== activeAccountId)) {
+            throw new Error('Account not found');
+        }
         await this.storage.set(AppKey.ACTIVE_ACCOUNT_ID, activeAccountId);
     };
 
@@ -78,9 +83,15 @@ export class AccountsStorage {
 
     addAccountsToState = async (accounts: Account[]) => {
         const state = await this.getAccounts();
-        await this.setAccounts(
-            state.concat(accounts.filter(acc => state.every(a => a.id !== acc.id)))
-        );
+        accounts.forEach(account => {
+            const existingAccIndex = state.findIndex(a => a.id === account.id);
+            if (existingAccIndex !== -1) {
+                state[existingAccIndex] = account;
+                return;
+            }
+            state.push(account);
+        });
+        await this.setAccounts(state);
     };
 
     /**
@@ -121,6 +132,14 @@ export class AccountsStorage {
         await this.setAccounts(state.filter(w => w.id !== id));
     };
 
+    async getNewAccountNameAndEmoji(accountId: AccountId) {
+        const existingAccounts = await this.getAccounts();
+        const existingAccount = existingAccounts.find(a => a.id === accountId);
+        const name = existingAccount?.name || 'Account ' + (existingAccounts.length + 1);
+        const emoji = existingAccount?.emoji || getFallbackAccountEmoji(accountId);
+        return { name, emoji };
+    }
+
     private migrateToActiveAccountIdState = async (): Promise<WalletId | null> => {
         const state = await this.storage.get<DeprecatedAccountState>(AppKey.DEPRECATED_ACCOUNT);
         if (!state || !state.activePublicKey) {
diff --git a/packages/core/src/service/devStorage.ts b/packages/core/src/service/devStorage.ts
index 5a7eff0e0..fbcd909e2 100644
--- a/packages/core/src/service/devStorage.ts
+++ b/packages/core/src/service/devStorage.ts
@@ -3,12 +3,10 @@ import { Network } from '../entries/network';
 import { AppKey } from '../Keys';
 
 export interface DevSettings {
-    enableV5: boolean;
     tonNetwork: Network;
 }
 
 const defaultDevSettings: DevSettings = {
-    enableV5: false,
     tonNetwork: Network.MAINNET
 };
 
diff --git a/packages/core/src/service/walletService.ts b/packages/core/src/service/walletService.ts
index 710e76e89..80877bb7f 100644
--- a/packages/core/src/service/walletService.ts
+++ b/packages/core/src/service/walletService.ts
@@ -18,9 +18,12 @@ import {
     AccountTonMnemonic,
     AccountTonOnly
 } from '../entries/account';
+import { IStorage } from '../Storage';
+import { accountsStorage } from './accountsStorage';
 
 export const createStandardTonAccountByMnemonic = async (
     appContext: { api: APIConfig; defaultWalletVersion: WalletVersion },
+    storage: IStorage,
     mnemonic: string[],
     options: {
         versions?: WalletVersion[];
@@ -54,10 +57,12 @@ export const createStandardTonAccountByMnemonic = async (
         walletAuth = options.auth;
     }
 
+    const { name, emoji } = await accountsStorage(storage).getNewAccountNameAndEmoji(publicKey);
+
     return new AccountTonMnemonic(
         publicKey,
-        getFallbackAccountName(publicKey),
-        getFallbackAccountEmoji(publicKey),
+        name,
+        emoji,
         walletAuth,
         tonWallets[0].rawAddress,
         tonWallets.map(w => ({
@@ -160,6 +165,7 @@ export const getWalletsAddresses = (
 
 export const accountBySignerQr = async (
     appContext: { api: APIConfig; defaultWalletVersion: WalletVersion },
+    storage: IStorage,
     qrCode: string
 ): Promise<AccountTonOnly> => {
     if (!qrCode.startsWith('tonkeeper://signer')) {
@@ -182,10 +188,14 @@ export const accountBySignerQr = async (
     // TODO support multiple wallets versions configuration
     const active = await findWalletAddress(appContext, publicKey);
 
+    const { name: fallbackName, emoji } = await accountsStorage(storage).getNewAccountNameAndEmoji(
+        publicKey
+    );
+
     return new AccountTonOnly(
         publicKey,
-        name || getFallbackAccountName(publicKey),
-        getFallbackAccountEmoji(publicKey),
+        name || fallbackName,
+        emoji,
         { kind: 'signer' },
         active.rawAddress,
         [
@@ -203,15 +213,20 @@ export const accountBySignerQr = async (
 
 export const accountBySignerDeepLink = async (
     appContext: { api: APIConfig; defaultWalletVersion: WalletVersion },
+    storage: IStorage,
     publicKey: string,
     name: string | null
 ): Promise<AccountTonOnly> => {
     const active = await findWalletAddress(appContext, publicKey);
 
+    const { name: fallbackName, emoji } = await accountsStorage(storage).getNewAccountNameAndEmoji(
+        publicKey
+    );
+
     return new AccountTonOnly(
         publicKey,
-        name || getFallbackAccountName(publicKey),
-        getFallbackAccountEmoji(publicKey),
+        name || fallbackName,
+        emoji,
         { kind: 'signer-deeplink' },
         active.rawAddress,
         [
@@ -228,6 +243,7 @@ export const accountBySignerDeepLink = async (
 };
 
 export const accountByLedger = (
+    accountId: string,
     walletsInfo: {
         address: string;
         publicKey: Buffer;
@@ -236,9 +252,9 @@ export const accountByLedger = (
     name: string,
     emoji: string
 ): AccountLedger => {
-    const zeroAccPublicKey = walletsInfo[0].publicKey.toString('hex');
+    // const zeroAccPublicKey = walletsInfo[0].publicKey.toString('hex');
     return new AccountLedger(
-        zeroAccPublicKey,
+        accountId,
         name,
         emoji,
         walletsInfo[0].accountIndex,
@@ -267,7 +283,7 @@ export const accountByLedger = (
     );
 };
 
-export const accountByKeystone = (ur: UR): AccountKeystone => {
+export const accountByKeystone = async (ur: UR, storage: IStorage): Promise<AccountKeystone> => {
     const account = parseTonAccount(ur);
     const contact = WalletContractV4.create({
         workchain: 0,
@@ -277,20 +293,18 @@ export const accountByKeystone = (ur: UR): AccountKeystone => {
     const pathInfo =
         account.path && account.xfp ? { path: account.path, mfp: account.xfp } : undefined;
 
-    return new AccountKeystone(
-        account.publicKey,
-        getFallbackAccountName(account.publicKey),
-        getFallbackAccountEmoji(account.publicKey),
-        pathInfo,
-        {
-            id: contact.address.toRawString(),
-            publicKey: account.publicKey,
-            version: WalletVersion.V4R2,
-            rawAddress: contact.address.toRawString(),
-            name: getFallbackWalletName(contact.address.toRawString()),
-            emoji: getFallbackTonStandardWalletEmoji(account.publicKey, WalletVersion.V4R2)
-        }
+    const { name, emoji } = await accountsStorage(storage).getNewAccountNameAndEmoji(
+        account.publicKey
     );
+
+    return new AccountKeystone(account.publicKey, name, emoji, pathInfo, {
+        id: contact.address.toRawString(),
+        publicKey: account.publicKey,
+        version: WalletVersion.V4R2,
+        rawAddress: contact.address.toRawString(),
+        name: getFallbackWalletName(contact.address.toRawString()),
+        emoji: getFallbackTonStandardWalletEmoji(account.publicKey, WalletVersion.V4R2)
+    });
 };
 
 export function getFallbackAccountEmoji(publicKey: string) {
diff --git a/packages/uikit/src/components/Header.tsx b/packages/uikit/src/components/Header.tsx
index 8ddba6556..d4080ab99 100644
--- a/packages/uikit/src/components/Header.tsx
+++ b/packages/uikit/src/components/Header.tsx
@@ -9,7 +9,8 @@ import {
     useActiveWallet,
     useAccountsState,
     useMutateActiveTonWallet,
-    useActiveTonNetwork
+    useActiveTonNetwork,
+    useActiveAccount
 } from '../state/wallet';
 import { DropDown } from './DropDown';
 import { DoneIcon, DownIcon, PlusIcon, SettingsIcon } from './Icon';
@@ -20,7 +21,8 @@ import { ScanButton } from './connect/ScanButton';
 import { ImportNotification } from './create/ImportNotification';
 import { SkeletonText } from './shared/Skeleton';
 import { WalletEmoji } from './shared/emoji/WalletEmoji';
-import { TonWalletStandard } from '@tonkeeper/core/dist/entries/wallet';
+import { TonWalletStandard, walletVersionText } from '@tonkeeper/core/dist/entries/wallet';
+import { Account } from '@tonkeeper/core/dist/entries/account';
 
 const Block = styled.div<{
     center?: boolean;
@@ -101,6 +103,7 @@ const Icon = styled.span`
     padding-left: 0.5rem;
     color: ${props => props.theme.accentBlue};
     display: flex;
+    margin-left: auto;
 `;
 
 const Row = styled.div`
@@ -118,10 +121,40 @@ const Row = styled.div`
     }
 `;
 
+const Badge = styled.div`
+    padding: 2px 4px;
+    margin-left: -4px;
+    height: fit-content;
+    background: ${p => p.theme.backgroundContentAttention};
+    border-radius: 3px;
+    color: ${p => p.theme.textSecondary};
+    font-size: 9px;
+    font-style: normal;
+    font-weight: 510;
+    line-height: 12px;
+`;
+
+const ListItemPayloadStyled = styled(ListItemPayload)`
+    justify-content: flex-start;
+`;
+
+const ColumnTextStyled = styled(ColumnText)`
+    flex-grow: 0;
+`;
+
+const DropDownContainerStyle = createGlobalStyle`
+  .header-dd-container {
+    margin-left: -135px;
+    width: 270px;
+  }
+`;
+
 const WalletRow: FC<{
+    account: Account;
     walletState: TonWalletStandard;
     onClose: () => void;
-}> = ({ walletState, onClose }) => {
+    badge?: string;
+}> = ({ account, walletState, onClose, badge }) => {
     const network = useActiveTonNetwork();
     const { mutate } = useMutateActiveTonWallet();
     const address = toShortValue(formatAddress(walletState.rawAddress, network));
@@ -134,15 +167,16 @@ const WalletRow: FC<{
                 onClose();
             }}
         >
-            <ListItemPayload>
-                <WalletEmoji emoji={walletState.emoji} />
-                <ColumnText noWrap text={walletState.name} secondary={address} />
+            <ListItemPayloadStyled>
+                <WalletEmoji emoji={account.emoji} />
+                <ColumnTextStyled noWrap text={account.name} secondary={address} />
+                {badge && <Badge>{badge}</Badge>}
                 {activeWallet?.id === walletState.id ? (
                     <Icon>
                         <DoneIcon />
                     </Icon>
                 ) : undefined}
-            </ListItemPayload>
+            </ListItemPayloadStyled>
         </ListItem>
     );
 };
@@ -153,13 +187,41 @@ const DropDownPayload: FC<{ onClose: () => void; onCreate: () => void }> = ({
 }) => {
     const navigate = useNavigate();
     const { t } = useTranslation();
-    const wallets = useAccountsState().flatMap(a => a.allTonWallets);
-
-    if (!wallets) {
+    const accountsWallets: { wallet: TonWalletStandard; account: Account; badge?: string }[] =
+        useAccountsState().flatMap(a => {
+            if (a.type === 'ledger') {
+                return a.derivations.map(
+                    d =>
+                        ({
+                            wallet: d.tonWallets.find(w => w.id === d.activeTonWalletId)!,
+                            account: a,
+                            badge: `LEDGER #${d.index}`
+                        } as { wallet: TonWalletStandard; account: Account; badge?: string })
+                );
+            }
+
+            return a.allTonWallets.map(
+                w =>
+                    ({
+                        wallet: w,
+                        account: a,
+                        badge:
+                            a.type === 'ton-only'
+                                ? 'SIGNER'
+                                : a.type === 'keystone'
+                                ? 'KEYSTONE'
+                                : a.allTonWallets.length > 1
+                                ? walletVersionText(w.version)
+                                : undefined
+                    } as { wallet: TonWalletStandard; account: Account; badge?: string })
+            );
+        });
+
+    if (!accountsWallets) {
         return null;
     }
 
-    if (wallets.length === 1) {
+    if (accountsWallets.length === 1) {
         return (
             <Row
                 onClick={() => {
@@ -176,8 +238,14 @@ const DropDownPayload: FC<{ onClose: () => void; onCreate: () => void }> = ({
     } else {
         return (
             <>
-                {wallets.map(wallet => (
-                    <WalletRow key={wallet.id} walletState={wallet} onClose={onClose} />
+                {accountsWallets.map(({ wallet, account, badge }) => (
+                    <WalletRow
+                        account={account}
+                        key={wallet.id}
+                        walletState={wallet}
+                        onClose={onClose}
+                        badge={badge}
+                    />
                 ))}
                 <Divider />
                 <Row
@@ -196,30 +264,45 @@ const DropDownPayload: FC<{ onClose: () => void; onCreate: () => void }> = ({
     }
 };
 
+const TitleStyled = styled(Title)`
+    align-items: center;
+`;
+
 export const Header: FC<{ showQrScan?: boolean }> = ({ showQrScan = true }) => {
-    const { t } = useTranslation();
-    const wallet = useActiveWallet();
+    const account = useActiveAccount();
     const [isOpen, setOpen] = useState(false);
 
     const wallets = useAccountsState();
     const shouldShowIcon = wallets.length > 1;
 
+    const accountBadge =
+        account.allTonWallets.length === 1
+            ? undefined
+            : account.type === 'ledger'
+            ? `LEDGER #${account.activeDerivation.index}`
+            : account.type === 'mnemonic'
+            ? walletVersionText(account.activeTonWallet.version)
+            : undefined;
+
     return (
         <Block center>
+            <DropDownContainerStyle />
             <DropDown
                 center
                 payload={onClose => (
                     <DropDownPayload onClose={onClose} onCreate={() => setOpen(true)} />
                 )}
+                containerClassName="header-dd-container"
             >
-                <Title>
-                    {shouldShowIcon && <WalletEmoji emoji={wallet.emoji} />}
-                    <TitleName> {wallet.name ? wallet.name : t('wallet_title')}</TitleName>
+                <TitleStyled>
+                    {shouldShowIcon && <WalletEmoji emoji={account.emoji} />}
+                    <TitleName>{account.name}</TitleName>
+                    {accountBadge && <Badge>{accountBadge}</Badge>}
 
                     <DownIconWrapper>
                         <DownIcon />
                     </DownIconWrapper>
-                </Title>
+                </TitleStyled>
             </DropDown>
 
             {showQrScan && <ScanButton />}
diff --git a/packages/uikit/src/components/create/ChoseWalletVersions.tsx b/packages/uikit/src/components/create/ChoseWalletVersions.tsx
index 5e9a9e395..2c024ac97 100644
--- a/packages/uikit/src/components/create/ChoseWalletVersions.tsx
+++ b/packages/uikit/src/components/create/ChoseWalletVersions.tsx
@@ -9,7 +9,7 @@ import {
 } from '@tonkeeper/core/dist/entries/wallet';
 import { formatAddress, toShortValue } from '@tonkeeper/core/dist/utils/common';
 import React, { FC, useEffect, useLayoutEffect, useState } from 'react';
-import { useStandardTonWalletVersions } from '../../state/wallet';
+import { useAccountState, useStandardTonWalletVersions } from '../../state/wallet';
 import { SkeletonList } from '../Skeleton';
 import { toFormattedTonBalance } from '../../hooks/balance';
 import { Checkbox } from '../fields/Checkbox';
@@ -76,6 +76,7 @@ export const ChoseWalletVersions: FC<{
     const [publicKey, setPublicKey] = useState<string | undefined>(undefined);
     const { data: wallets } = useStandardTonWalletVersions(publicKey);
     const [checkedVersions, setCheckedVersions] = useState<WalletVersion[]>([]);
+    const accountState = useAccountState(publicKey);
 
     useEffect(() => {
         mnemonicToWalletKey(mnemonic).then(keypair =>
@@ -85,6 +86,10 @@ export const ChoseWalletVersions: FC<{
 
     useLayoutEffect(() => {
         if (wallets) {
+            if (accountState) {
+                return setCheckedVersions(accountState.allTonWallets.map(w => w.version));
+            }
+
             const versionsToCheck = wallets
                 .filter(w => w.tonBalance || w.hasJettons)
                 .map(w => w.version);
@@ -93,7 +98,7 @@ export const ChoseWalletVersions: FC<{
             }
             setCheckedVersions(versionsToCheck);
         }
-    }, [wallets]);
+    }, [wallets, accountState]);
 
     const toggleVersion = (version: WalletVersion, isChecked: boolean) => {
         setCheckedVersions(state =>
diff --git a/packages/uikit/src/components/desktop/aside/AsideMenu.tsx b/packages/uikit/src/components/desktop/aside/AsideMenu.tsx
index fb2419af6..71343a1d2 100644
--- a/packages/uikit/src/components/desktop/aside/AsideMenu.tsx
+++ b/packages/uikit/src/components/desktop/aside/AsideMenu.tsx
@@ -198,7 +198,7 @@ export const AsideMenuAccount: FC<{ account: Account; isSelected: boolean }> = (
                         onClick={e => {
                             e.preventDefault();
                             e.stopPropagation();
-                            openWalletVersionSettings({ account });
+                            openWalletVersionSettings({ accountId: account.id });
                         }}
                         isShown={isHovered}
                     >
diff --git a/packages/uikit/src/components/desktop/header/DesktopHeader.tsx b/packages/uikit/src/components/desktop/header/DesktopHeader.tsx
index f6d43e326..19718b2dc 100644
--- a/packages/uikit/src/components/desktop/header/DesktopHeader.tsx
+++ b/packages/uikit/src/components/desktop/header/DesktopHeader.tsx
@@ -9,15 +9,18 @@ import { useDisclosure } from '../../../hooks/useDisclosure';
 import { usePreFetchRates } from '../../../state/rates';
 import { useTonendpointBuyMethods } from '../../../state/tonendpoint';
 import { fallbackRenderOver } from '../../Error';
-import { ArrowDownIcon, ArrowUpIcon, PlusIcon, PlusIconSmall } from "../../Icon";
-import { Num2 } from '../../Text';
+import { ArrowDownIcon, ArrowUpIcon, PlusIconSmall } from '../../Icon';
+import { Body2Class, Num2 } from '../../Text';
 import { Button } from '../../fields/Button';
 import { IconButton } from '../../fields/IconButton';
 import { Link } from 'react-router-dom';
-import { AppProRoute } from '../../../libs/routes';
+import { AppProRoute, AppRoute, SettingsRoute } from '../../../libs/routes';
 import { BuyNotification } from '../../home/BuyAction';
 import { Skeleton } from '../../shared/Skeleton';
-import { useWalletTotalBalance } from "../../../state/asset";
+import { useWalletTotalBalance } from '../../../state/asset';
+import { hexToRGBA } from '../../../libs/css';
+import { useActiveTonNetwork } from '../../../state/wallet';
+import { Network } from '@tonkeeper/core/dist/entries/network';
 
 const DesktopHeaderStyled = styled.div`
     padding-left: 1rem;
@@ -96,6 +99,26 @@ const LinkStyled = styled(Link)`
     text-decoration: unset;
 `;
 
+const TestnetBadge = styled(Link)`
+    background: ${p => hexToRGBA(p.theme.accentRed, 0.16)};
+    color: ${p => p.theme.accentRed};
+    padding: 4px 8px;
+    border-radius: ${p => p.theme.corner2xSmall};
+    border: none;
+    text-transform: uppercase;
+    margin-left: 10px;
+    margin-right: auto;
+    text-decoration: none;
+
+    transition: background 0.15s ease-in-out;
+
+    &:hover {
+        background: ${p => hexToRGBA(p.theme.accentRed, 0.36)};
+    }
+
+    ${Body2Class};
+`;
+
 const DesktopHeaderPayload = () => {
     usePreFetchRates();
     const { fiat } = useAppContext();
@@ -104,6 +127,7 @@ const DesktopHeaderPayload = () => {
     const { isOpen, onClose, onOpen } = useDisclosure();
     const { data: buy } = useTonendpointBuyMethods();
     const { t } = useTranslation();
+    const network = useActiveTonNetwork();
 
     return (
         <DesktopHeaderStyled>
@@ -114,7 +138,9 @@ const DesktopHeaderPayload = () => {
                     <Num2>{formatFiatCurrency(fiat, balance || 0)}</Num2>
                 </BalanceContainer>
             )}
-            <Num2></Num2>
+            {network === Network.TESTNET && (
+                <TestnetBadge to={AppRoute.settings + SettingsRoute.dev}>Testnet</TestnetBadge>
+            )}
             <DesktopRightPart>
                 <ButtonsContainer>
                     <ButtonStyled
diff --git a/packages/uikit/src/components/modals/WalletVersionSettingsNotification.tsx b/packages/uikit/src/components/modals/WalletVersionSettingsNotification.tsx
index a552b63cb..b8edbdc1f 100644
--- a/packages/uikit/src/components/modals/WalletVersionSettingsNotification.tsx
+++ b/packages/uikit/src/components/modals/WalletVersionSettingsNotification.tsx
@@ -2,10 +2,10 @@ import { Notification } from '../Notification';
 import { WalletVersionPageContent } from '../../pages/settings/Version';
 import { useAtom } from '../../libs/atom';
 import { useTranslation } from '../../hooks/translation';
-import { Account } from '@tonkeeper/core/dist/entries/account';
+import { AccountId } from '@tonkeeper/core/dist/entries/account';
 import { createModalControl } from './createModalControl';
 
-const { hook, control } = createModalControl<{ account?: Account }>();
+const { hook, control } = createModalControl<{ accountId?: AccountId }>();
 
 export const useWalletVersionSettingsNotification = hook;
 
@@ -17,7 +17,10 @@ export const WalletVersionSettingsNotification = () => {
     return (
         <Notification title={t('settings_version')} isOpen={!!isOpen} handleClose={() => onClose()}>
             {() => (
-                <WalletVersionPageContent afterWalletOpened={onClose} account={params?.account} />
+                <WalletVersionPageContent
+                    afterWalletOpened={onClose}
+                    accountId={params?.accountId}
+                />
             )}
         </Notification>
     );
diff --git a/packages/uikit/src/pages/import/Ledger.tsx b/packages/uikit/src/pages/import/Ledger.tsx
index 35b7347b4..fcceee506 100644
--- a/packages/uikit/src/pages/import/Ledger.tsx
+++ b/packages/uikit/src/pages/import/Ledger.tsx
@@ -3,9 +3,9 @@ import { Button } from '../../components/fields/Button';
 import { useTranslation } from '../../hooks/translation';
 import {
     LedgerAccount,
-    useAddLedgerAccountsMutation,
+    useAddLedgerAccountMutation,
     useConnectLedgerMutation,
-    useLedgerAccounts
+    useLedgerWallets
 } from '../../state/ledger';
 import React, { FC, useCallback, useEffect, useState } from 'react';
 import { LedgerTonTransport } from '@tonkeeper/core/dist/service/ledger/connector';
@@ -20,8 +20,7 @@ import { formatAddress } from '@tonkeeper/core/dist/utils/common';
 import { Checkbox } from '../../components/fields/Checkbox';
 import { LedgerConnectionSteps } from '../../components/ledger/LedgerConnectionSteps';
 import { UpdateWalletName } from '../../components/create/WalletName';
-import { getFallbackAccountEmoji } from '@tonkeeper/core/dist/service/walletService';
-import { toFormattedTonBalance } from "../../hooks/balance";
+import { toFormattedTonBalance } from '../../hooks/balance';
 
 const ConnectLedgerWrapper = styled.div`
     display: flex;
@@ -155,15 +154,16 @@ const ChooseLedgerAccounts: FC<{ tonTransport: LedgerTonTransport; onCancel: ()
 }) => {
     const { t } = useTranslation();
     const totalAccounts = 10;
-    const { mutate: getLedgerAccounts, data: ledgerAccounts } = useLedgerAccounts(totalAccounts);
+    const { mutateAsync: getLedgerWallets, data: ledgerAccountData } =
+        useLedgerWallets(totalAccounts);
     const [selectedIndexes, setSelectedIndexes] = useState<Record<number, boolean>>({});
 
-    const { mutate: addAccountsMutation, isLoading: isAdding } = useAddLedgerAccountsMutation();
+    const { mutate: addAccountsMutation, isLoading: isAdding } = useAddLedgerAccountMutation();
 
     const [accountsToAdd, setAccountsToAdd] = useState<LedgerAccount[]>();
 
     useEffect(() => {
-        getLedgerAccounts(tonTransport);
+        getLedgerWallets(tonTransport).then(data => setSelectedIndexes(data.preselectedIndexes));
     }, [tonTransport]);
 
     const chosenSomeAccounts = !!Object.values(selectedIndexes).filter(Boolean).length;
@@ -178,17 +178,24 @@ const ChooseLedgerAccounts: FC<{ tonTransport: LedgerTonTransport; onCancel: ()
             .filter(([, v]) => v)
             .map(([k]) => Number(k));
         setAccountsToAdd(
-            ledgerAccounts!.filter(account => chosenIndexes.includes(account.accountIndex))
+            ledgerAccountData!.wallets.filter(account =>
+                chosenIndexes.includes(account.accountIndex)
+            )
         );
     };
 
     if (accountsToAdd) {
-        const fallbackEmoji = getFallbackAccountEmoji(accountsToAdd[0].publicKey.toString('hex'));
         return (
             <UpdateWalletName
-                walletEmoji={fallbackEmoji}
+                walletEmoji={ledgerAccountData!.emoji}
+                name={ledgerAccountData!.name}
                 submitHandler={({ name, emoji }) =>
-                    addAccountsMutation({ name, emoji, accounts: accountsToAdd })
+                    addAccountsMutation({
+                        name,
+                        emoji,
+                        wallets: accountsToAdd,
+                        accountId: ledgerAccountData!.accountId
+                    })
                 }
             />
         );
@@ -198,13 +205,13 @@ const ChooseLedgerAccounts: FC<{ tonTransport: LedgerTonTransport; onCancel: ()
         <ConnectLedgerWrapper>
             <H2Styled>{t('ledger_choose_wallets')}</H2Styled>
             <AccountsListWrapper>
-                {!ledgerAccounts ? (
+                {!ledgerAccountData ? (
                     <AccountsLoadingWrapper>
                         <SpinnerIcon />
                     </AccountsLoadingWrapper>
                 ) : (
                     <ListBlock margin={false}>
-                        {ledgerAccounts.map(account => (
+                        {ledgerAccountData.wallets.map(account => (
                             <ListItemStyled key={account.accountIndex} hover={false}>
                                 <Body2>{toFormattedAddress(account.address)}</Body2>
                                 &nbsp;
@@ -233,7 +240,7 @@ const ChooseLedgerAccounts: FC<{ tonTransport: LedgerTonTransport; onCancel: ()
                 </Button>
                 <Button
                     primary
-                    loading={!ledgerAccounts || isAdding}
+                    loading={!ledgerAccountData || isAdding}
                     disabled={!chosenSomeAccounts}
                     onClick={onAdd}
                 >
diff --git a/packages/uikit/src/pages/settings/Dev.tsx b/packages/uikit/src/pages/settings/Dev.tsx
index 6c75cdaed..fcdbc15e8 100644
--- a/packages/uikit/src/pages/settings/Dev.tsx
+++ b/packages/uikit/src/pages/settings/Dev.tsx
@@ -21,11 +21,6 @@ export const DevSettings = React.memo(() => {
                 name: t('settings_network_alert_title'),
                 icon: network === Network.MAINNET ? 'Mainnet' : 'Testnet',
                 action: () => mutateDevSettings({ tonNetwork: switchNetwork(network) })
-            },
-            {
-                name: t('Enable wallet V5'),
-                icon: devSettings?.enableV5 ? 'Enabled' : 'Disabled',
-                action: () => mutateDevSettings({ enableV5: !devSettings?.enableV5 })
             }
         ];
     }, [t, wallet, devSettings]);
diff --git a/packages/uikit/src/pages/settings/Version.tsx b/packages/uikit/src/pages/settings/Version.tsx
index ba60cfe19..96dbd4610 100644
--- a/packages/uikit/src/pages/settings/Version.tsx
+++ b/packages/uikit/src/pages/settings/Version.tsx
@@ -5,21 +5,20 @@ import {
     walletVersionText
 } from '@tonkeeper/core/dist/entries/wallet';
 import { formatAddress, toShortValue } from '@tonkeeper/core/dist/utils/common';
-import { Account } from '@tonkeeper/core/dist/entries/account';
+import { AccountId } from '@tonkeeper/core/dist/entries/account';
 import React, { FC } from 'react';
 import styled from 'styled-components';
 import { InnerBody } from '../../components/Body';
 import { SubHeader } from '../../components/SubHeader';
 import { Body2, Label1 } from '../../components/Text';
 import { useTranslation } from '../../hooks/translation';
-import { useIsActiveWalletKeystone } from '../../state/keystone';
-import { useIsActiveWalletLedger } from '../../state/ledger';
 import {
     useStandardTonWalletVersions,
     useActiveAccount,
-    useAddTonWalletVersionToActiveAccount,
     useMutateActiveTonWallet,
-    useRemoveTonWalletVersionFromActiveAccount
+    useRemoveTonWalletVersionFromAccount,
+    useAddTonWalletVersionToAccount,
+    useAccountState
 } from '../../state/wallet';
 import { ListBlock, ListItem, ListItemPayload } from '../../components/List';
 import { toFormattedTonBalance } from '../../hooks/balance';
@@ -63,13 +62,12 @@ export const WalletVersionPage = () => {
 
 export const WalletVersionPageContent: FC<{
     afterWalletOpened?: () => void;
-    account?: Account;
-}> = ({ afterWalletOpened, account }) => {
+    accountId?: AccountId;
+}> = ({ afterWalletOpened, accountId }) => {
     const { t } = useTranslation();
-    const isLedger = useIsActiveWalletLedger();
-    const isKeystone = useIsActiveWalletKeystone();
     const activeAccount = useActiveAccount();
-    const selectedAccount = account || activeAccount;
+    const passedAccount = useAccountState(accountId);
+    const selectedAccount = passedAccount ?? activeAccount;
     const selectedWallet = selectedAccount.activeTonWallet;
     const appActiveWallet = activeAccount.activeTonWallet;
     const currentAccountWalletsVersions = selectedAccount.activeDerivationTonWallets;
@@ -81,10 +79,10 @@ export const WalletVersionPageContent: FC<{
     const { data: wallets } = useStandardTonWalletVersions(selectedWallet.publicKey);
 
     const { mutate: createWallet, isLoading: isCreateWalletLoading } =
-        useAddTonWalletVersionToActiveAccount();
+        useAddTonWalletVersionToAccount();
 
     const { mutate: hideWallet, isLoading: isHideWalletLoading } =
-        useRemoveTonWalletVersionFromActiveAccount();
+        useRemoveTonWalletVersionFromAccount();
 
     const onOpenWallet = async (address: Address) => {
         if (address.toRawString() !== appActiveWallet.rawAddress) {
@@ -96,12 +94,14 @@ export const WalletVersionPageContent: FC<{
 
     const onAddWallet = async (w: { version: WalletVersionType; address: Address }) => {
         createWallet({
+            accountId: selectedAccount.id,
             version: w.version
         });
     };
 
     const onHideWallet = async (w: { address: Address }) => {
         hideWallet({
+            accountId: selectedAccount.id,
             walletId: w.address.toRawString()
         });
     };
@@ -121,6 +121,9 @@ export const WalletVersionPageContent: FC<{
             w.hasJettons
     );
 
+    const isLedger = selectedAccount.type === 'ledger';
+    const isKeystone = selectedAccount.type === 'keystone';
+
     return (
         <>
             {!isLedger && !isKeystone && (
diff --git a/packages/uikit/src/pages/signer/LinkPage.tsx b/packages/uikit/src/pages/signer/LinkPage.tsx
index 2d8d8eec8..4dab1b8b3 100644
--- a/packages/uikit/src/pages/signer/LinkPage.tsx
+++ b/packages/uikit/src/pages/signer/LinkPage.tsx
@@ -21,7 +21,7 @@ const useAddWalletMutation = () => {
             if (publicKey === null) {
                 sdk.topMessage('Missing public key');
             } else {
-                const state = await accountBySignerDeepLink(context, publicKey, name);
+                const state = await accountBySignerDeepLink(context, sdk.storage, publicKey, name);
                 await accountsStorage.addAccountToState(state);
                 await client.invalidateQueries([QueryKey.account]);
             }
diff --git a/packages/uikit/src/state/keystone.ts b/packages/uikit/src/state/keystone.ts
index 0f6e33fb5..ab16d1c55 100644
--- a/packages/uikit/src/state/keystone.ts
+++ b/packages/uikit/src/state/keystone.ts
@@ -16,7 +16,7 @@ export const usePairKeystoneMutation = () => {
 
     return useMutation<void, Error, UR>(async ur => {
         try {
-            const state = await accountByKeystone(ur);
+            const state = await accountByKeystone(ur, sdk.storage);
             const duplicatedWallet = await accountsStorage.getAccount(state.id);
             if (duplicatedWallet) {
                 throw new Error('Wallet already exist');
diff --git a/packages/uikit/src/state/ledger.ts b/packages/uikit/src/state/ledger.ts
index 75930da3b..1112cbe61 100644
--- a/packages/uikit/src/state/ledger.ts
+++ b/packages/uikit/src/state/ledger.ts
@@ -62,56 +62,110 @@ export const useConnectLedgerMutation = (): { isDeviceConnected: boolean } & T =
     };
 };
 
-export const useLedgerAccounts = (
-    accountsNumber: number
-): ReturnType<typeof useMutation<LedgerAccount[], Error, LedgerTonTransport>> => {
+export const useLedgerWallets = (
+    walletsNumber: number
+): ReturnType<
+    typeof useMutation<
+        {
+            wallets: LedgerAccount[];
+            accountId: string;
+            name: string;
+            emoji: string;
+            preselectedIndexes: Record<number, boolean>;
+        },
+        Error,
+        LedgerTonTransport
+    >
+> => {
     const { api } = useAppContext();
-
-    return useMutation<LedgerAccount[], Error, LedgerTonTransport>(async tonTransport => {
-        const accountIds = await Promise.all(
-            [...new Array(accountsNumber)].map((_, i) =>
+    const accountsStorage = useAccountsStorage();
+
+    return useMutation<
+        {
+            wallets: LedgerAccount[];
+            accountId: string;
+            name: string;
+            emoji: string;
+            preselectedIndexes: Record<number, boolean>;
+        },
+        Error,
+        LedgerTonTransport
+    >(async tonTransport => {
+        const walletsIds = await Promise.all(
+            [...new Array(walletsNumber)].map((_, i) =>
                 tonTransport.getAddress(getLedgerAccountPathByIndex(i))
             )
         );
 
-        const addresses = accountIds.map(account => Address.parse(account.address).toRawString());
+        const addresses = walletsIds.map(account => Address.parse(account.address).toRawString());
 
         const response = await new AccountsApi(api.tonApiV2).getAccounts({
             getAccountsRequest: { accountIds: addresses }
         });
 
-        return accountIds.map((acc, i) => ({
+        const accountId = walletsIds[0].publicKey.toString('hex');
+        const { name, emoji } = await accountsStorage.getNewAccountNameAndEmoji(accountId);
+        const existingAccountWallets =
+            (await accountsStorage.getAccount(accountId))?.allTonWallets || [];
+
+        const wallets = walletsIds.map((acc, i) => ({
             accountIndex: i,
             publicKey: acc.publicKey,
             ...response.accounts.find(a =>
                 Address.parse(a.address).equals(Address.parse(acc.address))
             )! // tonapi bug, should filter here
         }));
+
+        const preselectedIndexes: Record<number, boolean> = {};
+
+        wallets
+            .filter(
+                w =>
+                    w.balance > 0 ||
+                    existingAccountWallets.some(
+                        item => item.id === Address.parse(w.address).toRawString()
+                    )
+            )
+            .forEach(w => (preselectedIndexes[w.accountIndex] = true));
+
+        if (Object.keys(preselectedIndexes).length === 0) {
+            preselectedIndexes[0] = true;
+        }
+
+        return {
+            wallets,
+            name,
+            emoji,
+            accountId,
+            preselectedIndexes
+        };
     });
 };
 
-export const useAddLedgerAccountsMutation = () => {
+export const useAddLedgerAccountMutation = () => {
     const sdk = useAppSdk();
     const client = useQueryClient();
     const navigate = useNavigate();
     const accStorage = useAccountsStorage();
 
-    return useMutation<void, Error, { accounts: LedgerAccount[]; name: string; emoji: string }>(
-        async form => {
-            try {
-                const states = accountByLedger(form.accounts, form.name, form.emoji);
+    return useMutation<
+        void,
+        Error,
+        { accountId: string; wallets: LedgerAccount[]; name: string; emoji: string }
+    >(async form => {
+        try {
+            const state = accountByLedger(form.accountId, form.wallets, form.name, form.emoji);
 
-                await accStorage.addAccountToState(states);
+            await accStorage.addAccountToState(state);
 
-                await client.invalidateQueries([QueryKey.account]);
+            await client.invalidateQueries([QueryKey.account]);
 
-                navigate(AppRoute.home);
-            } catch (e) {
-                if (e instanceof Error) sdk.alert(e.message);
-                throw e;
-            }
+            navigate(AppRoute.home);
+        } catch (e) {
+            if (e instanceof Error) sdk.alert(e.message);
+            throw e;
         }
-    );
+    });
 };
 
 export const useIsActiveWalletLedger = () => {
diff --git a/packages/uikit/src/state/signer.ts b/packages/uikit/src/state/signer.ts
index ade492292..149ce72de 100644
--- a/packages/uikit/src/state/signer.ts
+++ b/packages/uikit/src/state/signer.ts
@@ -15,7 +15,7 @@ export const usePairSignerMutation = () => {
     const navigate = useNavigate();
     return useMutation<void, Error, string>(async qrCode => {
         try {
-            const state = await accountBySignerQr(context, qrCode);
+            const state = await accountBySignerQr(context, sdk.storage, qrCode);
 
             await accountsStorage.addAccountToState(state);
 
diff --git a/packages/uikit/src/state/wallet.ts b/packages/uikit/src/state/wallet.ts
index c89df1b6d..37946f12e 100644
--- a/packages/uikit/src/state/wallet.ts
+++ b/packages/uikit/src/state/wallet.ts
@@ -100,9 +100,12 @@ export const useMutateActiveTonWallet = () => {
     });
 };
 
-export const useAccountState = (id: AccountId) => {
+export const useAccountState = (id: AccountId | undefined) => {
     const accounts = useAccountsState();
-    return useMemo(() => (accounts || []).find(w => w.id === id), [accounts]);
+    return useMemo(
+        () => (id !== undefined ? (accounts || []).find(w => w.id === id) : undefined),
+        [accounts, id]
+    );
 };
 
 export const useWalletState = (id: WalletId): TonWalletStandard | undefined => {
@@ -152,12 +155,17 @@ export const useCreateAccountMnemonic = () => {
         }
 
         if (sdk.keychain) {
-            const account = await createStandardTonAccountByMnemonic(context, mnemonic, {
-                auth: {
-                    kind: 'keychain'
-                },
-                versions
-            });
+            const account = await createStandardTonAccountByMnemonic(
+                context,
+                sdk.storage,
+                mnemonic,
+                {
+                    auth: {
+                        kind: 'keychain'
+                    },
+                    versions
+                }
+            );
 
             await sdk.keychain.setPassword(
                 (account.auth as AuthKeychain).keychainStoreKey,
@@ -176,7 +184,7 @@ export const useCreateAccountMnemonic = () => {
         }
 
         const encryptedMnemonic = await encrypt(mnemonic.join(' '), password);
-        const account = await createStandardTonAccountByMnemonic(context, mnemonic, {
+        const account = await createStandardTonAccountByMnemonic(context, sdk.storage, mnemonic, {
             auth: {
                 kind: 'password',
                 encryptedMnemonic
@@ -192,18 +200,19 @@ export const useCreateAccountMnemonic = () => {
     });
 };
 
-export const useAddTonWalletVersionToActiveAccount = () => {
+export const useAddTonWalletVersionToAccount = () => {
     const accountsStore = useAccountsStorage();
-    const account = useActiveAccount();
     const client = useQueryClient();
 
     return useMutation<
         TonWalletStandard,
         Error,
         {
+            accountId: AccountId;
             version: WalletVersion;
         }
-    >(async ({ version }) => {
+    >(async ({ accountId, version }) => {
+        const account = (await accountsStore.getAccount(accountId))!;
         const publicKey = account.activeTonWallet.publicKey;
         const w = getWalletAddress(publicKey, version);
         const wallet: TonWalletStandard = {
@@ -222,20 +231,21 @@ export const useAddTonWalletVersionToActiveAccount = () => {
     });
 };
 
-export const useRemoveTonWalletVersionFromActiveAccount = () => {
-    const accountsStore = useAccountsStorage();
-    const account = useActiveAccount();
+export const useRemoveTonWalletVersionFromAccount = () => {
+    const storage = useAccountsStorage();
     const client = useQueryClient();
 
     return useMutation<
         void,
         Error,
         {
+            accountId: AccountId;
             walletId: WalletId;
         }
-    >(async ({ walletId }) => {
+    >(async ({ walletId, accountId }) => {
+        const account = (await storage.getAccount(accountId))!;
         account.removeTonWalletFromActiveDerivation(walletId);
-        await accountsStore.updateAccountInState(account);
+        await storage.updateAccountInState(account);
         await client.invalidateQueries(anyOfKeysParts(QueryKey.account, account.id, walletId));
     });
 };
@@ -386,8 +396,7 @@ export const useMutateActiveTonWalletConfig = () => {
 
 export const useStandardTonWalletVersions = (publicKey?: string) => {
     const { api, fiat, config } = useAppContext();
-    const { data: devSettings } = useDevSettings();
-    const isV5Enabled = isV5R1Enabled(config) || devSettings?.enableV5;
+    const isV5Enabled = isV5R1Enabled(config);
     const network = useActiveTonNetwork();
 
     return useQuery(